diff --git a/packages/designer/src/app-providers.ts b/packages/designer/src/app-providers.ts index ffd9aed57029ec6f8cd4481c1ec81a94cf2e8c5a..71db35c8b35eb76621211585f1c3091038ceb993 100644 --- a/packages/designer/src/app-providers.ts +++ b/packages/designer/src/app-providers.ts @@ -1,6 +1,7 @@ -import { FLoadingService, FTooltipDirective, FMessageBoxService, F_MODAL_SERVICE_TOKEN, FModalService, LookupSchemaRepositoryToken, FieldSelectorRepositoryToken, F_NOTIFY_SERVICE_TOKEN, FNotifyService, ControllerSchemaRepositorySymbol, FormSchemaRepositorySymbol } from "@farris/ui-vue/components"; import { App } from "vue"; +import { FLoadingService, FTooltipDirective, FMessageBoxService, F_MODAL_SERVICE_TOKEN, FModalService, LookupSchemaRepositoryToken, FieldSelectorRepositoryToken, F_NOTIFY_SERVICE_TOKEN, FNotifyService, ControllerSchemaRepositorySymbol, FormSchemaRepositorySymbol } from "@farris/ui-vue/components"; +import { LookupSchemaRepositoryToken as MobileLookupSchemaRepositoryToken, FieldSelectorRepositoryToken as MobileFieldSelectorRepositoryToken } from "@farris/mobile-ui-vue"; import { MetadataService } from "./components/composition/metadata.service"; import { MetadataPathToken, MetadataServiceToken } from "./components/types"; import { LookupFieldSelectorService, LookupSchemaService } from "./components/composition/schema-repository"; @@ -26,6 +27,8 @@ export default { app.provide(LookupSchemaRepositoryToken, new LookupSchemaService(metadataService)); app.provide(FieldSelectorRepositoryToken, new LookupFieldSelectorService(metadataService)); + app.provide(MobileLookupSchemaRepositoryToken, new LookupSchemaService(metadataService)); + app.provide(MobileFieldSelectorRepositoryToken, new LookupFieldSelectorService(metadataService)); app.provide(F_NOTIFY_SERVICE_TOKEN, new FNotifyService()); app.provide(ControllerSchemaRepositorySymbol, new ControllerSelectorSchemaService(metadataService,designerContext)); app.provide(FormSchemaRepositorySymbol, new FormSelectorSchemaService(metadataService)); diff --git a/packages/designer/src/components/composition/designer-context/use-mobile-designer-context.ts b/packages/designer/src/components/composition/designer-context/use-mobile-designer-context.ts index e3da548d7aefa207d1e761cc10e48fd9c63d6063..5fbd807d013b31a09dbed20ccd1cde4bcb296a0b 100644 --- a/packages/designer/src/components/composition/designer-context/use-mobile-designer-context.ts +++ b/packages/designer/src/components/composition/designer-context/use-mobile-designer-context.ts @@ -3,7 +3,7 @@ import ToolboxItems from '../../types/toolbox/mobile-toolbox.json'; import SupportedControllers from '../../composition/command/supported-controllers/mobile-supported-controller.json'; import { - Component, PageContainer, PageHeaderContainer, PageBodyContainer, PageFooterContainer, Picker, NumberInput, Textarea, DatePicker, DateTimePicker, + Component, PageContainer, PageHeaderContainer, PageBodyContainer, PageFooterContainer, Picker, NumberInput, Textarea, DatePicker, DateTimePicker, Lookup, ContentContainer, FloatContainer, Navbar, ListView, Form, FormItem, InputGroup, Button, registerDesignerComponents, Switch, CheckboxGroup, RadioGroup, } from '@farris/mobile-ui-vue'; import { useMobileControlCreator } from "../control-creator/use-mobile-control-creator"; @@ -21,7 +21,7 @@ export function useMobileDesignerContext(): UseDesignerContext { /** 要注册的UI组件 */ const componentsToRegister: any[] = [ Component, PageContainer, PageHeaderContainer, PageBodyContainer, PageFooterContainer, - ContentContainer, FloatContainer,Textarea,DatePicker,DateTimePicker, + ContentContainer, FloatContainer,Textarea,DatePicker,DateTimePicker,Lookup, Navbar, ListView,Picker,NumberInput,Switch,CheckboxGroup,RadioGroup, Form, FormItem, InputGroup, Button diff --git a/packages/designer/vite.config.dev.ts b/packages/designer/vite.config.dev.ts index 37b7971cdf1d8b0b5c4ffdce89b652f79e10e673..f0595c897cf390bbefae995c9ae404c7f51583af 100644 --- a/packages/designer/vite.config.dev.ts +++ b/packages/designer/vite.config.dev.ts @@ -20,7 +20,7 @@ export default defineConfig({ '@': resolve(__dirname, '../'), '@farris/ui-vue': resolve(__dirname, '../ui-vue'), '@farris/code-editor-vue': resolve(__dirname, '../code-editor'), - '@farris/mobile-ui-vue': resolve(__dirname, '../mobile-ui-vue/components') + '@farris/mobile-ui-vue': resolve(__dirname, '../mobile-ui-vue/components'), } } }); diff --git a/packages/mobile-render/farris.config.mjs b/packages/mobile-render/farris.config.mjs new file mode 100644 index 0000000000000000000000000000000000000000..724337a10f2a8c1f15aa7d7020d9bb70dc1628b6 --- /dev/null +++ b/packages/mobile-render/farris.config.mjs @@ -0,0 +1,38 @@ +import { fileURLToPath, URL } from 'node:url'; + +const externals = []; + +export default { + format: "system", + minify: false, + target: 'es2015', + externalDependencies: true, + externals: { + include: externals, + filter: (externals) => { + return (id) => { + return externals.find((item) => item && id.indexOf(item) === 0); + }; + } + }, + server: { + proxy: { + "/api": { + target: "http://localhost:5200", + changeOrigin: true, + secure: false + }, + "/apps": { + target: "http://localhost:5200", + changeOrigin: true, + secure: false + } + } + }, + alias: [ + { find: "@farris/devkit-vue", replacement: fileURLToPath(new URL('../devkit/lib', import.meta.url)) }, + { find: "@farris/bef-vue", replacement: fileURLToPath(new URL('../bef/lib', import.meta.url)) }, + { find: "@farris/mobile-command-services-vue", replacement: fileURLToPath(new URL('../mobile-command-services/lib', import.meta.url)) }, + { find: '@farris/mobile-ui-vue', replacement: fileURLToPath(new URL('../mobile-ui-vue/components', import.meta.url)) } + ] +}; diff --git a/packages/mobile-render/index-publish.html b/packages/mobile-render/index-publish.html index 3f5ff874feadddb936ca5f5aa931739fc8c3b2c4..c0f951989d79d34fb893875660d97ac798281280 100644 --- a/packages/mobile-render/index-publish.html +++ b/packages/mobile-render/index-publish.html @@ -4,12 +4,19 @@