diff --git a/packages/ui-vue/components/capsule/designer.ts b/packages/ui-vue/components/capsule/designer.ts new file mode 100644 index 0000000000000000000000000000000000000000..3a93914b775dd4e47f1a1e382a2179e2d30cb1ad --- /dev/null +++ b/packages/ui-vue/components/capsule/designer.ts @@ -0,0 +1,22 @@ + +import FCapsule, { CapsuleProps, capsuleProps } from '@farris/ui-vue/components/capsule'; +import { withInstall } from '@farris/ui-vue/components/common'; +import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver'; +import CapsuleDesign from './src/designer/capsule.design.component'; +import capsuleSchema from "./src/schema/capsule.schema.json"; +import { schemaMapper } from './src/schema/schema-mapper'; +import { schemaResolver } from './src/schema/schema-resolver'; +import propertyConfig from './src/property-config/capsule.property-config.json'; +export const propsResolver = createPropsResolver(capsuleProps, capsuleSchema, schemaMapper, schemaResolver, propertyConfig); + +CapsuleDesign.register = (componentMap: Record, propsResolverMap: Record, configResolverMap: Record) => { + componentMap.capsule = FCapsule; + propsResolverMap.capsule = propsResolver; +}; +CapsuleDesign.registerDesigner = (componentMap: Record, propsResolverMap: Record, configResolverMap: Record) => { + componentMap.capsule = CapsuleDesign; + propsResolverMap.capsule = propsResolver; +}; + +export { CapsuleDesign }; +export default withInstall(CapsuleDesign); diff --git a/packages/ui-vue/components/capsule/index.ts b/packages/ui-vue/components/capsule/index.ts index e28da7a6f47e1575952e58e9cee1fc4cd0d9ecca..f2856f0f9b3f1515119c566bc7632b3cc9b337dd 100644 --- a/packages/ui-vue/components/capsule/index.ts +++ b/packages/ui-vue/components/capsule/index.ts @@ -1,19 +1,8 @@ -import FCapsule from './src/capsule.component'; -import { propsResolver } from './src/capsule.props'; -import CapsuleDesign from './src/designer/capsule.design.component'; import { withInstall } from '@farris/ui-vue/components/common'; +import FCapsule from './src/capsule.component'; export * from './src/capsule.props'; -FCapsule.register = (componentMap: Record, propsResolverMap: Record, configResolverMap: Record) => { - componentMap.capsule = FCapsule; - propsResolverMap.capsule = propsResolver; -}; -FCapsule.registerDesigner = (componentMap: Record, propsResolverMap: Record, configResolverMap: Record) => { - componentMap.capsule = CapsuleDesign; - propsResolverMap.capsule = propsResolver; -}; - export { FCapsule }; export default withInstall(FCapsule); diff --git a/packages/ui-vue/components/capsule/src/capsule.props.ts b/packages/ui-vue/components/capsule/src/capsule.props.ts index d87c5e5c20f3ac097efe32cfde7f9aee1be38edb..de93917d7c83b01f01033d30dab95b1d15b3a8ef 100644 --- a/packages/ui-vue/components/capsule/src/capsule.props.ts +++ b/packages/ui-vue/components/capsule/src/capsule.props.ts @@ -1,9 +1,4 @@ -import { ComputedRef, ExtractPropTypes, PropType } from 'vue'; -import capsuleSchema from "./schema/capsule.schema.json"; -import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver'; -import { schemaMapper } from './schema/schema-mapper'; -import { schemaResolver } from './schema/schema-resolver'; -import propertyConfig from './property-config/capsule.property-config.json'; +import { ExtractPropTypes, PropType } from 'vue'; export type CapsuleColerType = 'primary' | 'secondary'; @@ -52,6 +47,4 @@ export const capsuleItemProps = { export type CapsuleProps = ExtractPropTypes; -export type CapsuleItemProps = ExtractPropTypes; - -export const propsResolver = createPropsResolver(capsuleProps, capsuleSchema, schemaMapper, schemaResolver, propertyConfig); +export type CapsuleItemProps = ExtractPropTypes; \ No newline at end of file diff --git a/packages/ui-vue/components/capsule/src/designer/capsule.design.component.tsx b/packages/ui-vue/components/capsule/src/designer/capsule.design.component.tsx index 5e1119840343e2cd28e067d3c84bfd3fcb7ee8bc..3aa072d1b08c1470a758862a8efbdfc3b0c4ebc8 100644 --- a/packages/ui-vue/components/capsule/src/designer/capsule.design.component.tsx +++ b/packages/ui-vue/components/capsule/src/designer/capsule.design.component.tsx @@ -1,7 +1,7 @@ import { Ref, SetupContext, computed, defineComponent, inject, nextTick, onMounted, ref, watch } from "vue"; +import { DesignerItemContext, useDesignerComponent } from "@farris/ui-vue/components/designer-canvas"; import { CapsuleItem, CapsuleProps, capsuleProps } from "../capsule.props"; import FCapsuleItem from '../capsule-item.component'; -import { DesignerItemContext, useDesignerComponent } from "@farris/ui-vue/components/designer-canvas"; export default defineComponent({ name: 'FCapsuleDesign', diff --git a/packages/ui-vue/components/data-grid/src/data-grid.component.tsx b/packages/ui-vue/components/data-grid/src/data-grid.component.tsx index c984f63818c6428d03e13918e5dcd609e0eb5146..37988a98fff8d001cde2eabba5c8ed4689be3596 100644 --- a/packages/ui-vue/components/data-grid/src/data-grid.component.tsx +++ b/packages/ui-vue/components/data-grid/src/data-grid.component.tsx @@ -380,15 +380,6 @@ export default defineComponent({ } }); - // 监听传入数据变化，更新视图，此处可能存在性能问题，需要跟changePolicy属性配合使用 - watch(() => props.data, (newDataValue) => { - if (props.changePolicy === 'default') { - updateDataSource(newDataValue); - } - }, { - deep: true - }); - watch(() => props.columns, (latestColumns: DataColumn[]) => { updateColumns(latestColumns); }); diff --git a/packages/ui-vue/components/data-grid/src/data-grid.props.ts b/packages/ui-vue/components/data-grid/src/data-grid.props.ts index 17222c12595611b2553f0ff3cc12d0519c48d988..2b9ac7a5aaf14b37c2be081af4ad1d1c72a8c80e 100644 --- a/packages/ui-vue/components/data-grid/src/data-grid.props.ts +++ b/packages/ui-vue/components/data-grid/src/data-grid.props.ts @@ -325,8 +325,6 @@ export const dataGridProps = { }, /** 结束编辑前校验 */ beforeEndEditCell: { type: Function as PropType<() => Promise | boolean>, default: () => true }, - /** 变更策略 默认主动更新 */ - changePolicy: { type: String as PropType<'default' | 'push'>, default: 'push' }, /** 列集合 */ columns: { type: Array, default: [] }, /** 列配置 */ diff --git a/packages/ui-vue/components/data-view/composition/types.ts b/packages/ui-vue/components/data-view/composition/types.ts index 1ee573484cbb16de1e19537673b0dfd9cb4ece97..eeed1ecbdd93508a234ac0379606db3d0dfaa5b6 100644 --- a/packages/ui-vue/components/data-view/composition/types.ts +++ b/packages/ui-vue/components/data-view/composition/types.ts @@ -452,8 +452,6 @@ export interface DataViewOptions { }) => Promise | boolean); /** 单元格高度 */ cellHeight: number; - /** 变更策略 */ - changePolicy: string; /** 列集合 */ columns: DataColumn[]; /** 列配置 */ diff --git a/packages/ui-vue/components/designer-canvas/index.ts b/packages/ui-vue/components/designer-canvas/index.ts index 359395edb2a24f55d21bb9dd82dae452fe57a1dd..e491a324a122bec764e383a6d2e1016e192a77d3 100644 --- a/packages/ui-vue/components/designer-canvas/index.ts +++ b/packages/ui-vue/components/designer-canvas/index.ts @@ -5,6 +5,7 @@ import { DgControl } from './src/composition/dg-control'; import type { DesignerHostService, UseDesignerRules, DesignerHTMLElement, DraggingResolveContext } from './src/composition/types'; import { canvasChanged, setPositionForSelectedElement, setPositionOfButtonGroup, setPositionOfSelectedComponentBtnGroup } from './src/composition/designer-canvas-changed'; import { refreshCanvas } from './src/composition/update-cancas'; +import { componentMap, componentPropsConverter } from './src/components/maps'; export * from './src/composition/props/designer-canvas.props'; export * from './src/composition/function/use-designer-component'; @@ -27,5 +28,7 @@ export { DesignerHostService, DesignerHTMLElement, DraggingResolveContext, - FDesignerInnerItem + FDesignerInnerItem, + componentPropsConverter, + componentMap }; diff --git a/packages/ui-vue/components/designer-canvas/src/components/maps.ts b/packages/ui-vue/components/designer-canvas/src/components/maps.ts index 32562fac3e8eb6386cac43538c1b24b0f38277e1..5cb006431a1c1ad071d803efb119f0cc5792ba26 100644 --- a/packages/ui-vue/components/designer-canvas/src/components/maps.ts +++ b/packages/ui-vue/components/designer-canvas/src/components/maps.ts @@ -3,7 +3,7 @@ import FAvatar from '@farris/ui-vue/components/avatar'; import FButtonEdit from '@farris/ui-vue/components/button-edit/designer'; import FButtonGroup from '@farris/ui-vue/components/button-group'; import FCalendar from '@farris/ui-vue/components/calendar'; -import FCapsule from '@farris/ui-vue/components/capsule'; +import FCapsule from '@farris/ui-vue/components/capsule/designer'; import FCheckbox from '@farris/ui-vue/components/checkbox/designer'; import FCheckboxGroup from '@farris/ui-vue/components/checkbox-group/designer'; import FColorPicker from '@farris/ui-vue/components/color-picker'; @@ -12,7 +12,7 @@ import FContentContainer from '@farris/ui-vue/components/content-container'; import FDataGrid from '@farris/ui-vue/components/data-grid/designer'; import FDatePicker from '@farris/ui-vue/components/date-picker/designer'; import FDropdown from '@farris/ui-vue/components/dropdown'; -import FDynamicForm from '@farris/ui-vue/components/dynamic-form'; +import FDynamicForm from '@farris/ui-vue/components/dynamic-form/designer'; import FExternalContainer from '@farris/ui-vue/components/external-container'; import FFilterBar from '@farris/ui-vue/components/filter-bar'; import FImageCropper from '@farris/ui-vue/components/image-cropper'; @@ -34,7 +34,7 @@ import FRadioGroup from '@farris/ui-vue/components/radio-group/designer'; import FRate from '@farris/ui-vue/components/rate/designer'; import FResponseToolbar from '@farris/ui-vue/components/response-toolbar/designer'; import FResponseLayout from '@farris/ui-vue/components/response-layout'; -import FResponseLayoutEditorSetting from '@farris/ui-vue/components/response-layout-editor'; +import FResponseLayoutEditorSetting from '@farris/ui-vue/components/response-layout-editor/designer'; import FSearchBox from '@farris/ui-vue/components/search-box'; import FSection from '@farris/ui-vue/components/section/designer'; import FSmokeDetector from '@farris/ui-vue/components/smoke-detector'; diff --git a/packages/ui-vue/components/dynamic-form/designer.ts b/packages/ui-vue/components/dynamic-form/designer.ts new file mode 100644 index 0000000000000000000000000000000000000000..7d72cf9f09dcd16fb88044156dd6f18106cf715d --- /dev/null +++ b/packages/ui-vue/components/dynamic-form/designer.ts @@ -0,0 +1,46 @@ + +import { Plugin } from 'vue'; +import { FResponseForm, FDynamicFormGroup, FDynamicFormInput, ResponseFormPropsType, responseFormProps, DynamicFormGroupPropsType, + dynamicFormGroupProps, DynamicFormInputProps, dynamicFormInputProps } from '@farris/ui-vue/components/dynamic-form'; +import { createPropsResolver, createFormGroupEditorResolver } from '@farris/ui-vue/components/dynamic-resolver'; +import FResponseFormDesign from './src/designer/response-form.design.component'; +import FDynamicFromGroupDesign from './src/designer/form-group.design.component'; +import { responseFormLayoutPropsResolver } from './src/designer/response-form-layout-setting.props'; +import FResponseFormLayoutSetting from './src/designer/response-form-layout-setting.component'; +import { schemaMapper } from './src/schema/schema-mapper'; +import { reponseFormSchemaResolver } from './src/schema/response-form-schema-resolver'; +import formSchema from './src/schema/response-form.schema.json'; +import formGroupSchema from './src/schema/form-group.schema.json'; +export const formPropsResolver = createPropsResolver(responseFormProps, formSchema, schemaMapper, reponseFormSchemaResolver); +export const formGroupPropsResolver = createPropsResolver( + dynamicFormGroupProps, formGroupSchema, schemaMapper, undefined +); + +export const editorResolver = createFormGroupEditorResolver(); + +export const formInputPropsResolver = createPropsResolver( + dynamicFormInputProps, formGroupSchema, schemaMapper, undefined +); +export { FResponseFormDesign }; + + +FResponseFormDesign.register = (componentMap: Record, propsResolverMap: Record, configResolverMap: Record, resolverMap: Record) => { + componentMap['form-group'] = FDynamicFormGroup; + propsResolverMap['form-group'] = formGroupPropsResolver; + componentMap['response-form'] = FResponseForm; + propsResolverMap['response-form'] = formPropsResolver; + componentMap['form-input'] = FDynamicFormInput; + propsResolverMap['form-input'] = formInputPropsResolver; + resolverMap['form-group'] = { editorResolver }; + componentMap['response-form-layout-setting'] = FResponseFormLayoutSetting; + propsResolverMap['response-form-layout-setting'] = responseFormLayoutPropsResolver; + +}; +FResponseFormDesign.registerDesigner = (componentMap: Record, propsResolverMap: Record, configResolverMap: Record) => { + componentMap['form-group'] = FDynamicFromGroupDesign; + propsResolverMap['form-group'] = formGroupPropsResolver; + componentMap['response-form'] = FResponseFormDesign; + propsResolverMap['response-form'] = formPropsResolver; +}; + +export default FResponseFormDesign as typeof FResponseFormDesign & Plugin; diff --git a/packages/ui-vue/components/dynamic-form/index.ts b/packages/ui-vue/components/dynamic-form/index.ts index 0737c9501507663128371d6117df2c121b8b0388..f4f80771a9e1035ddf55d95f734d005608b43778 100644 --- a/packages/ui-vue/components/dynamic-form/index.ts +++ b/packages/ui-vue/components/dynamic-form/index.ts @@ -1,45 +1,22 @@ +import { App, Plugin } from 'vue'; import FResponseForm from './src/response-form.component'; -import FResponseFormDesign from './src/designer/response-form.design.component'; import FDynamicFormGroup from './src/component/dynamic-form-group/dynamic-form-group.component'; -import FDynamicFromGroupDesign from './src/designer/form-group.design.component'; import FDynamicFormInput from './src/component/dynamic-form-input/dynamic-form-input.component'; -import { editorResolver, formGroupPropsResolver } from './src/component/dynamic-form-group/dynamic-form-group.props'; -import { formInputPropsResolver } from './src/component/dynamic-form-input/dynamic-form-input.props'; -import { formPropsResolver } from './src/response-form.props'; -import { responseFormLayoutPropsResolver } from './src/designer/response-form-layout-setting.props'; -import { App } from 'vue'; -import FResponseFormLayoutSetting from './src/designer/response-form-layout-setting.component'; +import FDynamicFormLabel from './src/component/dynamic-form-label/dynamic-form-label.component'; export * from './src/types'; export * from './src/composition/types'; export * from './src/response-form.props'; export * from './src/component/dynamic-form-group/dynamic-form-group.props'; +export * from './src/component/dynamic-form-input/dynamic-form-input.props'; export * from './src/designer/response-form-use-designer-rules'; -export { FResponseForm, FDynamicFormGroup, FDynamicFormInput }; +export { FResponseForm, FDynamicFormGroup, FDynamicFormInput, FDynamicFormLabel }; -export default { - install(app: App): void { - app.component(FResponseForm.name as string, FResponseForm) - .component(FDynamicFormGroup.name as string, FDynamicFormGroup); - }, - register(componentMap: Record, propsResolverMap: Record, configResolverMap: Record, resolverMap: Record): void { - componentMap['form-group'] = FDynamicFormGroup; - propsResolverMap['form-group'] = formGroupPropsResolver; - componentMap['response-form'] = FResponseForm; - propsResolverMap['response-form'] = formPropsResolver; - componentMap['form-input'] = FDynamicFormInput; - propsResolverMap['form-input'] = formInputPropsResolver; - resolverMap['form-group'] = { editorResolver }; - componentMap['response-form-layout-setting'] =FResponseFormLayoutSetting ; - propsResolverMap['response-form-layout-setting'] = responseFormLayoutPropsResolver; - - }, - registerDesigner(componentMap: Record, propsResolverMap: Record, configResolverMap: Record): void { - componentMap['form-group'] = FDynamicFromGroupDesign; - propsResolverMap['form-group'] = formGroupPropsResolver; - componentMap['response-form'] = FResponseFormDesign; - propsResolverMap['response-form'] = formPropsResolver; - } +FResponseForm.install = (app: App) => { + app.component(FResponseForm.name as string, FResponseForm) + .component(FDynamicFormGroup.name as string, FDynamicFormGroup); }; + +export default FResponseForm as typeof FResponseForm & Plugin; diff --git a/packages/ui-vue/components/dynamic-form/src/component/dynamic-form-group/dynamic-form-group.design.component.tsx b/packages/ui-vue/components/dynamic-form/src/component/dynamic-form-group/dynamic-form-group.design.component.tsx index 65135641cd21a373646d58fc285071a62aa346dd..362ba8cdefa800d5632d72cb1c89958bb780b82a 100644 --- a/packages/ui-vue/components/dynamic-form/src/component/dynamic-form-group/dynamic-form-group.design.component.tsx +++ b/packages/ui-vue/components/dynamic-form/src/component/dynamic-form-group/dynamic-form-group.design.component.tsx @@ -1,7 +1,6 @@ import { SetupContext, computed, defineComponent, ref, watch, inject } from 'vue'; import { DesignerItemContext, DesignerHostService } from '@farris/ui-vue/components/designer-canvas'; -import { DynamicFormGroupPropsType, dynamicFormGroupProps } from './dynamic-form-group.props'; -import Label from '../dynamic-form-label/dynamic-form-label.component'; +import { DynamicFormGroupPropsType, dynamicFormGroupProps, FDynamicFormLabel as Label } from '@farris/ui-vue/components/dynamic-form'; import { useTypeResolverDesign } from '../../composition/use-type-resolver-design'; import { useFormBindingResolverDesign } from '../../composition/form-binding-resolver-design'; diff --git a/packages/ui-vue/components/dynamic-form/src/component/dynamic-form-group/dynamic-form-group.props.ts b/packages/ui-vue/components/dynamic-form/src/component/dynamic-form-group/dynamic-form-group.props.ts index d793be5543da20f99cfda676decd7f299261d6f3..eb3a3e17198084c2d95f8089708511d25bd8cf27 100644 --- a/packages/ui-vue/components/dynamic-form/src/component/dynamic-form-group/dynamic-form-group.props.ts +++ b/packages/ui-vue/components/dynamic-form/src/component/dynamic-form-group/dynamic-form-group.props.ts @@ -1,8 +1,5 @@ import { ExtractPropTypes, PropType } from 'vue'; -import { createPropsResolver, createFormGroupEditorResolver } from '@farris/ui-vue/components/dynamic-resolver'; import { EditorType, EditorConfig } from '../../types'; -import { schemaMapper } from '../../schema/schema-mapper'; -import formGroupSchema from '../../schema/form-group.schema.json'; import { FormValidationInfo } from '../validation-message/validation-message.props'; export const dynamicFormGroupProps = { @@ -25,8 +22,3 @@ export const dynamicFormGroupProps = { export type DynamicFormGroupPropsType = ExtractPropTypes; -export const formGroupPropsResolver = createPropsResolver( - dynamicFormGroupProps, formGroupSchema, schemaMapper, undefined -); - -export const editorResolver = createFormGroupEditorResolver(); diff --git a/packages/ui-vue/components/dynamic-form/src/component/dynamic-form-input/dynamic-form-input.component.tsx b/packages/ui-vue/components/dynamic-form/src/component/dynamic-form-input/dynamic-form-input.component.tsx index c1eebf79fcc054eacbff91aae72df09209db1f74..fa9f10dcbbba66444d9557f304b2fdb47ed96fc3 100644 --- a/packages/ui-vue/components/dynamic-form/src/component/dynamic-form-input/dynamic-form-input.component.tsx +++ b/packages/ui-vue/components/dynamic-form/src/component/dynamic-form-input/dynamic-form-input.component.tsx @@ -1,6 +1,6 @@ import { SetupContext, computed, defineComponent, ref, watch } from 'vue'; +import { DynamicFormInputProps, dynamicFormInputProps } from '@farris/ui-vue/components/dynamic-form'; import { useTypeResolver } from '../../composition/use-type-resolver'; -import { DynamicFormInputProps, dynamicFormInputProps } from './dynamic-form-input.props'; export default defineComponent({ name: 'FDynamicFormInput', diff --git a/packages/ui-vue/components/dynamic-form/src/component/dynamic-form-input/dynamic-form-input.props.ts b/packages/ui-vue/components/dynamic-form/src/component/dynamic-form-input/dynamic-form-input.props.ts index ca1e683748bf2c7215bc0d70b0efb1bf9e9e7020..59a5f9a1cf150a205651c89c2d06c7e5ee756be6 100644 --- a/packages/ui-vue/components/dynamic-form/src/component/dynamic-form-input/dynamic-form-input.props.ts +++ b/packages/ui-vue/components/dynamic-form/src/component/dynamic-form-input/dynamic-form-input.props.ts @@ -1,8 +1,5 @@ import { ExtractPropTypes, PropType } from 'vue'; -import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver'; import { EditorConfig } from '../../types'; -import { schemaMapper } from '../../schema/schema-mapper'; -import formGroupSchema from '../../schema/form-group.schema.json'; export const dynamicFormInputProps = { id: { type: String, default: '' }, @@ -22,6 +19,3 @@ export const dynamicFormInputProps = { export type DynamicFormInputProps = ExtractPropTypes; -export const formInputPropsResolver = createPropsResolver( - dynamicFormInputProps, formGroupSchema, schemaMapper, undefined -); diff --git a/packages/ui-vue/components/dynamic-form/src/composition/form-binding-resolver-design.ts b/packages/ui-vue/components/dynamic-form/src/composition/form-binding-resolver-design.ts index 0a9ca047534908c583d4cf9927a31b91a551fb6f..2927dc119f64d177857c54a750eca39bdf8a36c8 100644 --- a/packages/ui-vue/components/dynamic-form/src/composition/form-binding-resolver-design.ts +++ b/packages/ui-vue/components/dynamic-form/src/composition/form-binding-resolver-design.ts @@ -1,7 +1,7 @@ import { FormBindingType } from "@farris/ui-vue/components/property-panel"; import { DesignerHostService, DesignerItemContext } from "@farris/ui-vue/components/designer-canvas"; import { FormSchemaEntityField$Type } from "@farris/ui-vue/components/common"; -import { DynamicFormGroupPropsType } from "../component/dynamic-form-group/dynamic-form-group.props"; +import { DynamicFormGroupPropsType } from "@farris/ui-vue/components/dynamic-form"; export function useFormBindingResolverDesign(designerHostService: DesignerHostService, designItemContext: DesignerItemContext, props: DynamicFormGroupPropsType) { diff --git a/packages/ui-vue/components/dynamic-form/src/composition/use-response-form-layout-setting.ts b/packages/ui-vue/components/dynamic-form/src/composition/use-response-form-layout-setting.ts index ee959f03bf405318c8f02a5216ea73b8d0d1175c..b6ff72639e3de377c6979525d6b536635f014953 100644 --- a/packages/ui-vue/components/dynamic-form/src/composition/use-response-form-layout-setting.ts +++ b/packages/ui-vue/components/dynamic-form/src/composition/use-response-form-layout-setting.ts @@ -2,7 +2,7 @@ import { ResponseFormLayoutContext } from "@farris/ui-vue/components/response-la import { FormUnifiedColumnLayout, UseResponseFormLayoutSetting } from "../types"; import { DgControl } from "@farris/ui-vue/components/designer-canvas"; import { useResponseLayoutEditorSetting } from - "../../../response-layout-editor/src/composition/converter/use-response-layout-editor-setting"; + "@farris/ui-vue/components/response-layout-editor/designer"; export function useResponseFormLayoutSetting(formShemaService, componentId: string): UseResponseFormLayoutSetting { function getFormNode(formSchemaId, formNode = null): any { diff --git a/packages/ui-vue/components/dynamic-form/src/composition/use-type-resolver-design.ts b/packages/ui-vue/components/dynamic-form/src/composition/use-type-resolver-design.ts index 5a8aa7649ebc0a48e1d5874d495b096b7c7e1f79..a84ab3488eba5d3458f2c91dc6c075f4d0dd6f41 100644 --- a/packages/ui-vue/components/dynamic-form/src/composition/use-type-resolver-design.ts +++ b/packages/ui-vue/components/dynamic-form/src/composition/use-type-resolver-design.ts @@ -1,5 +1,5 @@ -import { componentMap, componentPropsConverter } from '../../../../components/designer-canvas/src/components/maps'; -import FInputGroupDesign from '../../../input-group/src/designer/input-group.design.component'; +import { componentMap, componentPropsConverter } from '@farris/ui-vue/components/designer-canvas'; +import FInputGroupDesign from '@farris/ui-vue/components/input-group/designer'; import { EditorType, EditorConfig } from "../types"; import { UseTypeResolver } from "./types"; diff --git a/packages/ui-vue/components/dynamic-form/src/composition/use-type-resolver.ts b/packages/ui-vue/components/dynamic-form/src/composition/use-type-resolver.ts index be414bf64bd900539dd03c51248253efc97c24fc..9bb44af91e43636f088b3bd717d332c756b72671 100644 --- a/packages/ui-vue/components/dynamic-form/src/composition/use-type-resolver.ts +++ b/packages/ui-vue/components/dynamic-form/src/composition/use-type-resolver.ts @@ -1,7 +1,7 @@ /* eslint-disable complexity */ +import { componentMap, componentPropsConverter, loadRegister } from '@farris/ui-vue/components/dynamic-view'; import { EditorType, EditorConfig } from "../types"; import { UseTypeResolver } from "./types"; -import { componentMap, componentPropsConverter, loadRegister } from '../../../dynamic-view/src/components/maps'; export function useTypeResolver(): UseTypeResolver { diff --git a/packages/ui-vue/components/dynamic-form/src/designer/form-group.design.component.tsx b/packages/ui-vue/components/dynamic-form/src/designer/form-group.design.component.tsx index 9b9a3d0e795dc9d7cd4a5a3580d7537374982d33..8a177b3b0dcfda9ed6acb19cd0be8575e2ff12a1 100644 --- a/packages/ui-vue/components/dynamic-form/src/designer/form-group.design.component.tsx +++ b/packages/ui-vue/components/dynamic-form/src/designer/form-group.design.component.tsx @@ -1,10 +1,10 @@ -import { SetupContext, defineComponent, inject, onMounted, ref } from 'vue'; -import { DynamicFormGroupPropsType, dynamicFormGroupProps } from '../component/dynamic-form-group/dynamic-form-group.props'; +import { defineComponent, inject, onMounted, ref } from 'vue'; import { DesignerItemContext, useDesignerComponent } from '@farris/ui-vue/components/designer-canvas'; -import FDynamicFormGroupDesign from '../component/dynamic-form-group/dynamic-form-group.design.component'; import { propertyConfigSchemaMap } from '@farris/ui-vue/components/dynamic-resolver'; -import { DesignerHostService } from '../../../../components/designer-canvas/src/composition/types'; +import { DesignerHostService } from '@farris/ui-vue/components/designer-canvas'; +import { DynamicFormGroupPropsType, dynamicFormGroupProps } from '../component/dynamic-form-group/dynamic-form-group.props'; +import FDynamicFormGroupDesign from '../component/dynamic-form-group/dynamic-form-group.design.component'; import { useDesignerRulesForFormGroup } from './form-group-use-designer-rules'; export default defineComponent({ diff --git a/packages/ui-vue/components/dynamic-form/src/designer/response-form-layout-setting.component.tsx b/packages/ui-vue/components/dynamic-form/src/designer/response-form-layout-setting.component.tsx index 803bf3fe0eebe17663acee05fe4f672b0a837ec2..292f07ba640f2fc0bcc1bba7ddd97c713e51cdec 100644 --- a/packages/ui-vue/components/dynamic-form/src/designer/response-form-layout-setting.component.tsx +++ b/packages/ui-vue/components/dynamic-form/src/designer/response-form-layout-setting.component.tsx @@ -1,6 +1,6 @@ import { defineComponent, onMounted, ref, SetupContext } from 'vue'; import FComboList from '@farris/ui-vue/components/combo-list'; -import { FMessageBoxService } from '../../../message-box'; +import { FMessageBoxService } from '@farris/ui-vue/components/message-box'; import { ResponseFormLayoutSettingProps, responseFormLayoutSettingProps } from './response-form-layout-setting.props'; import './response-form-layout-setting.css'; export default defineComponent({ diff --git a/packages/ui-vue/components/dynamic-form/src/designer/response-form-layout-setting.props.ts b/packages/ui-vue/components/dynamic-form/src/designer/response-form-layout-setting.props.ts index e128c3fbd03069fff7bcd8089b8ac80bcf96a2a0..9f99fd617f9002949121743b33985d36bd952986 100644 --- a/packages/ui-vue/components/dynamic-form/src/designer/response-form-layout-setting.props.ts +++ b/packages/ui-vue/components/dynamic-form/src/designer/response-form-layout-setting.props.ts @@ -1,10 +1,9 @@ import { ExtractPropTypes, PropType } from 'vue'; - +import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver'; import { layoutSettingSchemaMapper } from '../schema/schema-mapper'; import { layoutSettingSchemaResolver } from '../schema/response-form-schema-resolver'; import formSchema from '../schema/response-form-layout-setting.schema.json'; -import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver'; import { FormUnifiedColumnLayout } from '../types'; export const responseFormLayoutSettingProps = { diff --git a/packages/ui-vue/components/dynamic-form/src/designer/response-form-use-designer-rules.ts b/packages/ui-vue/components/dynamic-form/src/designer/response-form-use-designer-rules.ts index 982bd14f099b217a1f8c8da7f1b7acc61c4e6638..4b5bbdfaae01bd9ad8ee0f67d52900d7d1b6aa85 100644 --- a/packages/ui-vue/components/dynamic-form/src/designer/response-form-use-designer-rules.ts +++ b/packages/ui-vue/components/dynamic-form/src/designer/response-form-use-designer-rules.ts @@ -2,10 +2,10 @@ import { DesignerHostService, DesignerHTMLElement, DraggingResolveContext, UseDe import { useDragulaCommonRule, UseTemplateDragAndDropRules } from "@farris/ui-vue/components/designer-canvas"; import { ComponentSchema, DesignerItemContext } from "@farris/ui-vue/components/designer-canvas"; import { getSchemaByType, schemaMap } from "@farris/ui-vue/components/dynamic-resolver"; -import { ResponseFormProperty } from "../property-config/response-form.property-config"; import { DgControl } from "@farris/ui-vue/components/designer-canvas"; import { FormBindingType } from "@farris/ui-vue/components/property-panel"; import { useGuid } from "@farris/ui-vue/components/common"; +import { ResponseFormProperty } from "../property-config/response-form.property-config"; export interface FormUseDesignerRules extends UseDesignerRules { diff --git a/packages/ui-vue/components/dynamic-form/src/designer/response-form.design.component.tsx b/packages/ui-vue/components/dynamic-form/src/designer/response-form.design.component.tsx index d2656703b5abfef9134ceb699d05514a082cd9dc..d720bf27a7bea3382def0de5899e204b841f6013 100644 --- a/packages/ui-vue/components/dynamic-form/src/designer/response-form.design.component.tsx +++ b/packages/ui-vue/components/dynamic-form/src/designer/response-form.design.component.tsx @@ -1,8 +1,8 @@ import { SetupContext, computed, defineComponent, inject, onMounted, ref } from 'vue'; -import { DynamicFormGroupPropsType, dynamicFormGroupProps } from '../component/dynamic-form-group/dynamic-form-group.props'; import { DesignerItemContext, useDesignerComponent, DesignerHostService } from '@farris/ui-vue/components/designer-canvas'; -import { useDesignerRules } from './response-form-use-designer-rules'; import { areaResponseDirective } from '@farris/ui-vue/components/common'; +import { DynamicFormGroupPropsType, dynamicFormGroupProps } from '../component/dynamic-form-group/dynamic-form-group.props'; +import { useDesignerRules } from './response-form-use-designer-rules'; export default defineComponent({ name: 'FResponseFormDesign', diff --git a/packages/ui-vue/components/dynamic-form/src/property-config/response-form.property-config.ts b/packages/ui-vue/components/dynamic-form/src/property-config/response-form.property-config.ts index d46be9d044f99f8ba640197c9a9d91597b4573f4..ec45320b6a496f0a5138f9b4c6de940dd1fb1226 100644 --- a/packages/ui-vue/components/dynamic-form/src/property-config/response-form.property-config.ts +++ b/packages/ui-vue/components/dynamic-form/src/property-config/response-form.property-config.ts @@ -1,8 +1,8 @@ import { DesignerComponentInstance } from "@farris/ui-vue/components/designer-canvas"; -import { BaseControlProperty } from "../../../../components/property-panel/src/composition/entity/base-property"; -import { useResponseFormLayoutSetting } from "../composition/use-response-form-layout-setting"; +import { BaseControlProperty } from "@farris/ui-vue/components/property-panel"; import { refreshCanvas } from "@farris/ui-vue/components/designer-canvas"; +import { useResponseFormLayoutSetting } from "../composition/use-response-form-layout-setting"; export class ResponseFormProperty extends BaseControlProperty { diff --git a/packages/ui-vue/components/dynamic-form/src/response-form.props.ts b/packages/ui-vue/components/dynamic-form/src/response-form.props.ts index 22e5b011ad590c57a23d443b97fb7252e737a533..ac461ba7f5027c80913b26c33a1e0378257fdc7c 100644 --- a/packages/ui-vue/components/dynamic-form/src/response-form.props.ts +++ b/packages/ui-vue/components/dynamic-form/src/response-form.props.ts @@ -1,8 +1,4 @@ import { ExtractPropTypes } from 'vue'; -import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver'; -import { schemaMapper } from './schema/schema-mapper'; -import { reponseFormSchemaResolver } from './schema/response-form-schema-resolver'; -import formSchema from './schema/response-form.schema.json'; export const responseFormProps = { customClass: { type: String, default: '' }, @@ -11,6 +7,4 @@ export const responseFormProps = { visible: { type: Boolean, default: true } } as Record; -export type ResponseFormPropsType = ExtractPropTypes; - -export const formPropsResolver = createPropsResolver(responseFormProps, formSchema, schemaMapper, reponseFormSchemaResolver); +export type ResponseFormPropsType = ExtractPropTypes; \ No newline at end of file diff --git a/packages/ui-vue/components/dynamic-form/src/schema/response-form-schema-resolver.ts b/packages/ui-vue/components/dynamic-form/src/schema/response-form-schema-resolver.ts index 9f94324b0522a1314d7bebcc06d0ce3097365d3a..6e2e1822f02b0590ec86c2a4f1fe6a07fbbf4ead 100644 --- a/packages/ui-vue/components/dynamic-form/src/schema/response-form-schema-resolver.ts +++ b/packages/ui-vue/components/dynamic-form/src/schema/response-form-schema-resolver.ts @@ -1,7 +1,6 @@ -import { ComponentBuildInfo } from "../../../component/src/composition/inner-component-build-info"; -import { DesignerHostService } from "@farris/ui-vue/components/designer-canvas"; -import { DesignerComponentInstance } from "@farris/ui-vue/components/designer-canvas"; +import { ComponentBuildInfo } from "@farris/ui-vue/components/component"; +import { DesignerHostService, DesignerComponentInstance } from "@farris/ui-vue/components/designer-canvas"; import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver"; import { ResponseFormComponentCreatorService } from "../composition/response-form-component-creator.service"; diff --git a/packages/ui-vue/components/dynamic-view/src/components/maps.ts b/packages/ui-vue/components/dynamic-view/src/components/maps.ts index 60e7246aeb63123134944d3aec0d269ae73c7ec6..220757e5bd8d6a923781b74d5662e4b57a99f47e 100644 --- a/packages/ui-vue/components/dynamic-view/src/components/maps.ts +++ b/packages/ui-vue/components/dynamic-view/src/components/maps.ts @@ -3,7 +3,7 @@ import FAvatar from '@farris/ui-vue/components/avatar'; import FButtonEdit from '@farris/ui-vue/components/button-edit/designer'; import FButtonGroup from '@farris/ui-vue/components/button-group'; import FCalendar from '@farris/ui-vue/components/calendar'; -import FCapsule from '@farris/ui-vue/components/capsule'; +import FCapsule from '@farris/ui-vue/components/capsule/designer'; import FCheckbox from '@farris/ui-vue/components/checkbox/designer'; import FCheckboxGroup from '@farris/ui-vue/components/checkbox-group/designer'; import FComboList from '@farris/ui-vue/components/combo-list'; @@ -14,7 +14,7 @@ import FContentContainer from '@farris/ui-vue/components/content-container'; import FDatePicker from '@farris/ui-vue/components/date-picker/designer'; import FDataGrid from '@farris/ui-vue/components/data-grid/designer'; import FDropdown from '@farris/ui-vue/components/dropdown'; -import FDynamicForm from '@farris/ui-vue/components/dynamic-form'; +import FDynamicForm from '@farris/ui-vue/components/dynamic-form/designer'; import FEventsEditor from '@farris/ui-vue/components/events-editor'; import FFilterBar from '@farris/ui-vue/components/filter-bar'; import FFieldSelector from '@farris/ui-vue/components/field-selector'; @@ -39,7 +39,7 @@ import FRadioGroup from '@farris/ui-vue/components/radio-group/designer'; import FRate from '@farris/ui-vue/components/rate/designer'; import FResponseToolbar from '@farris/ui-vue/components/response-toolbar/designer'; import FResponseLayout from '@farris/ui-vue/components/response-layout'; -import FResponseLayoutEditorSetting from '@farris/ui-vue/components/response-layout-editor'; +import FResponseLayoutEditorSetting from '@farris/ui-vue/components/response-layout-editor/designer'; import FSearchBox from '@farris/ui-vue/components/search-box'; import FSection from '@farris/ui-vue/components/section/designer'; import FSmokeDetector from '@farris/ui-vue/components/smoke-detector'; diff --git a/packages/ui-vue/components/response-layout-editor/designer.ts b/packages/ui-vue/components/response-layout-editor/designer.ts new file mode 100644 index 0000000000000000000000000000000000000000..4c15bb8a7918a6139fd9a37b530affdd5e8708a4 --- /dev/null +++ b/packages/ui-vue/components/response-layout-editor/designer.ts @@ -0,0 +1,24 @@ +import { Plugin } from 'vue'; +import { ResponseLayoutEditorSetting, ResponseLayoutEditorSettingProps, responseLayoutEditorSettingProps } from '@farris/ui-vue/components/response-layout-editor'; +import ResponseLayoutEditorSettingDesign from './src/designer/response-layout-editor-setting.design.component'; +import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver'; +import { schemaMapper } from './src/schema/schema-mapper'; +import { schemaResolver } from './src/schema/schema-resolver'; +import responseLayoutEditorSettingSchema from './src/schema/response-layout-editor-setting.schema.json'; +import propertyConfig from './src/property-config/response-layout-editor-setting.property-config.json'; +import { useResponseLayoutEditorSetting } from './src/composition/converter/use-response-layout-editor-setting'; + +export const propsResolver = createPropsResolver(responseLayoutEditorSettingProps, responseLayoutEditorSettingSchema, schemaMapper, schemaResolver, propertyConfig); + +export { useResponseLayoutEditorSetting }; +ResponseLayoutEditorSettingDesign.register = (componentMap: Record, propsResolverMap: Record, configResolverMap: Record, resolverMap: Record): void => { + componentMap['response-layout-editor-setting'] = ResponseLayoutEditorSetting; + propsResolverMap['response-layout-editor-setting'] = propsResolver; +}; +ResponseLayoutEditorSettingDesign.registerDesigner = (componentMap: Record, propsResolverMap: Record, configResolverMap: Record): void => { + componentMap['response-layout-editor-setting'] = ResponseLayoutEditorSettingDesign; + propsResolverMap['response-layout-editor-setting'] = propsResolver; +}; + +export default ResponseLayoutEditorSettingDesign as typeof ResponseLayoutEditorSettingDesign & Plugin; + diff --git a/packages/ui-vue/components/response-layout-editor/index.ts b/packages/ui-vue/components/response-layout-editor/index.ts index 9a4232c0305e9535c8cc3bec8a90dac38b189416..8e475bb072b0c33b43cb715884a922f8f783d452 100644 --- a/packages/ui-vue/components/response-layout-editor/index.ts +++ b/packages/ui-vue/components/response-layout-editor/index.ts @@ -1,4 +1,4 @@ - + /** * Copyright (c) 2020 - present, Inspur Genersoft Co., Ltd. * @@ -14,32 +14,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import type { App } from 'vue'; +import type { App, Plugin } from 'vue'; import ResponseLayoutEditor from './src/response-layout-editor.component'; -import ResponseLayoutEditorSettingDesign from './src/designer/response-layout-editor-setting.design.component'; -import { propsResolver } from './src/composition/props/response-layout-editor-setting.props'; import ResponseLayoutEditorSetting from './src/response-layout-editor-setting.component'; import { ResponseFormLayoutContext, type UseResponseLayoutEditorSetting } from './src/type'; +import { responseLayoutEditorSettingProps, type ResponseLayoutEditorSettingProps } from './src/composition/props/response-layout-editor-setting.props'; export * from './src/composition/props/response-layout-editor.props'; export { ResponseLayoutEditorSetting, - ResponseLayoutEditor, ResponseFormLayoutContext, - UseResponseLayoutEditorSetting + ResponseLayoutEditor, + ResponseFormLayoutContext, + UseResponseLayoutEditorSetting, + ResponseLayoutEditorSettingProps, + responseLayoutEditorSettingProps }; -export default { - install(app: App): void { - app.component(ResponseLayoutEditor.name as string, ResponseLayoutEditor); - app.component(ResponseLayoutEditorSetting.name as string, ResponseLayoutEditorSetting); - }, - register(componentMap: Record, propsResolverMap: Record, configResolverMap: Record, resolverMap: Record): void { - componentMap['response-layout-editor-setting'] = ResponseLayoutEditorSetting; - propsResolverMap['response-layout-editor-setting'] = propsResolver; - }, - registerDesigner(componentMap: Record, propsResolverMap: Record, configResolverMap: Record): void { - componentMap['response-layout-editor-setting'] = ResponseLayoutEditorSettingDesign; - propsResolverMap['response-layout-editor-setting'] = propsResolver; - } +ResponseLayoutEditor.install = (app: App): void => { + app.component(ResponseLayoutEditor.name as string, ResponseLayoutEditor); + app.component(ResponseLayoutEditorSetting.name as string, ResponseLayoutEditorSetting); }; +export default ResponseLayoutEditor as typeof ResponseLayoutEditor & Plugin; diff --git a/packages/ui-vue/components/response-layout-editor/src/components/field-list/column-width-editor/column-width-editor.component.tsx b/packages/ui-vue/components/response-layout-editor/src/components/field-list/column-width-editor/column-width-editor.component.tsx index e1237dcfce3ba93bba3bdbccf3321b5c5e24fb6e..26fe1b2bbf970f56ffb64f804b5a3d3efa0b4a5d 100644 --- a/packages/ui-vue/components/response-layout-editor/src/components/field-list/column-width-editor/column-width-editor.component.tsx +++ b/packages/ui-vue/components/response-layout-editor/src/components/field-list/column-width-editor/column-width-editor.component.tsx @@ -1,7 +1,7 @@ import { defineComponent, inject, onMounted, ref, SetupContext, watch } from 'vue'; +import FRadioButton from '@farris/ui-vue/components/radio-button'; +import FRate from '@farris/ui-vue/components/rate'; import { ColumnWidthEditorProps, columnWidthEditorProps } from './column-width-editor.props'; -import FRadioButton from '../../../../../radio-button/src/radio-button.component'; -import FRate from '../../../../../rate/src/rate.component'; import '../../../response-layout-editor.css'; import { UseDraggable } from '../../../composition/types'; diff --git a/packages/ui-vue/components/response-layout-editor/src/components/field-list/field-list.component.tsx b/packages/ui-vue/components/response-layout-editor/src/components/field-list/field-list.component.tsx index e668009895d3f83517ece6396700dcc448f13017..20e4ac0532b6e02091f9fdeb0933e6ab32fdb419 100644 --- a/packages/ui-vue/components/response-layout-editor/src/components/field-list/field-list.component.tsx +++ b/packages/ui-vue/components/response-layout-editor/src/components/field-list/field-list.component.tsx @@ -1,9 +1,9 @@ import { defineComponent, onBeforeMount, provide, Ref, ref, SetupContext, watch } from 'vue'; -import { FieldListProps, fieldListProps } from './field-list.props'; import { cloneDeep } from 'lodash-es'; +import FComboList from '@farris/ui-vue/components/combo-list'; +import { FieldListProps, fieldListProps } from './field-list.props'; import { ComboValue } from '../../type'; import { useDraggable } from '../../composition/use-draggable'; -import FComboList from '../../../../combo-list/src/combo-list.component'; import FColumnWidthEditor from './column-width-editor/column-width-editor.component'; import '../../response-layout-editor.css'; diff --git a/packages/ui-vue/components/response-layout-editor/src/components/screen-resolution-selector/screen-resolution-selector.component.tsx b/packages/ui-vue/components/response-layout-editor/src/components/screen-resolution-selector/screen-resolution-selector.component.tsx index 49861f7e5577a96f92736c03adf9183f7473d678..790f0f856f536679d3bcb798af9f8c5378564717 100644 --- a/packages/ui-vue/components/response-layout-editor/src/components/screen-resolution-selector/screen-resolution-selector.component.tsx +++ b/packages/ui-vue/components/response-layout-editor/src/components/screen-resolution-selector/screen-resolution-selector.component.tsx @@ -2,9 +2,8 @@ import { defineComponent, onBeforeMount, ref, SetupContext, watch } from 'vue'; import { ScreenResolutionSelectorProps, screenResolutionSelectorProps } from './screen-resolution-selector.props'; import '../../response-layout-editor.css'; -import FCapsule from '../../../../capsule/src/capsule.component'; -import FSwitch from '../../../../switch/src/switch.component'; -import { CapsuleItem } from '../../../../capsule'; +import FCapsule, { CapsuleItem } from '@farris/ui-vue/components/capsule'; +import FSwitch from '@farris/ui-vue/components/switch/src/switch.component'; export default defineComponent({ name: 'FScreenResolutionSelector', diff --git a/packages/ui-vue/components/response-layout-editor/src/composition/props/response-layout-editor-setting.props.ts b/packages/ui-vue/components/response-layout-editor/src/composition/props/response-layout-editor-setting.props.ts index c5bddd848bc9047d97938802d05d4b0a4f3b3c9a..19a17d16feb48ea6823de16ebe3a853a1ddf0835 100644 --- a/packages/ui-vue/components/response-layout-editor/src/composition/props/response-layout-editor-setting.props.ts +++ b/packages/ui-vue/components/response-layout-editor/src/composition/props/response-layout-editor-setting.props.ts @@ -1,10 +1,5 @@ import { ExtractPropTypes, PropType } from 'vue'; -import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver'; -import { schemaMapper } from '../../schema/schema-mapper'; -import { schemaResolver } from '../../schema/schema-resolver'; -import responseLayoutEditorSettingSchema from '../../schema/response-layout-editor-setting.schema.json'; -import propertyConfig from '../../property-config/response-layout-editor-setting.property-config.json'; import { ImportData, InitialState } from '../types'; export const responseLayoutEditorSettingProps = { @@ -21,4 +16,3 @@ export const responseLayoutEditorSettingProps = { } as Record; export type ResponseLayoutEditorSettingProps = ExtractPropTypes; -export const propsResolver = createPropsResolver(responseLayoutEditorSettingProps, responseLayoutEditorSettingSchema, schemaMapper, schemaResolver, propertyConfig); diff --git a/packages/ui-vue/components/response-layout-editor/src/designer/response-layout-editor-setting.design.component.tsx b/packages/ui-vue/components/response-layout-editor/src/designer/response-layout-editor-setting.design.component.tsx index 513856f7a59d773b0b63a5878904a331ddcf41ca..1325e55f1c8eb6f791ed19d8398157050813763b 100644 --- a/packages/ui-vue/components/response-layout-editor/src/designer/response-layout-editor-setting.design.component.tsx +++ b/packages/ui-vue/components/response-layout-editor/src/designer/response-layout-editor-setting.design.component.tsx @@ -1,9 +1,9 @@ import { defineComponent, onMounted, inject, ref, SetupContext } from 'vue'; +import { FModalService } from '@farris/ui-vue/components/modal'; +import { DesignerItemContext, useDesignerComponent } from '@farris/ui-vue/components/designer-canvas'; import { ResponseLayoutEditorSettingProps, responseLayoutEditorSettingProps } from '../composition/props/response-layout-editor-setting.props'; -import { FModalService } from '../../../modal'; import FResponseLayoutEditor from '../response-layout-editor.component'; -import { DesignerItemContext, useDesignerComponent } from '@farris/ui-vue/components/designer-canvas'; import '../response-layout-editor.css'; export default defineComponent({ diff --git a/packages/ui-vue/components/response-layout-editor/src/response-layout-editor-setting.component.tsx b/packages/ui-vue/components/response-layout-editor/src/response-layout-editor-setting.component.tsx index cc6711ff0169c461ba63e574c92da520d777d507..32d13141774b6a2a0940e008562fae468fd7b9f2 100644 --- a/packages/ui-vue/components/response-layout-editor/src/response-layout-editor-setting.component.tsx +++ b/packages/ui-vue/components/response-layout-editor/src/response-layout-editor-setting.component.tsx @@ -1,7 +1,7 @@ -import { App, defineComponent, inject, ref, SetupContext, watch } from 'vue'; -import { FMessageBoxService } from '../../message-box'; -import { FModalService } from '../../modal'; +import { App, defineComponent, ref, SetupContext, watch } from 'vue'; +import { FMessageBoxService } from '@farris/ui-vue/components/message-box'; +import { FModalService } from '@farris/ui-vue/components/modal'; import { ResponseLayoutEditorSettingProps, responseLayoutEditorSettingProps } from './composition/props/response-layout-editor-setting.props'; import FResponseLayoutEditor from './response-layout-editor.component';