From 18331d8aa791cab49ceb6acdf0c156eb7bd74f2c Mon Sep 17 00:00:00 2001
From: huyuyang <m15966339253@163.com>
Date: Mon, 23 Dec 2024 11:18:16 +0800
Subject: [PATCH 01/62] =?UTF-8?q?fix:=20=E9=AA=8C=E8=AF=81farris=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1=E5=99=A8=E7=BB=84=E4=BB=B6=E6=8B=86=E5=88=86=E6=89=93?=
 =?UTF-8?q?=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/ui-vue/components/designer-index.ts  |  10 ++
 .../components/input-group/designer-index.ts  |  24 ++++
 .../ui-vue/components/input-group/index.ts    |  16 +--
 .../input-group/src/input-group.props.ts      |   9 +-
 .../ui-vue/scripts/commands/build-designer.js | 131 ++++++++++++++++++
 packages/ui-vue/scripts/index.js              |   5 +-
 6 files changed, 173 insertions(+), 22 deletions(-)
 create mode 100644 packages/ui-vue/components/designer-index.ts
 create mode 100644 packages/ui-vue/components/input-group/designer-index.ts
 create mode 100644 packages/ui-vue/scripts/commands/build-designer.js

diff --git a/packages/ui-vue/components/designer-index.ts b/packages/ui-vue/components/designer-index.ts
new file mode 100644
index 00000000000..6abb205835b
--- /dev/null
+++ b/packages/ui-vue/components/designer-index.ts
@@ -0,0 +1,10 @@
+import { App } from 'vue';
+import FInputDesignerRegister from './input-group/designer-index';
+
+
+export default {
+    install(app: App) {
+        app.use(FInputDesignerRegister);
+    }
+}
+
diff --git a/packages/ui-vue/components/input-group/designer-index.ts b/packages/ui-vue/components/input-group/designer-index.ts
new file mode 100644
index 00000000000..af6db91a3c6
--- /dev/null
+++ b/packages/ui-vue/components/input-group/designer-index.ts
@@ -0,0 +1,24 @@
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
+import FInputGroup from './src/input-group.component';
+import FInputGroupDesgin from './src/designer/input-group.design.component';
+import { schemaMapper } from './src/schema/schema-mapper';
+import { schemaResolver } from './src/schema/schema-resolver';
+import inputGroupSchema from './src/schema/input-group.schema.json';
+import { inputGroupProps, type InputGroupProps } from './src/input-group.props';
+import { App } from 'vue';
+
+export const propsResolver = createPropsResolver<InputGroupProps>(inputGroupProps, inputGroupSchema, schemaMapper, schemaResolver);
+
+export default {
+    install(app: App) {
+        app.component(FInputGroupDesgin.name as string, FInputGroupDesgin);
+    },
+    register(componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>, resolverMap: Record<string, any>) {
+        componentMap['input-group'] = FInputGroup;
+        propsResolverMap['input-group'] = propsResolver;
+    },
+    registerDesigner(componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>) {
+        componentMap['input-group'] = FInputGroupDesgin;
+        propsResolverMap['input-group'] = propsResolver;
+    }
+};
diff --git a/packages/ui-vue/components/input-group/index.ts b/packages/ui-vue/components/input-group/index.ts
index caedd62aef3..299abcee552 100644
--- a/packages/ui-vue/components/input-group/index.ts
+++ b/packages/ui-vue/components/input-group/index.ts
@@ -1,4 +1,4 @@
- 
+
 /**
  * Copyright (c) 2020 - present, Inspur Genersoft Co., Ltd.
  *
@@ -14,22 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { App } from 'vue';
 import FInputGroup from './src/input-group.component';
-import FInputGroupDesgin from './src/designer/input-group.design.component';
-import { propsResolver } from './src/input-group.props';
 import { withInstall } from '@farris/ui-vue/components/common';
 
-export * from './src/input-group.props';
-
-FInputGroup.register = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>, resolverMap: Record<string, any>) => {
-    componentMap['input-group'] = FInputGroup;
-    propsResolverMap['input-group'] = propsResolver;
-};
-FInputGroup.registerDesigner = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>) => {
-    componentMap['input-group'] = FInputGroupDesgin;
-    propsResolverMap['input-group'] = propsResolver;
-};
+export type { InputGroupProps } from './src/input-group.props';
 
 export { FInputGroup };
 export default withInstall(FInputGroup);
diff --git a/packages/ui-vue/components/input-group/src/input-group.props.ts b/packages/ui-vue/components/input-group/src/input-group.props.ts
index df0b0b97871..d2e4f90f328 100644
--- a/packages/ui-vue/components/input-group/src/input-group.props.ts
+++ b/packages/ui-vue/components/input-group/src/input-group.props.ts
@@ -14,13 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ExtractPropTypes, PropType } from 'vue';
-import { createPropsResolver } from '../../dynamic-resolver';
-import { schemaMapper } from './schema/schema-mapper';
-import { schemaResolver } from './schema/schema-resolver';
-import inputGroupSchema from './schema/input-group.schema.json';
+import { ExtractPropTypes } from 'vue';
 
-type TextAlignType = 'left' | 'right' | 'center' | 'start' | 'end' | 'justify';
 export const inputGroupProps = {
     id: { Type: String, default: '' },
     /** 是否自动完成 */
@@ -92,4 +87,4 @@ export const inputGroupProps = {
 
 export type InputGroupProps = ExtractPropTypes<typeof inputGroupProps>;
 
-export const propsResolver = createPropsResolver<InputGroupProps>(inputGroupProps, inputGroupSchema, schemaMapper, schemaResolver);
+
diff --git a/packages/ui-vue/scripts/commands/build-designer.js b/packages/ui-vue/scripts/commands/build-designer.js
new file mode 100644
index 00000000000..6de9d5a0a98
--- /dev/null
+++ b/packages/ui-vue/scripts/commands/build-designer.js
@@ -0,0 +1,131 @@
+import fs from 'fs';
+import path from 'path';
+import { fileURLToPath } from 'url';
+import { defineConfig, build } from 'vite';
+import vue from '@vitejs/plugin-vue';
+import vueJsx from '@vitejs/plugin-vue-jsx';
+import { replace } from './replace-path.js';
+const currentFileName = fileURLToPath(import.meta.url);
+const currentDirectoryName = path.dirname(currentFileName);
+const rootPath = path.resolve(currentDirectoryName, '../../');
+
+const externals = ['vue', '@vueuse/core', '@vue/shared', 'bignumber.js',
+    'lodash', 'lodash-es', 'echarts', '@farris/ui-vue/components'];
+// 编译单个文件
+async function buildSeperately(componentName) {
+    const tsEntry = `./components/${componentName}/designer-index.ts`;
+    if (fs.existsSync(tsEntry)) {
+        await build(
+            defineConfig({
+                configFile: false,
+                publicDir: false,
+                plugins: [vue(), vueJsx(), replace((format, args) => `..${args[1]}/index.${format}.js`)],
+                build: {
+                    lib: {
+                        entry: tsEntry,
+                        name: componentName,
+                        fileName: 'designer-index',
+                        formats: ['esm','umd']
+                    },
+                    outDir: `./package/designer/components/${componentName}`,
+                    rollupOptions: {
+                        logLevel: 'silent',
+                        external:
+                            // ['vue', '@vueuse/core', '@vue/shared', 'bignumber.js',
+                            //      'lodash', 'lodash-es', 'echarts']
+                            (id) => {
+                                return externals.find((item) => id.indexOf(item) === 0);
+                            },
+                        output: {
+                            globals: {
+                                vue: 'Vue',
+                                '@vueuse/core': 'VueUseCore',
+                                '@vue/shared': 'VueShared',
+                                'bignumber.js': 'BigNumber',
+                                'lodash-es': 'LodashES'
+                            },
+                            assetFileNames: ({ name, names, type }) => {
+                                if (type === 'asset' && /\.(css)$/i.test(name)) {
+                                    return 'index.[ext]';
+                                }
+                                if (type === 'asset' && /\.(css)$/i.test(names)) {
+                                    return 'index.[ext]';
+                                }
+                                return '[name].[ext]';
+                            }
+                        }
+                    }
+                },
+                resolve: {
+                    alias: {
+                        '@farris/ui-vue/components': path.resolve(rootPath, './components')
+                    }
+                }
+            })
+        );
+    }
+}
+const buildDesignerLibs = async () => {
+    await build(
+        defineConfig({
+            configFile: false,
+            publicDir: false,
+            plugins: [
+                vue(),
+                vueJsx(),
+            ],
+            build: {
+                lib: {
+                    entry: './components/designer-index.ts',
+                    name: 'FarrisVue',
+                    fileName: 'farris-designer.all',
+                    formats: ['esm', 'umd']
+                },
+                outDir: './package/designer',
+                rollupOptions: {
+                    logLevel: 'silent',
+                    external: ['vue', '@vueuse/core', '@vue/shared', 'bignumber.js', 'lodash', 'lodash-es', 'echarts'],
+                    output: {
+                        exports: "named",
+                        globals: {
+                            globals: {
+                                vue: 'Vue',
+                                '@vueuse/core': 'VueUseCore',
+                                '@vue/shared': 'VueShared',
+                                'bignumber.js': 'BigNumber',
+                                'lodash-es': 'LodashES'
+                            }
+                        },
+                        assetFileNames: ({ names, type, name }) => {
+                            if (type === 'asset' && /\.(css)$/i.test(name)) {
+                                return 'index.[ext]';
+                            }
+                            if (type === 'asset' && /\.(css)$/i.test(names)) {
+                                return 'index.[ext]';
+                            }
+                            return '[name].[ext]';
+                        }
+                    }
+                }
+            },
+            resolve: {
+                alias: {
+                    '@farris/ui-vue/components': path.resolve(rootPath, './components')
+                }
+            }
+        })
+    );
+
+    const components = fs.readdirSync('./components').filter((name) => {
+        const componentDir = path.resolve('./components', name);
+        const isDir = fs.lstatSync(componentDir).isDirectory();
+        const ignore = false;
+        return isDir && !ignore && (fs.readdirSync(componentDir).includes('designer-index.ts'));
+    });
+
+    components.forEach((componentName) => {
+        buildSeperately(componentName);
+    });
+};
+
+export { buildDesignerLibs };
diff --git a/packages/ui-vue/scripts/index.js b/packages/ui-vue/scripts/index.js
index f0aa2b11f2e..9625dc3f9af 100644
--- a/packages/ui-vue/scripts/index.js
+++ b/packages/ui-vue/scripts/index.js
@@ -1,9 +1,12 @@
 #!/usr/bin/env node
 import { Command, Option } from 'commander';
 import { buildLibs } from './commands/build.js';
+import { buildDesignerLibs} from './commands/build-designer.js';
 
 const program = new Command();
+const designerProgram = new Command();
 
 program.command('build').description('构建 Farris UI Vue 组件库').action(buildLibs);
-
 program.parse();
+designerProgram.command('build').description('构建 Farris UI Designer Vue 设计器组件库').action(buildDesignerLibs);
+designerProgram.parse();
-- 
Gitee


From d2be37e7a9f906ebc88a4f38713e734044c7ebbb Mon Sep 17 00:00:00 2001
From: huyuyang <m15966339253@163.com>
Date: Tue, 31 Dec 2024 11:21:46 +0800
Subject: [PATCH 02/62] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E4=B8=8D?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=97=B6,=E8=A1=A8=E6=A0=BC=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=95=B0=E6=8D=AE=E6=9B=B4=E6=96=B0=E4=B8=8D=E7=94=9F?=
 =?UTF-8?q?=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/data-view/composition/data/use-data-view.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/ui-vue/components/data-view/composition/data/use-data-view.ts b/packages/ui-vue/components/data-view/composition/data/use-data-view.ts
index 5d5c3bcd1e6..6b82cffe391 100644
--- a/packages/ui-vue/components/data-view/composition/data/use-data-view.ts
+++ b/packages/ui-vue/components/data-view/composition/data/use-data-view.ts
@@ -74,7 +74,7 @@ export function useDataView(
 
     let summaries = new Map<string, number>();
 
-    const totalItems = computed(() => totalData.value?.length || 0);
+    const totalItems = ref(totalData.value?.length || 0);
 
     const pagination = ref(props.pagination);
     // const pageSize = computed<number>(() => {
@@ -108,10 +108,11 @@ export function useDataView(
     //     deep:true
     // });
     function resetDataView() {
-        totalData.value = cloneDeep(originalData.value);
+        totalData.value = originalData.value;
         if (shouldGroupingData.value) {
             totalData.value = generateGroupData(groupFields.value, originalData.value, columnMaps);
         }
+        totalItems.value = totalData.value.length;
         summaries = groupSummaryFields.value.reduce((sumaries: Map<string, number>, summaryField: string) => {
             sumaries.set(summaryField, 0);
             return sumaries;
@@ -298,7 +299,7 @@ export function useDataView(
             totalData.value = newData;
             rawView.value = newData;
         }
-
+        totalItems.value = totalData.value.length;
         updateDataView();
     }
 
-- 
Gitee


From 2255a8c2c3f0a89095039cb01abc0510c539c458 Mon Sep 17 00:00:00 2001
From: huyuyang <m15966339253@163.com>
Date: Tue, 31 Dec 2024 17:20:32 +0800
Subject: [PATCH 03/62] =?UTF-8?q?fix:=20=E5=AE=9E=E7=8E=B0inputgroup?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E8=AE=BE=E8=AE=A1=E6=97=B6=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E5=92=8C=E9=80=9A=E7=94=A8=E7=BB=84=E4=BB=B6=E5=88=86=E7=A6=BB?=
 =?UTF-8?q?=E6=89=93=E5=8C=85=E6=9C=BA=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../designer-canvas/src/components/maps.ts    |  2 +-
 .../{designer-index.ts => designer.ts}        |  4 ++--
 .../dynamic-view/src/components/maps.ts       |  2 +-
 .../enum-editor-table.component.tsx           |  6 ++---
 .../view-model/view-model.component.tsx       |  6 ++---
 packages/ui-vue/components/index.ts           |  4 ++--
 .../{designer-index.ts => designer.ts}        |  0
 .../src/property-editor.component.tsx         |  2 +-
 .../ui-vue/scripts/commands/build-designer.js | 23 +++++++++++++------
 packages/ui-vue/scripts/commands/build.js     | 17 +++++++++++---
 .../scripts/commands/replace-designer-path.js | 17 ++++++++++++++
 packages/ui-vue/scripts/index.js              |  9 ++++----
 12 files changed, 65 insertions(+), 27 deletions(-)
 rename packages/ui-vue/components/{designer-index.ts => designer.ts} (64%)
 rename packages/ui-vue/components/input-group/{designer-index.ts => designer.ts} (100%)
 create mode 100644 packages/ui-vue/scripts/commands/replace-designer-path.js

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 4981de5499e..8cf6d8c52d1 100644
--- a/packages/ui-vue/components/designer-canvas/src/components/maps.ts
+++ b/packages/ui-vue/components/designer-canvas/src/components/maps.ts
@@ -16,7 +16,7 @@ import FExteranlContainer from '@farris/ui-vue/components/external-container';
 import FEventsEditor from '@farris/ui-vue/components/events-editor';
 import FFilterBar from '@farris/ui-vue/components/filter-bar';
 import FImageCropper from '@farris/ui-vue/components/image-cropper';
-import FInputGroup from '@farris/ui-vue/components/input-group';
+import FInputGroup from '@farris/ui-vue/components/input-group/designer';
 import FLayout from '@farris/ui-vue/components/layout';
 import FListNav from '@farris/ui-vue/components/list-nav';
 import FListView from '@farris/ui-vue/components/list-view';
diff --git a/packages/ui-vue/components/designer-index.ts b/packages/ui-vue/components/designer.ts
similarity index 64%
rename from packages/ui-vue/components/designer-index.ts
rename to packages/ui-vue/components/designer.ts
index 6abb205835b..e8a7c576df8 100644
--- a/packages/ui-vue/components/designer-index.ts
+++ b/packages/ui-vue/components/designer.ts
@@ -1,6 +1,5 @@
 import { App } from 'vue';
-import FInputDesignerRegister from './input-group/designer-index';
-
+import FInputDesignerRegister from './input-group/designer';
 
 export default {
     install(app: App) {
@@ -8,3 +7,4 @@ export default {
     }
 }
 
+
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 2787adf3c49..c8f3112933a 100644
--- a/packages/ui-vue/components/dynamic-view/src/components/maps.ts
+++ b/packages/ui-vue/components/dynamic-view/src/components/maps.ts
@@ -19,7 +19,7 @@ import FFilterBar from '@farris/ui-vue/components/filter-bar';
 import FFieldSelector from '@farris/ui-vue/components/field-selector';
 import FBindingSelector from '@farris/ui-vue/components/binding-selector';
 import FImageCropper from '@farris/ui-vue/components/image-cropper';
-import FInputGroup from '@farris/ui-vue/components/input-group';
+import FInputGroup from '@farris/ui-vue/components/input-group/designer';
 import FLayout from '@farris/ui-vue/components/layout';
 import FListNav from '@farris/ui-vue/components/list-nav';
 import FListView from '@farris/ui-vue/components/list-view';
diff --git a/packages/ui-vue/components/enum-editor/src/components/enum-editor-table.component.tsx b/packages/ui-vue/components/enum-editor/src/components/enum-editor-table.component.tsx
index 16cd2c92ca5..9dc7eb71e25 100644
--- a/packages/ui-vue/components/enum-editor/src/components/enum-editor-table.component.tsx
+++ b/packages/ui-vue/components/enum-editor/src/components/enum-editor-table.component.tsx
@@ -1,5 +1,5 @@
 import { SetupContext, computed, defineComponent, reactive, ref, watch } from "vue";
-import InputGroupComponent from '@farris/ui-vue/components/input-group';
+import FInputGroup from '@farris/ui-vue/components/input-group';
 import { EnumEditorTableProps, enumEditorTableProps } from "./enum-editor-table.props";
 import { SelectedEnumItem } from "../composition/types";
 
@@ -102,10 +102,10 @@ export default defineComponent({
                     key={enumItem.id} data-index={itemIndex}
                     class={selectedRowInfo.value?.index === itemIndex ? 'selected': ''}>
                     <td>
-                        <InputGroupComponent v-model={enumItem[props.valueField]}></InputGroupComponent>
+                        <FInputGroup v-model={enumItem[props.valueField]}></FInputGroup>
                     </td>
                     <td>
-                        <InputGroupComponent v-model={enumItem[props.textField]}></InputGroupComponent>
+                        <FInputGroup v-model={enumItem[props.textField]}></FInputGroup>
                     </td>
                     <td style="width: 42px">
                         <button type="button" class="btn btn-link" onClick={(payload: MouseEvent) => removeEnumItem(payload, itemIndex)}>
diff --git a/packages/ui-vue/components/events-editor/src/components/view-model/view-model.component.tsx b/packages/ui-vue/components/events-editor/src/components/view-model/view-model.component.tsx
index 56b76e741e9..350001f0661 100644
--- a/packages/ui-vue/components/events-editor/src/components/view-model/view-model.component.tsx
+++ b/packages/ui-vue/components/events-editor/src/components/view-model/view-model.component.tsx
@@ -1,6 +1,6 @@
 import { SetupContext, defineComponent, ref } from "vue";
 import { ViewModelProps, viewModelProps } from "./view-model.props";
-import InputGroup from '@farris/ui-vue/components/input-group';
+import FInputGroup from '@farris/ui-vue/components/input-group';
 
 export default defineComponent({
     name: 'FViewModel',
@@ -27,8 +27,8 @@ export default defineComponent({
             return (
                 <div class="f-vm-search">
                     <div class="f-vm-searchBar">
-                        <InputGroup groupText={groupIcon.value} v-model={searchValue.value}
-                            onChange={onChange} onClear={onClear} onClickHandle={onClickHandle}></InputGroup>
+                        <FInputGroup groupText={groupIcon.value} v-model={searchValue.value}
+                            onChange={onChange} onClear={onClear} onClickHandle={onClickHandle}></FInputGroup>
                     </div>
                 </div>
             );
diff --git a/packages/ui-vue/components/index.ts b/packages/ui-vue/components/index.ts
index bbc22756589..254b4b8a933 100644
--- a/packages/ui-vue/components/index.ts
+++ b/packages/ui-vue/components/index.ts
@@ -42,7 +42,7 @@ import EventsEditor from './events-editor';
 import FieldSelector from './field-selector';
 import FilterBar from './filter-bar';
 import ImageCropper from './image-cropper';
-import InputGroup from './input-group';
+import FInputGroup from './input-group';
 import Layout from './layout';
 import ListNav from './list-nav';
 import Loading from './loading';
@@ -134,7 +134,7 @@ export default {
             .use(FieldSelector)
             .use(FilterBar)
             .use(ImageCropper)
-            .use(InputGroup)
+            .use(FInputGroup)
             .use(Layout)
             .use(ListNav)
             .use(Loading)
diff --git a/packages/ui-vue/components/input-group/designer-index.ts b/packages/ui-vue/components/input-group/designer.ts
similarity index 100%
rename from packages/ui-vue/components/input-group/designer-index.ts
rename to packages/ui-vue/components/input-group/designer.ts
diff --git a/packages/ui-vue/components/property-editor/src/property-editor.component.tsx b/packages/ui-vue/components/property-editor/src/property-editor.component.tsx
index 2d5eaae0751..ad7b7f8b575 100644
--- a/packages/ui-vue/components/property-editor/src/property-editor.component.tsx
+++ b/packages/ui-vue/components/property-editor/src/property-editor.component.tsx
@@ -20,7 +20,7 @@ import { PropertyEditorProps, propertyEditorProps } from './property-editor.prop
 import { cloneDeep } from 'lodash-es';
 import { option1, archiveOfPropertyValue, dropdownStatesInTotal } from './composition/data';
 import { FComboList } from '../../../components/combo-list';
-import { FInputGroup } from '../../../components/input-group';
+import FInputGroup from '@farris/ui-vue/components/input-group';
 import { FNumberSpinner } from '../../../components/number-spinner';
 import { useInitializedValue } from './composition/use-initialized-value';
 import { useUpdate } from './composition/use-update-data';
diff --git a/packages/ui-vue/scripts/commands/build-designer.js b/packages/ui-vue/scripts/commands/build-designer.js
index 6de9d5a0a98..b4992105eed 100644
--- a/packages/ui-vue/scripts/commands/build-designer.js
+++ b/packages/ui-vue/scripts/commands/build-designer.js
@@ -4,6 +4,7 @@ import { fileURLToPath } from 'url';
 import { defineConfig, build } from 'vite';
 import vue from '@vitejs/plugin-vue';
 import vueJsx from '@vitejs/plugin-vue-jsx';
+import { replaceDesignerPath } from './replace-designer-path.js';
 import { replace } from './replace-path.js';
 const currentFileName = fileURLToPath(import.meta.url);
 const currentDirectoryName = path.dirname(currentFileName);
@@ -13,21 +14,23 @@ const externals = ['vue', '@vueuse/core', '@vue/shared', 'bignumber.js',
     'lodash', 'lodash-es', 'echarts', '@farris/ui-vue/components'];
 // 编译单个文件
 async function buildSeperately(componentName) {
-    const tsEntry = `./components/${componentName}/designer-index.ts`;
+    const tsEntry = `./components/${componentName}/designer.ts`;
     if (fs.existsSync(tsEntry)) {
         await build(
             defineConfig({
                 configFile: false,
                 publicDir: false,
-                plugins: [vue(), vueJsx(), replace((format, args) => `..${args[1]}/index.${format}.js`)],
+                plugins: [vue(), vueJsx(), 
+                    replaceDesignerPath((format, args) => `..${args[2]}/designer.${format}.js`),
+                    replace((format, args) => `../../components${args[2]}/index.${format}.js`)],
                 build: {
                     lib: {
                         entry: tsEntry,
                         name: componentName,
-                        fileName: 'designer-index',
+                        fileName: 'designer',
                         formats: ['esm','umd']
                     },
-                    outDir: `./package/designer/components/${componentName}`,
+                    outDir: `./package/designer/${componentName}`,
                     rollupOptions: {
                         logLevel: 'silent',
                         external:
@@ -73,10 +76,13 @@ const buildDesignerLibs = async () => {
             plugins: [
                 vue(),
                 vueJsx(),
+                // 应该先替换设计器组件路径，注意插件的顺序
+                replaceDesignerPath((format, args) => `.${args[2]}/designer.${format}.js`),
+                replace((format, args) => `../components${args[2]}/index.${format}.js`)
             ],
             build: {
                 lib: {
-                    entry: './components/designer-index.ts',
+                    entry: './components/designer.ts',
                     name: 'FarrisVue',
                     fileName: 'farris-designer.all',
                     formats: ['esm', 'umd']
@@ -84,7 +90,10 @@ const buildDesignerLibs = async () => {
                 outDir: './package/designer',
                 rollupOptions: {
                     logLevel: 'silent',
-                    external: ['vue', '@vueuse/core', '@vue/shared', 'bignumber.js', 'lodash', 'lodash-es', 'echarts'],
+                    // external: ['vue', '@vueuse/core', '@vue/shared', 'bignumber.js', 'lodash', 'lodash-es', 'echarts', '@farris/ui-vue/components'],
+                    external:(id) => {
+                        return externals.find((item) => id.indexOf(item) === 0);
+                    },
                     output: {
                         exports: "named",
                         globals: {
@@ -120,7 +129,7 @@ const buildDesignerLibs = async () => {
         const componentDir = path.resolve('./components', name);
         const isDir = fs.lstatSync(componentDir).isDirectory();
         const ignore = false;
-        return isDir && !ignore && (fs.readdirSync(componentDir).includes('designer-index.ts'));
+        return isDir && !ignore && (fs.readdirSync(componentDir).includes('designer.ts'));
     });
 
     components.forEach((componentName) => {
diff --git a/packages/ui-vue/scripts/commands/build.js b/packages/ui-vue/scripts/commands/build.js
index f29ab83eb93..4ced4451831 100644
--- a/packages/ui-vue/scripts/commands/build.js
+++ b/packages/ui-vue/scripts/commands/build.js
@@ -9,6 +9,7 @@ import vueJsx from '@vitejs/plugin-vue-jsx';
 import dts from 'vite-plugin-dts';
 import ts from 'typescript';
 import { replace } from './replace-path.js';
+import { replaceDesignerPath } from './replace-designer-path.js';
 
 const currentFileName = fileURLToPath(import.meta.url);
 const currentDirectoryName = path.dirname(currentFileName);
@@ -95,7 +96,11 @@ async function buildSeperately(componentName) {
             defineConfig({
                 configFile: false,
                 publicDir: false,
-                plugins: [vue(), vueJsx(), replace((format, args) => `..${args[2]}/index.${format}.js`)],
+                plugins: [vue(), vueJsx(), 
+                    // 应该先替换设计器组件路径，注意插件的顺序
+                    replaceDesignerPath((format, args) => `../../designer${args[2]}/designer.${format}.js`),
+                    replace((format, args) => `..${args[2]}/index.${format}.js`)
+                ],
                 build: {
                     lib: {
                         entry: tsEntry,
@@ -172,7 +177,10 @@ const buildLibs = async () => {
                     outputDir: `./package/types`,
                     noEmitOnError: false,
                     skipDiagnostics: false
-                })
+                }),
+                // 应该先替换设计器组件路径，注意插件的顺序
+                replaceDesignerPath((format, args) => `./designer${args[2]}/designer.${format}.js`),
+                replace((format, args) => `./components${args[2]}/index.${format}.js`)
             ],
             build: {
                 lib: {
@@ -184,7 +192,10 @@ const buildLibs = async () => {
                 outDir: './package',
                 rollupOptions: {
                     logLevel: 'silent',
-                    external: ['vue', '@vueuse/core', '@vue/shared', 'bignumber.js', 'lodash', 'lodash-es', 'echarts'],
+                    // external: ['vue', '@vueuse/core', '@vue/shared', 'bignumber.js', 'lodash', 'lodash-es', 'echarts'],
+                    external:(id) => {
+                        return externals.find((item) => id.indexOf(item) === 0);
+                    },
                     output: {
                         exports: "named",
                         globals: {
diff --git a/packages/ui-vue/scripts/commands/replace-designer-path.js b/packages/ui-vue/scripts/commands/replace-designer-path.js
new file mode 100644
index 00000000000..4795b073fc7
--- /dev/null
+++ b/packages/ui-vue/scripts/commands/replace-designer-path.js
@@ -0,0 +1,17 @@
+export function replaceDesignerPath(path) {
+    return {
+        name: 'replaceThePathOfDesignerUIVueComponent',
+        renderChunk(code, chunk) {
+            const fileNames = chunk.fileName.split('.');
+            const format = fileNames[fileNames.length - 2];
+            return code.replace(/(@farris\/ui-vue|@)\/components(\/\w+(-\w+)*)\/designer/g, (...args) => {
+                return path(format, args);
+            });
+            // /@farris\/ui-vue\/components(\/\w+(-\w+)*)/g
+            // /(@farris\/ui-vue|@)\/components(\/\w+(-\w+)*)/g
+            // return code.replace(/((@farris\/ui-vue\/components)|@\/components)(\/\w+(-\w+)*)/g, (...args) => {
+            //     return path(format, args);
+            // });
+        }
+    };
+};
diff --git a/packages/ui-vue/scripts/index.js b/packages/ui-vue/scripts/index.js
index 9625dc3f9af..f79b780d3b7 100644
--- a/packages/ui-vue/scripts/index.js
+++ b/packages/ui-vue/scripts/index.js
@@ -1,12 +1,13 @@
 #!/usr/bin/env node
 import { Command, Option } from 'commander';
 import { buildLibs } from './commands/build.js';
-import { buildDesignerLibs} from './commands/build-designer.js';
+import { buildDesignerLibs } from './commands/build-designer.js';
 
 const program = new Command();
 const designerProgram = new Command();
 
-program.command('build').description('构建 Farris UI Vue 组件库').action(buildLibs);
+program.command('build').description('构建 Farris UI Vue 组件库').action(function () {
+    buildLibs()
+    .then(() => {  buildDesignerLibs();});
+});
 program.parse();
-designerProgram.command('build').description('构建 Farris UI Designer Vue 设计器组件库').action(buildDesignerLibs);
-designerProgram.parse();
-- 
Gitee


From 949ea4109b9ffb0a767d7a13f1f59d77a9e43e32 Mon Sep 17 00:00:00 2001
From: huyuyang <m15966339253@163.com>
Date: Mon, 17 Feb 2025 19:32:04 +0800
Subject: [PATCH 04/62] =?UTF-8?q?fix:=20=E7=8B=AC=E7=AB=8Bradio=E5=92=8Cch?=
 =?UTF-8?q?eckbox=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui-vue/components/checkbox-group/index.ts |  39 +++++
 .../src/checkbox-group.component.tsx          | 156 +++++++++---------
 .../src/checkbox-group.props.ts               |   0
 .../src/composition/types.ts                  |   0
 .../src/composition/use-checkbox-group.ts     |   0
 .../checkbox-group.design.component.tsx       |   0
 .../checkbox-group/src/designer/use-rules.ts  |  19 +++
 .../check-group.property-config.ts            |   0
 .../src/schema/check-group.schema.json        |   0
 .../src/schema/schema-mapper.ts               |   5 +
 .../src/schema/schema-resolver.ts             |   5 +
 .../ui-vue/components/checkbox-group/style.ts |   3 +
 packages/ui-vue/components/checkbox/index.ts  |  26 +--
 .../{components => }/checkbox.component.tsx   |   8 +-
 .../src/{components => }/checkbox.css         |   0
 .../src/{components => }/checkbox.props.ts    |  12 +-
 .../components/checkbox-button.component.tsx  |   8 +-
 .../designer/checkbox.design.component.tsx    |   6 +-
 .../checkbox/src/designer/use-rules.ts        |  15 --
 .../common/radio-checkbox/use-check.ts        |   8 +-
 .../components/common/utils/symbol-key.ts     |   4 +-
 packages/ui-vue/components/components.ts      |  11 +-
 .../data-grid-column.property-config.ts       |   2 +-
 .../boolean-filter-editor.component.tsx       |   1 -
 packages/ui-vue/components/index.ts           |   8 +-
 .../ui-vue/components/radio-group/index.ts    |  19 +--
 .../radio-group/src/components/symbol.ts      |   3 -
 .../radio-group/src/radio-group.component.tsx |   2 +-
 packages/ui-vue/components/radio/index.ts     |  26 +++
 .../src}/radio.component.tsx                  |   4 +-
 .../src/components => radio/src}/radio.css    |   0
 .../components => radio/src}/radio.props.ts   |   0
 packages/ui-vue/components/radio/style.ts     |   0
 33 files changed, 232 insertions(+), 158 deletions(-)
 create mode 100644 packages/ui-vue/components/checkbox-group/index.ts
 rename packages/ui-vue/components/{checkbox => checkbox-group}/src/checkbox-group.component.tsx (97%)
 rename packages/ui-vue/components/{checkbox => checkbox-group}/src/checkbox-group.props.ts (100%)
 rename packages/ui-vue/components/{checkbox => checkbox-group}/src/composition/types.ts (100%)
 rename packages/ui-vue/components/{checkbox => checkbox-group}/src/composition/use-checkbox-group.ts (100%)
 rename packages/ui-vue/components/{checkbox => checkbox-group}/src/designer/checkbox-group.design.component.tsx (100%)
 create mode 100644 packages/ui-vue/components/checkbox-group/src/designer/use-rules.ts
 rename packages/ui-vue/components/{checkbox => checkbox-group}/src/property-config/check-group.property-config.ts (100%)
 rename packages/ui-vue/components/{checkbox => checkbox-group}/src/schema/check-group.schema.json (100%)
 create mode 100644 packages/ui-vue/components/checkbox-group/src/schema/schema-mapper.ts
 create mode 100644 packages/ui-vue/components/checkbox-group/src/schema/schema-resolver.ts
 create mode 100644 packages/ui-vue/components/checkbox-group/style.ts
 rename packages/ui-vue/components/checkbox/src/{components => }/checkbox.component.tsx (93%)
 rename packages/ui-vue/components/checkbox/src/{components => }/checkbox.css (100%)
 rename packages/ui-vue/components/checkbox/src/{components => }/checkbox.props.ts (80%)
 delete mode 100644 packages/ui-vue/components/radio-group/src/components/symbol.ts
 create mode 100644 packages/ui-vue/components/radio/index.ts
 rename packages/ui-vue/components/{radio-group/src/components => radio/src}/radio.component.tsx (95%)
 rename packages/ui-vue/components/{radio-group/src/components => radio/src}/radio.css (100%)
 rename packages/ui-vue/components/{radio-group/src/components => radio/src}/radio.props.ts (100%)
 create mode 100644 packages/ui-vue/components/radio/style.ts

diff --git a/packages/ui-vue/components/checkbox-group/index.ts b/packages/ui-vue/components/checkbox-group/index.ts
new file mode 100644
index 00000000000..4e39cce3148
--- /dev/null
+++ b/packages/ui-vue/components/checkbox-group/index.ts
@@ -0,0 +1,39 @@
+ 
+/**
+ * Copyright (c) 2020 - present, Inspur Genersoft Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import type { App, Plugin } from 'vue';
+import FCheckboxGroup from './src/checkbox-group.component';
+import { checkBoxGroupPropsResolver } from './src/checkbox-group.props';
+import FCheckboxGroupDesigner from './src/designer/checkbox-group.design.component';
+
+export * from './src/checkbox-group.props';
+export * from './src/composition/types';
+
+FCheckboxGroup.install = (app: App) => {
+    app.component(FCheckboxGroup.name as string, FCheckboxGroup);
+};
+
+FCheckboxGroup.register = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>, resolverMap: Record<string, any>) => {
+    componentMap['check-group'] = FCheckboxGroup;
+    propsResolverMap['check-group'] = checkBoxGroupPropsResolver;
+};
+FCheckboxGroup.registerDesigner = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>) => {
+    componentMap['check-group'] = FCheckboxGroupDesigner;
+    propsResolverMap['check-group'] = checkBoxGroupPropsResolver;
+};
+
+export { FCheckboxGroup };
+export default FCheckboxGroup as typeof FCheckboxGroup & Plugin;
diff --git a/packages/ui-vue/components/checkbox/src/checkbox-group.component.tsx b/packages/ui-vue/components/checkbox-group/src/checkbox-group.component.tsx
similarity index 97%
rename from packages/ui-vue/components/checkbox/src/checkbox-group.component.tsx
rename to packages/ui-vue/components/checkbox-group/src/checkbox-group.component.tsx
index adb080e0bae..40450ec181f 100644
--- a/packages/ui-vue/components/checkbox/src/checkbox-group.component.tsx
+++ b/packages/ui-vue/components/checkbox-group/src/checkbox-group.component.tsx
@@ -1,78 +1,78 @@
-/**
- * Copyright (c) 2020 - present, Inspur Genersoft Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { defineComponent, computed, ref, watch, provide } from 'vue';
-import type { SetupContext } from 'vue';
-import { CheckboxGroupProps, checkboxGroupProps } from './checkbox-group.props';
-import { useCheckboxGroup } from './composition/use-checkbox-group';
-import { CHECKBOX_CONTEXT } from '@farris/ui-vue/components/common';
-
-export default defineComponent({
-    name: 'FCheckboxGroup',
-    props: checkboxGroupProps,
-    emits: ['changeValue', 'update:modelValue'] as (string[] & ThisType<void>) | undefined,
-    setup(props: CheckboxGroupProps, context: SetupContext) {
-        const modelValue = ref(props.modelValue);
-        const tabIndex = ref(props.tabIndex);
-        const name = ref(props.name);
-        const { enumData, onClickCheckbox, getValue, getText, checked } = useCheckboxGroup(props, context, modelValue);
-
-        const horizontalClass = computed(() => ({
-            'farris-checkradio-hor': props.direction === 'horizontal'
-        }));
-
-        watch(
-            () => props.modelValue,
-            (value: any) => {
-                modelValue.value = value;
-            }
-        );
-
-
-        const values = ref([]);
-
-        // 模板用法复选框上下文
-        provide(CHECKBOX_CONTEXT, { values, parentProps: props, parentContext: context });
-
-        return () => {
-            return (
-                <div class={['farris-input-wrap', 'f-checkbox-group',
-                    horizontalClass.value]}>
-                    {context.slots.default ? context.slots.default() : enumData.value.map((item, index) => {
-                        const id = 'checkbox_' + name.value + index;
-                        return (
-                            <div class="custom-control custom-checkbox">
-                                <input
-                                    type="checkbox"
-                                    class="custom-control-input"
-                                    name={name.value}
-                                    id={id}
-                                    value={getValue(item)}
-                                    checked={checked(item)}
-                                    disabled={props.readonly || props.disabled}
-                                    tabindex={tabIndex.value}
-                                    onClick={(event: MouseEvent) => onClickCheckbox(item, event)}
-                                />
-                                <label class="custom-control-label" for={id} title={getText(item)}>
-                                    {getText(item)}
-                                </label>
-                            </div>
-                        );
-                    })}
-                </div>
-            );
-        };
-    }
-});
+/**
+ * Copyright (c) 2020 - present, Inspur Genersoft Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { defineComponent, computed, ref, watch, provide } from 'vue';
+import type { SetupContext } from 'vue';
+import { CheckboxGroupProps, checkboxGroupProps } from './checkbox-group.props';
+import { useCheckboxGroup } from './composition/use-checkbox-group';
+import { CHECKBOX_CONTEXT } from '@farris/ui-vue/components/common';
+
+export default defineComponent({
+    name: 'FCheckboxGroup',
+    props: checkboxGroupProps,
+    emits: ['changeValue', 'update:modelValue'] as (string[] & ThisType<void>) | undefined,
+    setup(props: CheckboxGroupProps, context: SetupContext) {
+        const modelValue = ref(props.modelValue);
+        const tabIndex = ref(props.tabIndex);
+        const name = ref(props.name);
+        const { enumData, onClickCheckbox, getValue, getText, checked } = useCheckboxGroup(props, context, modelValue);
+
+        const horizontalClass = computed(() => ({
+            'farris-checkradio-hor': props.direction === 'horizontal'
+        }));
+
+        watch(
+            () => props.modelValue,
+            (value: any) => {
+                modelValue.value = value;
+            }
+        );
+
+
+        const values = ref([]);
+
+        // 模板用法复选框上下文
+        provide(CHECKBOX_CONTEXT, { values, parentProps: props, parentContext: context });
+
+        return () => {
+            return (
+                <div class={['farris-input-wrap', 'f-checkbox-group',
+                    horizontalClass.value]}>
+                    {context.slots.default ? context.slots.default() : enumData.value.map((item, index) => {
+                        const id = 'checkbox_' + name.value + index;
+                        return (
+                            <div class="custom-control custom-checkbox">
+                                <input
+                                    type="checkbox"
+                                    class="custom-control-input"
+                                    name={name.value}
+                                    id={id}
+                                    value={getValue(item)}
+                                    checked={checked(item)}
+                                    disabled={props.readonly || props.disabled}
+                                    tabindex={tabIndex.value}
+                                    onClick={(event: MouseEvent) => onClickCheckbox(item, event)}
+                                />
+                                <label class="custom-control-label" for={id} title={getText(item)}>
+                                    {getText(item)}
+                                </label>
+                            </div>
+                        );
+                    })}
+                </div>
+            );
+        };
+    }
+});
diff --git a/packages/ui-vue/components/checkbox/src/checkbox-group.props.ts b/packages/ui-vue/components/checkbox-group/src/checkbox-group.props.ts
similarity index 100%
rename from packages/ui-vue/components/checkbox/src/checkbox-group.props.ts
rename to packages/ui-vue/components/checkbox-group/src/checkbox-group.props.ts
diff --git a/packages/ui-vue/components/checkbox/src/composition/types.ts b/packages/ui-vue/components/checkbox-group/src/composition/types.ts
similarity index 100%
rename from packages/ui-vue/components/checkbox/src/composition/types.ts
rename to packages/ui-vue/components/checkbox-group/src/composition/types.ts
diff --git a/packages/ui-vue/components/checkbox/src/composition/use-checkbox-group.ts b/packages/ui-vue/components/checkbox-group/src/composition/use-checkbox-group.ts
similarity index 100%
rename from packages/ui-vue/components/checkbox/src/composition/use-checkbox-group.ts
rename to packages/ui-vue/components/checkbox-group/src/composition/use-checkbox-group.ts
diff --git a/packages/ui-vue/components/checkbox/src/designer/checkbox-group.design.component.tsx b/packages/ui-vue/components/checkbox-group/src/designer/checkbox-group.design.component.tsx
similarity index 100%
rename from packages/ui-vue/components/checkbox/src/designer/checkbox-group.design.component.tsx
rename to packages/ui-vue/components/checkbox-group/src/designer/checkbox-group.design.component.tsx
diff --git a/packages/ui-vue/components/checkbox-group/src/designer/use-rules.ts b/packages/ui-vue/components/checkbox-group/src/designer/use-rules.ts
new file mode 100644
index 00000000000..e3af56d9852
--- /dev/null
+++ b/packages/ui-vue/components/checkbox-group/src/designer/use-rules.ts
@@ -0,0 +1,19 @@
+ 
+import { UseDesignerRules } from "../../../designer-canvas/src/composition/types";
+import { ComponentSchema, DesignerComponentInstance, DesignerItemContext } from "../../../designer-canvas/src/types";
+import { CheckGroupProperty } from "../property-config/check-group.property-config";
+
+
+export function useCheckGroupDesignerRules(designItemContext: DesignerItemContext, designerHostService): UseDesignerRules {
+
+    const schema = designItemContext.schema as ComponentSchema;
+
+    // 构造属性配置方法
+    function getPropsConfig(componentId: string, componentInstance: DesignerComponentInstance) {
+        const inputGroupProps = new CheckGroupProperty(componentId, designerHostService);
+        return inputGroupProps.getPropertyConfig(schema, componentInstance);
+    }
+
+    return { getPropsConfig } as UseDesignerRules;
+
+}
diff --git a/packages/ui-vue/components/checkbox/src/property-config/check-group.property-config.ts b/packages/ui-vue/components/checkbox-group/src/property-config/check-group.property-config.ts
similarity index 100%
rename from packages/ui-vue/components/checkbox/src/property-config/check-group.property-config.ts
rename to packages/ui-vue/components/checkbox-group/src/property-config/check-group.property-config.ts
diff --git a/packages/ui-vue/components/checkbox/src/schema/check-group.schema.json b/packages/ui-vue/components/checkbox-group/src/schema/check-group.schema.json
similarity index 100%
rename from packages/ui-vue/components/checkbox/src/schema/check-group.schema.json
rename to packages/ui-vue/components/checkbox-group/src/schema/check-group.schema.json
diff --git a/packages/ui-vue/components/checkbox-group/src/schema/schema-mapper.ts b/packages/ui-vue/components/checkbox-group/src/schema/schema-mapper.ts
new file mode 100644
index 00000000000..97964aee23b
--- /dev/null
+++ b/packages/ui-vue/components/checkbox-group/src/schema/schema-mapper.ts
@@ -0,0 +1,5 @@
+import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+
+export const schemaMapper = new Map<string, string | MapperFunction>([
+    ['appearance', resolveAppearance]
+]);
diff --git a/packages/ui-vue/components/checkbox-group/src/schema/schema-resolver.ts b/packages/ui-vue/components/checkbox-group/src/schema/schema-resolver.ts
new file mode 100644
index 00000000000..b02bdf93eec
--- /dev/null
+++ b/packages/ui-vue/components/checkbox-group/src/schema/schema-resolver.ts
@@ -0,0 +1,5 @@
+import { DynamicResolver } from "../../../dynamic-resolver";
+
+export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
+    return schema;
+}
diff --git a/packages/ui-vue/components/checkbox-group/style.ts b/packages/ui-vue/components/checkbox-group/style.ts
new file mode 100644
index 00000000000..548d980965a
--- /dev/null
+++ b/packages/ui-vue/components/checkbox-group/style.ts
@@ -0,0 +1,3 @@
+import "@farris/ui-vue/components/dependent-base/style";
+import "@farris/ui-vue/components/dependent-icon/style";
+import "@farris/ui-vue/theme-default/components/checkbox.css";
diff --git a/packages/ui-vue/components/checkbox/index.ts b/packages/ui-vue/components/checkbox/index.ts
index 8ddbbe407d3..71be65c6905 100644
--- a/packages/ui-vue/components/checkbox/index.ts
+++ b/packages/ui-vue/components/checkbox/index.ts
@@ -15,34 +15,24 @@
  * limitations under the License.
  */
 import type { App, Plugin } from 'vue';
-import FCheckbox from './src/components/checkbox.component';
-import { checkBoxPropsResolver } from './src/components/checkbox.props';
-import FCheckboxGroup from './src/checkbox-group.component';
-import { checkBoxGroupPropsResolver } from './src/checkbox-group.props';
-import FCheckboxGroupDesigner from './src/designer/checkbox-group.design.component';
+import FCheckbox from './src/checkbox.component';
+import { checkBoxPropsResolver } from './src/checkbox.props';
 import FCheckboxDesigner from './src/designer/checkbox.design.component';
 
-export * from './src/checkbox-group.props';
-export * from './src/components/checkbox.props';
-export * from './src/composition/types';
+export * from './src/checkbox.props';
 
-FCheckboxGroup.install = (app: App) => {
-    app.component(FCheckboxGroup.name as string, FCheckboxGroup);
+FCheckbox.install = (app: App) => {
     app.component(FCheckbox.name as string, FCheckbox);
 };
 
-FCheckboxGroup.register = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>, resolverMap: Record<string, any>) => {
+FCheckbox.register = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>, resolverMap: Record<string, any>) => {
     componentMap['check-box'] = FCheckbox;
     propsResolverMap['check-box'] = checkBoxPropsResolver;
-    componentMap['check-group'] = FCheckboxGroup;
-    propsResolverMap['check-group'] = checkBoxGroupPropsResolver;
 };
-FCheckboxGroup.registerDesigner = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>) => {
+FCheckbox.registerDesigner = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>) => {
     componentMap['check-box'] = FCheckboxDesigner;
     propsResolverMap['check-box'] = checkBoxPropsResolver;
-    componentMap['check-group'] = FCheckboxGroupDesigner;
-    propsResolverMap['check-group'] = checkBoxGroupPropsResolver;
 };
 
-export { FCheckboxGroup, FCheckbox };
-export default FCheckboxGroup as typeof FCheckboxGroup & Plugin;
+export { FCheckbox };
+export default FCheckbox as typeof FCheckbox & Plugin;
diff --git a/packages/ui-vue/components/checkbox/src/components/checkbox.component.tsx b/packages/ui-vue/components/checkbox/src/checkbox.component.tsx
similarity index 93%
rename from packages/ui-vue/components/checkbox/src/components/checkbox.component.tsx
rename to packages/ui-vue/components/checkbox/src/checkbox.component.tsx
index 2f7c69b6583..1c9adf870e6 100644
--- a/packages/ui-vue/components/checkbox/src/components/checkbox.component.tsx
+++ b/packages/ui-vue/components/checkbox/src/checkbox.component.tsx
@@ -15,14 +15,14 @@
  */
 import { defineComponent, inject, onMounted, ref, SetupContext } from 'vue';
 import { CHECKBOX_CONTEXT, useCheck } from '@farris/ui-vue/components/common';
-import FCheckboxButton from './checkbox-button.component';
-import { CheckBoxProps, checkBoxProps } from './checkbox.props';
+import FCheckboxButton from './components/checkbox-button.component';
+import { CheckboxProps, checkboxProps } from './checkbox.props';
 
 export default defineComponent({
     name: 'FCheckbox',
-    props: checkBoxProps,
+    props: checkboxProps,
     emits: ['change', 'changeValue', 'update:modelValue', 'update:checked'] as (string[] & ThisType<void>) | undefined,
-    setup(props: CheckBoxProps, context: SetupContext) {
+    setup(props: CheckboxProps, context: SetupContext) {
         const checkBoxContext = inject(CHECKBOX_CONTEXT, null);
         const { checked, disabled, indeterminate, name, onClickCheckBox, shouldRenderButton, shouldRenderNative }
             = useCheck(props, context, checkBoxContext?.parentProps, checkBoxContext?.parentContext);
diff --git a/packages/ui-vue/components/checkbox/src/components/checkbox.css b/packages/ui-vue/components/checkbox/src/checkbox.css
similarity index 100%
rename from packages/ui-vue/components/checkbox/src/components/checkbox.css
rename to packages/ui-vue/components/checkbox/src/checkbox.css
diff --git a/packages/ui-vue/components/checkbox/src/components/checkbox.props.ts b/packages/ui-vue/components/checkbox/src/checkbox.props.ts
similarity index 80%
rename from packages/ui-vue/components/checkbox/src/components/checkbox.props.ts
rename to packages/ui-vue/components/checkbox/src/checkbox.props.ts
index cb45574e3f2..d230d693f89 100644
--- a/packages/ui-vue/components/checkbox/src/components/checkbox.props.ts
+++ b/packages/ui-vue/components/checkbox/src/checkbox.props.ts
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 import { ExtractPropTypes } from 'vue';
-import checkboxSchema from '../schema/checkbox.schema.json';
+import checkboxSchema from './schema/checkbox.schema.json';
 import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
-import { schemaMapper } from '../schema/schema-mapper';
-import { schemaResolver } from '../schema/schema-resolver';
+import { schemaMapper } from './schema/schema-mapper';
+import { schemaResolver } from './schema/schema-resolver';
 
-export const checkBoxProps = {
+export const checkboxProps = {
     /** 组件唯一标识 */
     id: { Type: String, default: '' },
     /** 自定义样式 */
@@ -47,6 +47,6 @@ export const checkBoxProps = {
     checked: { type: Boolean, default: false }
 } as Record<string, any>;
 
-export type CheckBoxProps = ExtractPropTypes<typeof checkBoxProps>;
+export type CheckboxProps = ExtractPropTypes<typeof checkboxProps>;
 
-export const checkBoxPropsResolver = createPropsResolver<CheckBoxProps>(checkBoxProps, checkboxSchema, schemaMapper, schemaResolver);
+export const checkBoxPropsResolver = createPropsResolver<CheckboxProps>(checkboxProps, checkboxSchema, schemaMapper, schemaResolver);
diff --git a/packages/ui-vue/components/checkbox/src/components/checkbox-button.component.tsx b/packages/ui-vue/components/checkbox/src/components/checkbox-button.component.tsx
index 6e156e96abe..7f432df1fa7 100644
--- a/packages/ui-vue/components/checkbox/src/components/checkbox-button.component.tsx
+++ b/packages/ui-vue/components/checkbox/src/components/checkbox-button.component.tsx
@@ -15,14 +15,14 @@
  */
 import { defineComponent, inject, SetupContext } from 'vue';
 import { CHECKBOX_CONTEXT, useCheck } from '@farris/ui-vue/components/common';
-import { CheckBoxProps, checkBoxProps } from './checkbox.props';
-import './checkbox.css';
+import '../checkbox.css';
+import { checkboxProps, CheckboxProps } from '../checkbox.props';
 
 export default defineComponent({
     name: 'FCheckboxButton',
-    props: checkBoxProps,
+    props: checkboxProps,
     emits: ['change', 'changeValue', 'update:modelValue', 'update:checked', 'click'] as (string[] & ThisType<void>) | undefined,
-    setup(props: CheckBoxProps, context: SetupContext) {
+    setup(props: CheckboxProps, context: SetupContext) {
         const checkBoxContext = inject(CHECKBOX_CONTEXT, null);
         const { buttonClass } =
             useCheck(props, context, checkBoxContext?.parentProps, checkBoxContext?.parentContext);
diff --git a/packages/ui-vue/components/checkbox/src/designer/checkbox.design.component.tsx b/packages/ui-vue/components/checkbox/src/designer/checkbox.design.component.tsx
index d830a5d441c..666584d3879 100644
--- a/packages/ui-vue/components/checkbox/src/designer/checkbox.design.component.tsx
+++ b/packages/ui-vue/components/checkbox/src/designer/checkbox.design.component.tsx
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 import { defineComponent, inject, onMounted, ref, SetupContext, watch } from 'vue';
-import { CheckBoxProps, checkBoxProps } from '../components/checkbox.props';
 import { DesignerItemContext } from '../../../designer-canvas/src/types';
 import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
 import { useCheckBoxDesignerRules } from './use-rules';
+import { checkboxProps, CheckboxProps } from '../checkbox.props';
 
 export default defineComponent({
     name: 'FCheckBoxDesign',
-    props: checkBoxProps,
+    props: checkboxProps,
     emits: [] as (string[] & ThisType<void>) | undefined,
-    setup(props: CheckBoxProps, context: SetupContext) {
+    setup(props: CheckboxProps, context: SetupContext) {
         const elementRef = ref();
         const id = ref(props.id);
         const indeterminate = ref(props.indeterminate);
diff --git a/packages/ui-vue/components/checkbox/src/designer/use-rules.ts b/packages/ui-vue/components/checkbox/src/designer/use-rules.ts
index 835ce6eb982..db4c484b8b6 100644
--- a/packages/ui-vue/components/checkbox/src/designer/use-rules.ts
+++ b/packages/ui-vue/components/checkbox/src/designer/use-rules.ts
@@ -1,23 +1,8 @@
  
 import { UseDesignerRules } from "../../../designer-canvas/src/composition/types";
 import { ComponentSchema, DesignerComponentInstance, DesignerItemContext } from "../../../designer-canvas/src/types";
-import { CheckGroupProperty } from "../property-config/check-group.property-config";
 import { CheckBoxProperty } from "../property-config/checkbox.property-config";
 
-
-export function useCheckGroupDesignerRules(designItemContext: DesignerItemContext, designerHostService): UseDesignerRules {
-
-    const schema = designItemContext.schema as ComponentSchema;
-
-    // 构造属性配置方法
-    function getPropsConfig(componentId: string, componentInstance: DesignerComponentInstance) {
-        const inputGroupProps = new CheckGroupProperty(componentId, designerHostService);
-        return inputGroupProps.getPropertyConfig(schema, componentInstance);
-    }
-
-    return { getPropsConfig } as UseDesignerRules;
-
-}
 export function useCheckBoxDesignerRules(designItemContext: DesignerItemContext, designerHostService): UseDesignerRules {
 
     const schema = designItemContext.schema as ComponentSchema;
diff --git a/packages/ui-vue/components/common/radio-checkbox/use-check.ts b/packages/ui-vue/components/common/radio-checkbox/use-check.ts
index b90eb75aa36..912401fa5d2 100644
--- a/packages/ui-vue/components/common/radio-checkbox/use-check.ts
+++ b/packages/ui-vue/components/common/radio-checkbox/use-check.ts
@@ -1,10 +1,12 @@
 import { computed, ref, SetupContext, watch } from 'vue';
 import { isUndefined } from 'lodash-es';
-import { CheckBoxProps, CheckboxGroupProps } from '@farris/ui-vue/components/checkbox';
-import { RadioProps, RadioGroupProps } from '@farris/ui-vue/components/radio-group';
+import { CheckboxProps } from '@farris/ui-vue/components/checkbox';
+import { CheckboxGroupProps } from '@farris/ui-vue/components/checkbox-group';
+import { RadioGroupProps } from '@farris/ui-vue/components/radio-group';
+import { RadioProps } from '@farris/ui-vue/components/radio';
 
 export function useCheck(
-    props: CheckBoxProps | RadioProps,
+    props: CheckboxProps | RadioProps,
     context: SetupContext,
     parentProps: CheckboxGroupProps | RadioGroupProps,
     parentContext: SetupContext,
diff --git a/packages/ui-vue/components/common/utils/symbol-key.ts b/packages/ui-vue/components/common/utils/symbol-key.ts
index 8c3db5ff8c0..b152ec2b166 100644
--- a/packages/ui-vue/components/common/utils/symbol-key.ts
+++ b/packages/ui-vue/components/common/utils/symbol-key.ts
@@ -1,6 +1,8 @@
-import { InjectionKey } from "vue";
+import { InjectionKey, Ref } from "vue";
 
 export const CHECKBOX_CONTEXT: InjectionKey<{ [key: string]: any }> = Symbol('checkboxGroupContext');
 
 /** 选择控制器 */
 export const ControllerSchemaRepositorySymbol = Symbol('controller schema repository inject token');
+
+export const RADIOGROUP_CONTEXT: InjectionKey<{ radios: Ref<Array<any>>;[key: string]: any }> | undefined = Symbol('radioGroupContext');
diff --git a/packages/ui-vue/components/components.ts b/packages/ui-vue/components/components.ts
index 14eac932d15..989ad401f15 100644
--- a/packages/ui-vue/components/components.ts
+++ b/packages/ui-vue/components/components.ts
@@ -10,8 +10,10 @@ export { default as FButtonGroup } from './button-group';
 export { default as FCalculator } from './calculator';
 export { default as FCalendar } from './calendar';
 export { default as FCapsule } from './capsule';
-export { default as FCheckBoxGroup, FCheckbox } from './checkbox';
-export type { CheckBoxProps } from './checkbox';
+export { default as FCheckbox } from './checkbox';
+export type { CheckboxProps } from './checkbox';
+export { default as FCheckBoxGroup } from './checkbox-group';
+export type { CheckboxGroupProps } from './checkbox-group';
 export { default as FColorPicker } from './color-picker';
 export { default as FComboList } from './combo-list';
 export { default as FComboTree } from './combo-tree';
@@ -51,8 +53,9 @@ export { default as FProgress } from './progress';
 export type { ProgressProps } from './progress';
 export { default as FRate } from './rate';
 export type { RateProps } from './rate';
-// export { default as FRadioButton } from './radio-button';
-export { default as FRadioGroup, Radio as FRadio } from './radio-group';
+export { default as FRadio } from './radio';
+export type { RadioProps } from './radio';
+export { default as FRadioGroup } from './radio-group';
 export type { RadioGroupProps } from './radio-group';
 export { default as FResponseToolbar } from './response-toolbar';
 export { default as FSwitch } from './switch';
diff --git a/packages/ui-vue/components/data-grid/src/property-config/data-grid-column.property-config.ts b/packages/ui-vue/components/data-grid/src/property-config/data-grid-column.property-config.ts
index 60a0bf92fb6..eff5daf2294 100644
--- a/packages/ui-vue/components/data-grid/src/property-config/data-grid-column.property-config.ts
+++ b/packages/ui-vue/components/data-grid/src/property-config/data-grid-column.property-config.ts
@@ -3,7 +3,7 @@ import { BaseControlProperty } from '../../../property-panel/src/composition/ent
 import { DgControl } from '../../../designer-canvas/src/composition/dg-control';
 import { InputGroupProperty } from '../../../input-group/src/property-config/input-group.property-config';
 import { AvatarProperty } from '../../../avatar/src/property-config/avatar.property-config';
-import { CheckGroupProperty } from '../../../checkbox/src/property-config/check-group.property-config';
+import { CheckGroupProperty } from '../../../checkbox-group/src/property-config/check-group.property-config';
 import { CheckBoxProperty } from '../../../checkbox/src/property-config/checkbox.property-config';
 import { ComboListProperty } from '../../../combo-list/src/property-config/combo-list.property-config';
 import { TextareaProperty } from '../../../textarea/src/property-config/textarea.property-config';
diff --git a/packages/ui-vue/components/data-view/components/column-filter/boolean-filter-editor.component.tsx b/packages/ui-vue/components/data-view/components/column-filter/boolean-filter-editor.component.tsx
index 42a71df61e0..f0780ffb138 100644
--- a/packages/ui-vue/components/data-view/components/column-filter/boolean-filter-editor.component.tsx
+++ b/packages/ui-vue/components/data-view/components/column-filter/boolean-filter-editor.component.tsx
@@ -1,4 +1,3 @@
-import { Checkbox } from "@farris/ui-vue/components/checkbox";
 import { HeaderCell } from "../../composition/types";
 import { ref } from "vue";
 
diff --git a/packages/ui-vue/components/index.ts b/packages/ui-vue/components/index.ts
index 9f0d6dfcb43..7453381d455 100644
--- a/packages/ui-vue/components/index.ts
+++ b/packages/ui-vue/components/index.ts
@@ -25,7 +25,8 @@ import Calendar from './calendar';
 import Capsule from './capsule';
 import ColorPicker from './color-picker';
 import ListView from './list-view';
-import CheckBox from './checkbox';
+import Checkbox from './checkbox';
+import CheckboxGroup from './checkbox-group';
 import ComboList from './combo-list';
 import ComboTree from './combo-tree';
 import Component from './component';
@@ -63,6 +64,7 @@ import Progress from './progress';
 import PropertyEditor from './property-editor';
 import PropertyPanel from './property-panel';
 import Condition from './condition';
+import Radio from './radio';
 import RadioGroup from './radio-group';
 import RadioButton from './radio-button';
 import Rate from './rate';
@@ -112,7 +114,8 @@ export default {
             .use(Calendar)
             .use(Calculator)
             .use(Capsule)
-            .use(CheckBox)
+            .use(Checkbox)
+            .use(CheckboxGroup)
             .use(ColorPicker)
             .use(ListView)
             .use(ComboList)
@@ -153,6 +156,7 @@ export default {
             .use(PropertyEditor)
             .use(PropertyPanel)
             .use(QuerySolution)
+            .use(Radio)
             .use(ResponseLayout)
             .use(ResponseLayoutEditor)
             .use(ResponseToolbar)
diff --git a/packages/ui-vue/components/radio-group/index.ts b/packages/ui-vue/components/radio-group/index.ts
index f29326b4279..2658d8dbf1f 100644
--- a/packages/ui-vue/components/radio-group/index.ts
+++ b/packages/ui-vue/components/radio-group/index.ts
@@ -15,30 +15,27 @@
  * limitations under the License.
  */
 import type { App, Plugin } from 'vue';
-import Radio from './src/components/radio.component';
-import RadioGroup from './src/radio-group.component';
+import FRadioGroup from './src/radio-group.component';
 import { propsResolver } from './src/radio-group.props';
 import FRadioGroupDesign from './src/designer/radio-group.design.component';
 import FItemCollectionEditor from './src/designer/item-collection-editor.component';
 import {itemCollectionEditorPropsResolver} from './src/designer/item-collection-editor.props';
 
 export * from './src/radio-group.props';
-export * from './src/components/radio.props';
 
-RadioGroup.install = (app: App) => {
-    app.component(RadioGroup.name as string, RadioGroup);
-    app.component(Radio.name as string, Radio);
+FRadioGroup.install = (app: App) => {
+    app.component(FRadioGroup.name as string, FRadioGroup);
 };
-RadioGroup.register = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>, resolverMap: Record<string, any>) => {
-    componentMap['radio-group'] = RadioGroup;
+FRadioGroup.register = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>, resolverMap: Record<string, any>) => {
+    componentMap['radio-group'] = FRadioGroup;
     propsResolverMap['radio-group'] = propsResolver;
     componentMap['item-collection-editor'] = FItemCollectionEditor;
     propsResolverMap['item-collection-editor'] = itemCollectionEditorPropsResolver;
 };
-RadioGroup.registerDesigner = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>) => {
+FRadioGroup.registerDesigner = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>) => {
     componentMap['radio-group'] = FRadioGroupDesign;
     propsResolverMap['radio-group'] = propsResolver;
 };
 
-export { RadioGroup,Radio };
-export default RadioGroup as typeof RadioGroup & Plugin;
+export { FRadioGroup };
+export default FRadioGroup as typeof FRadioGroup & Plugin;
diff --git a/packages/ui-vue/components/radio-group/src/components/symbol.ts b/packages/ui-vue/components/radio-group/src/components/symbol.ts
deleted file mode 100644
index b4c7bc65b02..00000000000
--- a/packages/ui-vue/components/radio-group/src/components/symbol.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { InjectionKey, Ref } from "vue";
-
-export const RADIOGROUP_CONTEXT: InjectionKey<{ radios: Ref<Array<any>>;[key: string]: any }> | undefined = Symbol('radioGroupContext');
diff --git a/packages/ui-vue/components/radio-group/src/radio-group.component.tsx b/packages/ui-vue/components/radio-group/src/radio-group.component.tsx
index 41603176ea9..9ef0ea7bb1b 100644
--- a/packages/ui-vue/components/radio-group/src/radio-group.component.tsx
+++ b/packages/ui-vue/components/radio-group/src/radio-group.component.tsx
@@ -15,9 +15,9 @@
  */
 import { defineComponent, computed, ref, provide, watch } from 'vue';
 import type { SetupContext } from 'vue';
+import { RADIOGROUP_CONTEXT } from '@farris/ui-vue/components/common';
 import { radioGroupProps, RadioGroupProps } from './radio-group.props';
 import { changeRadio } from './composition/change-radio';
-import { RADIOGROUP_CONTEXT } from './components/symbol';
 
 export default defineComponent({
     name: 'FRadioGroup',
diff --git a/packages/ui-vue/components/radio/index.ts b/packages/ui-vue/components/radio/index.ts
new file mode 100644
index 00000000000..8bf77c26c02
--- /dev/null
+++ b/packages/ui-vue/components/radio/index.ts
@@ -0,0 +1,26 @@
+
+/**
+ * Copyright (c) 2020 - present, Inspur Genersoft Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import type { App } from 'vue';
+import { withInstall } from '@farris/ui-vue/components/common';
+import FRadio from './src/radio.component';
+export * from './src/radio.props';
+
+FRadio.install = (app: App) => {
+    app.component(FRadio.name as string, FRadio);
+};
+export { FRadio };
+export default withInstall(FRadio);
diff --git a/packages/ui-vue/components/radio-group/src/components/radio.component.tsx b/packages/ui-vue/components/radio/src/radio.component.tsx
similarity index 95%
rename from packages/ui-vue/components/radio-group/src/components/radio.component.tsx
rename to packages/ui-vue/components/radio/src/radio.component.tsx
index 8889d9135ff..016df9f2e48 100644
--- a/packages/ui-vue/components/radio-group/src/components/radio.component.tsx
+++ b/packages/ui-vue/components/radio/src/radio.component.tsx
@@ -15,9 +15,8 @@
  */
 import { defineComponent, computed, ref, inject, onMounted } from 'vue';
 import type { InjectionKey, Ref, SetupContext } from 'vue';
+import { RADIOGROUP_CONTEXT, useCheck } from '@farris/ui-vue/components/common';
 import { RadioProps, radioProps } from './radio.props';
-import { RADIOGROUP_CONTEXT } from './symbol';
-import { useCheck } from '@farris/ui-vue/components/common';
 import './radio.css';
 
 export default defineComponent({
@@ -26,7 +25,6 @@ export default defineComponent({
     emits: ['update:value'] as (string[] & ThisType<void>) | undefined,
     setup(props: RadioProps, context: SetupContext) {
         const radioGroupContext = inject(RADIOGROUP_CONTEXT as InjectionKey<{ radios: Ref<Array<any>>;[key: string]: any }>, null);
-        //
         const { buttonClass, checked, disabled, name, shouldRenderButton, shouldRenderNative, onClickRadio } =
             useCheck(props, context, radioGroupContext?.parentProps, radioGroupContext?.parentContext);
         onMounted(() => {
diff --git a/packages/ui-vue/components/radio-group/src/components/radio.css b/packages/ui-vue/components/radio/src/radio.css
similarity index 100%
rename from packages/ui-vue/components/radio-group/src/components/radio.css
rename to packages/ui-vue/components/radio/src/radio.css
diff --git a/packages/ui-vue/components/radio-group/src/components/radio.props.ts b/packages/ui-vue/components/radio/src/radio.props.ts
similarity index 100%
rename from packages/ui-vue/components/radio-group/src/components/radio.props.ts
rename to packages/ui-vue/components/radio/src/radio.props.ts
diff --git a/packages/ui-vue/components/radio/style.ts b/packages/ui-vue/components/radio/style.ts
new file mode 100644
index 00000000000..e69de29bb2d
-- 
Gitee


From 8c6a56f19c4817fc949ef457337f8877f6a2b5dd Mon Sep 17 00:00:00 2001
From: huyuyang <m15966339253@163.com>
Date: Tue, 18 Feb 2025 09:00:06 +0800
Subject: [PATCH 05/62] =?UTF-8?q?fix:=20=E8=AE=BE=E8=AE=A1=E5=99=A8?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=AF=BC=E5=85=A5=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/designer-canvas/src/components/maps.ts       | 2 ++
 .../ui-vue/components/dynamic-view/src/components/maps.ts   | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

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 215a273822d..efee06fecd5 100644
--- a/packages/ui-vue/components/designer-canvas/src/components/maps.ts
+++ b/packages/ui-vue/components/designer-canvas/src/components/maps.ts
@@ -5,6 +5,7 @@ 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 FCheckbox from '@farris/ui-vue/components/checkbox';
+import FCheckboxGroup from '@farris/ui-vue/components/checkbox-group';
 import FColorPicker from '@farris/ui-vue/components/color-picker';
 import FComboList from '@farris/ui-vue/components/combo-list';
 import FContentContainer from '@farris/ui-vue/components/content-container';
@@ -73,6 +74,7 @@ function loadDesignerRegister() {
         FCalendar.registerDesigner(componentMap, componentPropsConverter, componentPropertyConfigConverter);
         FCapsule.registerDesigner(componentMap, componentPropsConverter, componentPropertyConfigConverter);
         FCheckbox.registerDesigner(componentMap, componentPropsConverter, componentPropertyConfigConverter);
+        FCheckboxGroup.registerDesigner(componentMap, componentPropsConverter, componentPropertyConfigConverter);
         FColorPicker.registerDesigner(componentMap, componentPropsConverter, componentPropertyConfigConverter);
         FComboList.registerDesigner(componentMap, componentPropsConverter, componentPropertyConfigConverter);
         FContentContainer.registerDesigner(componentMap, componentPropsConverter, componentPropertyConfigConverter);
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 9429fb3f26c..d05133c7426 100644
--- a/packages/ui-vue/components/dynamic-view/src/components/maps.ts
+++ b/packages/ui-vue/components/dynamic-view/src/components/maps.ts
@@ -4,7 +4,8 @@ import FButtonEdit from '@farris/ui-vue/components/button-edit';
 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 FCheckBox from '@farris/ui-vue/components/checkbox';
+import FCheckbox from '@farris/ui-vue/components/checkbox';
+import FCheckboxGroup from '@farris/ui-vue/components/checkbox-group';
 import FComboList from '@farris/ui-vue/components/combo-list';
 import FComboTree from '@farris/ui-vue/components/combo-tree';
 import FComponent from '@farris/ui-vue/components/component';
@@ -77,7 +78,8 @@ function loadRegister() {
         FButtonGroup.register(componentMap, componentPropsConverter, componentPropertyConfigConverter, resolverMap);
         FCalendar.register(componentMap, componentPropsConverter, componentPropertyConfigConverter, resolverMap);
         FCapsule.register(componentMap, componentPropsConverter, componentPropertyConfigConverter, resolverMap);
-        FCheckBox.register(componentMap, componentPropsConverter, componentPropertyConfigConverter, resolverMap);
+        FCheckbox.register(componentMap, componentPropsConverter, componentPropertyConfigConverter, resolverMap);
+        FCheckboxGroup.register(componentMap, componentPropsConverter, componentPropertyConfigConverter, resolverMap);
         FComboList.register(componentMap, componentPropsConverter, componentPropertyConfigConverter, resolverMap);
         FComboTree.register(componentMap, componentPropsConverter, componentPropertyConfigConverter, resolverMap);
         FComponent.register(componentMap, componentPropsConverter, componentPropertyConfigConverter, resolverMap);
-- 
Gitee


From a4b0ae17c558ee3150486c07192e577fe8954e88 Mon Sep 17 00:00:00 2001
From: huyuyang <m15966339253@163.com>
Date: Tue, 18 Feb 2025 11:03:26 +0800
Subject: [PATCH 06/62] =?UTF-8?q?fix:=20=E6=8E=92=E9=99=A4=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1=E5=99=A8=E7=BB=84=E4=BB=B6=E6=89=93=E5=8C=85=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/ui-vue/scripts/commands/build-designer.js | 6 +++---
 packages/ui-vue/scripts/commands/build.js          | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/ui-vue/scripts/commands/build-designer.js b/packages/ui-vue/scripts/commands/build-designer.js
index b4992105eed..741a3e18421 100644
--- a/packages/ui-vue/scripts/commands/build-designer.js
+++ b/packages/ui-vue/scripts/commands/build-designer.js
@@ -21,13 +21,13 @@ async function buildSeperately(componentName) {
                 configFile: false,
                 publicDir: false,
                 plugins: [vue(), vueJsx(), 
-                    replaceDesignerPath((format, args) => `..${args[2]}/designer.${format}.js`),
+                    replaceDesignerPath((format, args) => `..${args[2]}/index.${format}.js`),
                     replace((format, args) => `../../components${args[2]}/index.${format}.js`)],
                 build: {
                     lib: {
                         entry: tsEntry,
                         name: componentName,
-                        fileName: 'designer',
+                        fileName: 'index',
                         formats: ['esm','umd']
                     },
                     outDir: `./package/designer/${componentName}`,
@@ -77,7 +77,7 @@ const buildDesignerLibs = async () => {
                 vue(),
                 vueJsx(),
                 // 应该先替换设计器组件路径，注意插件的顺序
-                replaceDesignerPath((format, args) => `.${args[2]}/designer.${format}.js`),
+                replaceDesignerPath((format, args) => `.${args[2]}/index.${format}.js`),
                 replace((format, args) => `../components${args[2]}/index.${format}.js`)
             ],
             build: {
diff --git a/packages/ui-vue/scripts/commands/build.js b/packages/ui-vue/scripts/commands/build.js
index 4ced4451831..a38d5685599 100644
--- a/packages/ui-vue/scripts/commands/build.js
+++ b/packages/ui-vue/scripts/commands/build.js
@@ -98,7 +98,7 @@ async function buildSeperately(componentName) {
                 publicDir: false,
                 plugins: [vue(), vueJsx(), 
                     // 应该先替换设计器组件路径，注意插件的顺序
-                    replaceDesignerPath((format, args) => `../../designer${args[2]}/designer.${format}.js`),
+                    replaceDesignerPath((format, args) => `../../designer${args[2]}/index.${format}.js`),
                     replace((format, args) => `..${args[2]}/index.${format}.js`)
                 ],
                 build: {
@@ -179,7 +179,7 @@ const buildLibs = async () => {
                     skipDiagnostics: false
                 }),
                 // 应该先替换设计器组件路径，注意插件的顺序
-                replaceDesignerPath((format, args) => `./designer${args[2]}/designer.${format}.js`),
+                replaceDesignerPath((format, args) => `./designer${args[2]}/index.${format}.js`),
                 replace((format, args) => `./components${args[2]}/index.${format}.js`)
             ],
             build: {
-- 
Gitee


From 0e8d7b4dd8f6b66276f56044a10b50a4835625de Mon Sep 17 00:00:00 2001
From: huyuyang <m15966339253@163.com>
Date: Tue, 18 Feb 2025 11:09:16 +0800
Subject: [PATCH 07/62] =?UTF-8?q?fix:=20=E6=8E=92=E9=99=A4=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1=E5=99=A8=E7=BB=84=E4=BB=B6=E6=89=93=E5=8C=85=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/ui-vue/components/index.ts | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/packages/ui-vue/components/index.ts b/packages/ui-vue/components/index.ts
index 254b4b8a933..1abb3da3565 100644
--- a/packages/ui-vue/components/index.ts
+++ b/packages/ui-vue/components/index.ts
@@ -103,6 +103,7 @@ export * from './components';
 export * from './dynamic-resolver';
 export { resolverMap } from './dynamic-view';
 
+// 不注册设计时组件
 export default {
     install(app: App): void {
         app.use(Accordion)
@@ -121,17 +122,17 @@ export default {
             .use(ComboTree)
             .use(Component)
             .use(Condition)
-            .use(ContentContainer)
+            // .use(ContentContainer)
             .use(DataGrid)
             .use(DatePicker)
             .use(DiscussionEditor)
             .use(DiscussionList)
             .use(Dropdown)
             .use(DynamicForm)
-            .use(DynamicView)
-            .use(EnumEditor)
-            .use(EventsEditor)
-            .use(FieldSelector)
+            // .use(DynamicView)
+            // .use(EnumEditor)
+            // .use(EventsEditor)
+            // .use(FieldSelector)
             .use(FilterBar)
             .use(ImageCropper)
             .use(FInputGroup)
@@ -139,7 +140,7 @@ export default {
             .use(ListNav)
             .use(Loading)
             .use(Lookup)
-            .use(MappingEditor)
+            // .use(MappingEditor)
             .use(Modal)
             .use(MessageBox)
             .use(Nav)
@@ -152,11 +153,11 @@ export default {
             .use(Pagination)
             .use(Popover)
             .use(Progress)
-            .use(PropertyEditor)
-            .use(PropertyPanel)
-            .use(QuerySolution)
+            // .use(PropertyEditor)
+            // .use(PropertyPanel)
+            // .use(QuerySolution)
             .use(ResponseLayout)
-            .use(ResponseLayoutEditor)
+            // .use(ResponseLayoutEditor)
             .use(ResponseToolbar)
             .use(RadioGroup)
             .use(RadioButton)
@@ -179,12 +180,12 @@ export default {
             .use(Uploader)
             .use(VerifyDetail)
             .use(Video)
-            .use(ExpressionEditor)
+            // .use(ExpressionEditor)
             .use(Textarea)
             .use(Drawer)
-            .use(Common)
-            .use(BindingSelector)
-            .use(EventParemeter);
+            .use(Common);
+            // .use(BindingSelector)
+            // .use(EventParemeter);
 
     }
 };
-- 
Gitee


From 3ff2d03b427f954b560d3a8e84db21435cfee6fe Mon Sep 17 00:00:00 2001
From: huyuyang <m15966339253@163.com>
Date: Wed, 19 Feb 2025 15:33:25 +0800
Subject: [PATCH 08/62] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9flow-canvas?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=A7=84=E5=88=99,=E9=81=BF=E5=85=8D?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E6=B1=A1=E6=9F=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../flow-canvas/src/flow-canvas.css           | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/ui-vue/components/flow-canvas/src/flow-canvas.css b/packages/ui-vue/components/flow-canvas/src/flow-canvas.css
index c047466bd9d..829e5fc6097 100644
--- a/packages/ui-vue/components/flow-canvas/src/flow-canvas.css
+++ b/packages/ui-vue/components/flow-canvas/src/flow-canvas.css
@@ -1,4 +1,4 @@
-.br-node {
+.f-flow-canvas .br-node {
     position: absolute;
     top: 120px;
     left: 300px;
@@ -10,7 +10,7 @@
     align-items: center;
     z-index: 1;
 }
-.node-content {
+.f-flow-canvas .node-content {
     border: 2px solid #1c1f2314;
     cursor: pointer;
     background-color: #fff;
@@ -19,7 +19,7 @@
     box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.1);
     text-align: left;
 }
-.circle-left {
+.f-flow-canvas .circle-left {
     width: 8px;
     height: 8px;
     background-color: #2a87ff;
@@ -30,12 +30,12 @@
     left: -4px;
     cursor: pointer;
 }
-.circle-left:hover {
+.f-flow-canvas .circle-left:hover {
     width: 14px;
     height: 14px;
     left: -7px;
 }
-.circle-top {
+.f-flow-canvas .circle-top {
     width: 8px;
     height: 8px;
     background-color: #2a87ff;
@@ -46,12 +46,12 @@
     top: -4px;
     cursor: pointer;
 }
-.circle-top:hover {
+.f-flow-canvas .circle-top:hover {
     width: 14px;
     height: 14px;
     top: -7px;
 }
-.circle-right {
+.f-flow-canvas .circle-right {
     width: 8px;
     height: 8px;
     background-color: #2a87ff;
@@ -62,12 +62,12 @@
     right: -4px;
     cursor: pointer;
 }
-.circle-right:hover {
+.f-flow-canvas .circle-right:hover {
     width: 14px;
     height: 14px;
     right: -7px;
 }
-.circle-bottom {
+.f-flow-canvas .circle-bottom {
     width: 8px;
     height: 8px;
     background-color: #2a87ff;
@@ -78,7 +78,7 @@
     bottom: -4px;
     cursor: pointer;
 }
-.circle-bottom:hover {
+.f-flow-canvas .circle-bottom:hover {
     width: 14px;
     height: 14px;
     bottom: -7px;
-- 
Gitee


From 4088e711855b551479c054f751f41f01c90f1fd4 Mon Sep 17 00:00:00 2001
From: huyuyang <m15966339253@163.com>
Date: Wed, 19 Feb 2025 15:43:50 +0800
Subject: [PATCH 09/62] =?UTF-8?q?fix:=20=E6=8B=86=E5=88=86radio=E5=92=8Cra?=
 =?UTF-8?q?diogroup\checkbox=E5=92=8Ccheckboxgroup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/ui-vue/components/radio/index.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/ui-vue/components/radio/index.ts b/packages/ui-vue/components/radio/index.ts
index 8bf77c26c02..3d04b1bd7d7 100644
--- a/packages/ui-vue/components/radio/index.ts
+++ b/packages/ui-vue/components/radio/index.ts
@@ -14,13 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { App } from 'vue';
 import { withInstall } from '@farris/ui-vue/components/common';
 import FRadio from './src/radio.component';
 export * from './src/radio.props';
 
-FRadio.install = (app: App) => {
-    app.component(FRadio.name as string, FRadio);
-};
 export { FRadio };
 export default withInstall(FRadio);
-- 
Gitee


From 75f8c34d3b31427276f1a676ffc26f5af98f11c8 Mon Sep 17 00:00:00 2001
From: huyuyang <m15966339253@163.com>
Date: Thu, 20 Feb 2025 09:04:05 +0800
Subject: [PATCH 10/62] =?UTF-8?q?fix:=20=E5=8C=BA=E5=88=86=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1=E5=99=A8=E7=BB=84=E4=BB=B6=E5=92=8C=E9=80=9A=E7=94=A8?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/ui-vue/components/components.ts |  5 -----
 packages/ui-vue/components/designer.ts   |  5 ++++-
 packages/ui-vue/components/index.ts      | 15 ---------------
 3 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/packages/ui-vue/components/components.ts b/packages/ui-vue/components/components.ts
index 14eac932d15..edc0beb09fa 100644
--- a/packages/ui-vue/components/components.ts
+++ b/packages/ui-vue/components/components.ts
@@ -21,7 +21,6 @@ export type { DataGridColumn, DataGridProps } from './data-grid';
 export { default as FDatePicker } from './date-picker';
 export { default as FDropdown } from './dropdown';
 export type { DropdownProps } from './dropdown';
-export { FDynamicView } from './dynamic-view';
 export * from './data-view';
 export type { DataColumn, VisualData, VisualDataCell, RowOptions } from './data-view';
 export { default as FInputGroup } from './input-group';
@@ -32,7 +31,6 @@ export { default as FListView } from './list-view';
 export { default as FLayout } from './layout';
 export { default as FLoading, FLoadingService } from './loading';
 export type { LoadingProps } from './loading';
-export { F_LOOKUP_HTTP_SERVICE_TOKEN, LookupSchemaRepositoryToken } from './lookup';
 export { default as FModal, FModalService, F_MODAL_SERVICE_TOKEN } from './modal';
 export type { ModalProps } from './modal';
 export { default as FMessageBox, FMessageBoxService } from './message-box';
@@ -51,7 +49,6 @@ export { default as FProgress } from './progress';
 export type { ProgressProps } from './progress';
 export { default as FRate } from './rate';
 export type { RateProps } from './rate';
-// export { default as FRadioButton } from './radio-button';
 export { default as FRadioGroup, Radio as FRadio } from './radio-group';
 export type { RadioGroupProps } from './radio-group';
 export { default as FResponseToolbar } from './response-toolbar';
@@ -73,5 +70,3 @@ export type { TabsProps, TabPageProps } from './tabs';
 export { default as FUploader } from './uploader';
 export type { UploaderProps } from './uploader';
 export { default as FSearchBox } from './search-box';
-export { SchemaDOMMapping } from './property-panel';
-export type { FormPropertyChangeObject } from './property-panel';
diff --git a/packages/ui-vue/components/designer.ts b/packages/ui-vue/components/designer.ts
index 9894aac5b2a..cea1c528830 100644
--- a/packages/ui-vue/components/designer.ts
+++ b/packages/ui-vue/components/designer.ts
@@ -1,11 +1,14 @@
 export * from './designer-canvas';
-export { FFlowCanvas } from './flow-canvas';
 export { FDesignerOutline } from './designer-outline';
 export { FDesignerToolbox } from './designer-toolbox';
+export { FFlowCanvas } from './flow-canvas';
+export { F_LOOKUP_HTTP_SERVICE_TOKEN, LookupSchemaRepositoryToken } from './lookup';
 export { FPropertyPanel } from './property-panel';
 export { FEventParameter } from './event-parameter';
 export * from './schema-selector';
 export * from './dynamic-resolver';
 export * from './field-selector';
 export { resolverMap } from './dynamic-view';
+export { SchemaDOMMapping } from './property-panel';
+export type { FormPropertyChangeObject } from './property-panel';
 
diff --git a/packages/ui-vue/components/index.ts b/packages/ui-vue/components/index.ts
index db2a76079eb..14a3ce76553 100644
--- a/packages/ui-vue/components/index.ts
+++ b/packages/ui-vue/components/index.ts
@@ -99,7 +99,6 @@ import '../public/assets/farris-all.css';
 export * from './components';
 // 导出设计器部分组件及属性
 export * from './designer';
-export { resolverMap } from './dynamic-view';
 
 // 不注册设计时组件
 export default {
@@ -120,17 +119,12 @@ export default {
             .use(ComboTree)
             .use(Component)
             .use(Condition)
-            // .use(ContentContainer)
             .use(DataGrid)
             .use(DatePicker)
             .use(DiscussionEditor)
             .use(DiscussionList)
             .use(Dropdown)
             .use(DynamicForm)
-            // .use(DynamicView)
-            // .use(EnumEditor)
-            // .use(EventsEditor)
-            // .use(FieldSelector)
             .use(FilterBar)
             .use(ImageCropper)
             .use(FInputGroup)
@@ -138,7 +132,6 @@ export default {
             .use(ListNav)
             .use(Loading)
             .use(Lookup)
-            // .use(MappingEditor)
             .use(Modal)
             .use(MessageBox)
             .use(Nav)
@@ -151,11 +144,7 @@ export default {
             .use(Pagination)
             .use(Popover)
             .use(Progress)
-            // .use(PropertyEditor)
-            // .use(PropertyPanel)
-            // .use(QuerySolution)
             .use(ResponseLayout)
-            // .use(ResponseLayoutEditor)
             .use(ResponseToolbar)
             .use(RadioGroup)
             .use(RadioButton)
@@ -178,12 +167,8 @@ export default {
             .use(Uploader)
             .use(VerifyDetail)
             .use(Video)
-            // .use(ExpressionEditor)
             .use(Textarea)
             .use(Drawer)
             .use(Common);
-            // .use(BindingSelector)
-            // .use(EventParemeter);
-
     }
 };
-- 
Gitee


From 771e1539a5da4ba1a4724e99721314eab873d37c Mon Sep 17 00:00:00 2001
From: huyuyang <m15966339253@163.com>
Date: Thu, 20 Feb 2025 10:06:12 +0800
Subject: [PATCH 11/62] =?UTF-8?q?docs:=20=E4=BF=AE=E6=94=B9data-grid?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../composition/column/use-group-column.ts    |  2 +-
 .../ui-vue/docs/.vitepress/config/sidebar.ts  |  3 +-
 .../ui-vue/docs/components/data-grid/index.md | 54 +++++++++----------
 3 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/packages/ui-vue/components/data-view/composition/column/use-group-column.ts b/packages/ui-vue/components/data-view/composition/column/use-group-column.ts
index d67fa6ad6d6..e1c9e4da069 100644
--- a/packages/ui-vue/components/data-view/composition/column/use-group-column.ts
+++ b/packages/ui-vue/components/data-view/composition/column/use-group-column.ts
@@ -153,7 +153,7 @@ export function useGroupColumn(props: DataViewOptions, columnRenderContext: Ref<
                 left: cellPosition,
                 field: mapKey,
                 parent: null,
-                resizable: dataGridColumn.resizable===undefined?true:dataGridColumn.resizable,
+                resizable: dataGridColumn.resizable === undefined ? true : dataGridColumn.resizable,
                 title: dataGridColumn.title,
                 status: headerStatus,
                 popoverRef: ref<any>(),
diff --git a/packages/ui-vue/docs/.vitepress/config/sidebar.ts b/packages/ui-vue/docs/.vitepress/config/sidebar.ts
index bd2ed9910ed..83dffea433e 100644
--- a/packages/ui-vue/docs/.vitepress/config/sidebar.ts
+++ b/packages/ui-vue/docs/.vitepress/config/sidebar.ts
@@ -78,7 +78,8 @@ const sidebar = [
             { text: 'Progress 进度条', link: '/components/progress/' },
             { text: 'Tree Grid 树表格', link: '/components/tree-grid/' },
             { text: 'Tree View 树列表', link: '/components/tree-view/' },
-            { text: 'Dial 仪表盘', link: '/components/dial/' },
+            // 不存在该组件
+            // { text: 'Dial 仪表盘', link: '/components/dial/' },
             { text: 'Transfer 穿梭框', link: '/components/transfer/' },
             { text: 'Calculator 计算器', link: '/components/calculator/' },
             { text: 'Filter Bar 筛选条', link: '/components/filter-bar/' },
diff --git a/packages/ui-vue/docs/components/data-grid/index.md b/packages/ui-vue/docs/components/data-grid/index.md
index a741527c2e6..b9aa12296cb 100644
--- a/packages/ui-vue/docs/components/data-grid/index.md
+++ b/packages/ui-vue/docs/components/data-grid/index.md
@@ -291,30 +291,27 @@ Data Grid 是展示数据的表格组件，提供分页展示数据，在单元
 | 属性名     | <div style="width:200px">类型</div>                 | 默认值    | 说明                 |
 | :---------------------- | :------------------------------- | :--------: | :------------------- |
 | data         | `array`               | --        | 绑定的数据源   |
-| columns      | `array<DataGridColumn>`               | --        | 列集合        |
-| disable    | `boolean`              | false     | 禁用 |
+| columns      | array<[DataGridColumn](#datagridcolumn属性)>               | --        | 列集合        |
+| disabled    | `boolean`              | false     | 禁用 |
 | editable       | `boolean`   | false   | 允许编辑             |
 | fit       | `boolean`   | false   | 适配父组件尺寸             |
-| focusOnEditingCell       | `boolean`   | false   | 编辑单元格时默认获得焦点             |
-| selectOnEditingCell       | `boolean`   | false   | 编辑单元格时默认选中单元格文本             |
-| height       | `number`   | -1   | 高度             |
-| width       | `number`   | -1   | 宽度             |
+| height       | `number`   | -   | 高度             |
+| width       | `number`   | -   | 宽度             |
 | minHeight       | `number`   | 300   | 最小高度             |
 | minWidth       | `number`   | 400   | 最小宽度             |
-| id       | `string`   | ''   | DataGrid组件唯一标识             |
 | idField       | `string`   | id   | 被绑定数据的标识字段             |
 | mergeCell       | `boolean`   | 400   | 纵向合并具有相同值的单元格    |
 | showFooter       | `boolean`   | false   | 显示底部面板             |
 | showHeader       | `boolean`   | true   | 显示顶部面板             |
 | showScrollBar       | `boolean`   | auto   | 显示滚动条             |
 | showSetting       | `boolean`   | false   | 显示设置按钮             |
-| virtualized       | `boolean`   | false   | 启用虚拟渲染             |
-| commandOption  | `CommandOptions`   | `{enable: false,commands: []}`         |      列配置         |
+| virtualized       | `boolean`   | true   | 启用虚拟渲染             |
+| commandOption  | CommandOptions   | `{enable: false,commands: []}`         |      列配置         |
 | editOption  | `EditOption`   | `{ selectOnEditing: false, editMode:'cell' }`         |      编辑配置，selectOnEditing表示编辑时选中文本，editMode表示 编辑模式； row：整行编辑，cell: 单元格编辑        |
-| pagination       | `PaginatonOptions`   | `{enable:false,size:20}`   | 分页配置            |
+| pagination       | [PaginatonOptions](#分页属性pagination)   | `{enable:false,size:20}`   | 分页配置            |
 | rowNumber       | `RowNumberOptions`   | `{enable: true,width: 32,heading:'序号'}`   | 行号配置,enable表示是否显示行号，heading表示行号列表头标题，width表示行号宽度  |
-| rowOption       | `RowOptions`   | `{wrapContent: false}`   | 行配置             |
-| selection       | `SelectionOptions`   | `{enableSelectRow: true,multiSelect: false,multiSelectMode: 'DependOnCheck',showCheckbox: false,showSelectAll: false,showSelection: true}`   | 选中行配置             |
+| rowOption       | [RowOptions](#行配置属性rowoption)   | `{wrapContent: false}`   | 行配置             |
+| selection       | [SelectionOptions](#选中行配置属性selection)   | `{enableSelectRow: true,multiSelect: false,multiSelectMode: 'DependOnCheck',showCheckbox: false,showSelectAll: false,showSelection: true}`   | 选中行配置             |
 | sort       | `SortOptions`   | --   | 排序设置，enable标识启用排序，fields标识排序字段集合，mode标识排序交互模式，分为'client'和'server'两种，multiSort表示多列排序             |
 | summary       | `SummaryOptions`   | `{enable: true,groupFields: ['numericField1', 'numericField2']}`   | 合计配置     |
 
@@ -322,23 +319,22 @@ Data Grid 是展示数据的表格组件，提供分页展示数据，在单元
 ## DataGridColumn属性
 
 | 属性名     | 类型                   | 默认值    | 说明                 |
-| :---------------------- | :------------------------------- | :-------- | :------------------- |
-| dataType         | `string`               | --        | 数据类型   |
-| editor      | `EditorConfig`               | --        | 编辑器配置        |
+| :---------------------- | :------------- | :-------------------- | :------------------- |
+| dataType         | `string`               | string        | 数据类型   |
+| editor      | `EditorConfig`               | `{type: 'input-group'}`        | 编辑器配置        |
 | field    | `string`              | --     | 列标识 |
-| title       | `string`   | ''   | 列标题             |
-| width       | `number,string`   | --   | 列宽度             |
-| halign       | `string`   | --   | 标题水平对齐方式，分为left,center,right三种             |
-| align       | `string`   | --   | 文本水平对齐方式，分为left,center,right三种            |
-| valign       | `string`   | --   | 文本垂直对齐方式，分为top,middle,bottom三种             |
-| fixed       | `string`   | --   | 是否固定列，分为left和right两种             |
-| visible       | `boolean`   | --   | 是否显示             |
-| readonly       | `boolean`   | --   | 是否只读             |
-| showTips       | `boolean`   | --   | 鼠标移动至单元格后，显示悬浮消息             |
-| tipMode       | `string`   | --   | 单元格提示模式：allways： 鼠标滑过即显示,   auto: 单元格宽度不够时才会显示           |
-| sortable       | `boolean`   | --   | 是否排序             |
-| resizable       | `boolean`   | --   | 是否伸缩             |
-| filterable       | `boolean`   | --   | 是否筛选             |
+| title       | `string`   | --   | 列标题             |
+| width       | `number,string`   | 120   | 列宽度             |
+| align       | `string`   | left   | 文本水平对齐方式，分为left,center,right三种            |
+| valign       | `string`   | top   | 文本垂直对齐方式，分为top,middle,bottom三种             |
+| fixed       | `string`   | false   | 是否固定列，分为left和right两种             |
+| visible       | `boolean`   | true   | 是否显示             |
+| readonly       | `boolean`   | false   | 是否只读             |
+| showTips       | `boolean`   | false   | 鼠标移动至单元格后，显示悬浮消息             |
+| tipMode       | `string`   | auto   | 单元格提示模式：allways： 鼠标滑过即显示,   auto: 单元格宽度不够时才会显示           |
+| sortable       | `boolean`   | false   | 是否排序             |
+| resizable       | `boolean`   | true   | 是否伸缩             |
+| filterable       | `boolean`   | false   | 是否筛选             |
 | formatter(cell: VisualDataCell, visualDataRow: VisualData)     | `function`   | 无默认值，可选属性   | 格式化函数,函数返回值为VNode 或者string类型            |
 
 
@@ -414,7 +410,7 @@ Data Grid 是展示数据的表格组件，提供分页展示数据，在单元
 | selectItemByIds  | `dataItemIds: string[]` | 选中行 |
 | unSelectItemByIds  | `dataItemIds: string[]` | 取消选中行 |
 | clearSelection  | `无` | 清空选中行 |
-| updatePagination  | `pageOptions: Partial<PaginatonOptions>` | 更新分页信息，多用于服务端分页 |
+| updatePagination  | pageOptions: Partial<[PaginatonOptions](#分页属性pagination)> | 更新分页信息，多用于服务端分页 |
 | endEditCell  | `无` | 结束单元格编辑 |
 | editDataItem  | `visualDataRow: VisualData` | 编辑行 |
 | removeDataItem  | `dataIndex: number` | 根据索引删除行 |
-- 
Gitee


From 904fc65da80c79366a1b83890bb36d2dec8cdc22 Mon Sep 17 00:00:00 2001
From: huyuyang <m15966339253@163.com>
Date: Thu, 20 Feb 2025 10:39:50 +0800
Subject: [PATCH 12/62] =?UTF-8?q?fix:=20=E5=AE=9E=E7=8E=B0=E6=A0=91?=
 =?UTF-8?q?=E8=A1=A8=E8=87=AA=E5=AE=9A=E4=B9=89=E5=8D=95=E5=85=83=E6=A0=BC?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../row/hierarchy-row.component.tsx           |  8 +++---
 .../components/data-view/composition/types.ts |  2 ++
 .../data-view/composition/use-row.ts          | 12 +++++++++
 .../demos/tree-grid/custom_row_class.vue      | 27 +++++++++++++++++--
 .../ui-vue/docs/components/tree-grid/index.md |  8 ++++++
 5 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/packages/ui-vue/components/data-view/components/row/hierarchy-row.component.tsx b/packages/ui-vue/components/data-view/components/row/hierarchy-row.component.tsx
index 398437da303..bebfa23b432 100644
--- a/packages/ui-vue/components/data-view/components/row/hierarchy-row.component.tsx
+++ b/packages/ui-vue/components/data-view/components/row/hierarchy-row.component.tsx
@@ -22,7 +22,7 @@ export default function (
     useVisualDataBoundComposition: UseVisualDataBound
 ) {
     const { onClickCell } = useEditComposition;
-    const { gridRowClass, onClickRow, onMouseoverRow, onMouseoutRow } = useRowComposition;
+    const { gridCellClass, gridHierarchyCellClass, gridRowClass, onClickRow, onMouseoverRow, onMouseoutRow } = useRowComposition;
     const { enableMultiSelect, select, unSelect, selectItem } = useSelectionCompostion;
     /** 单元格高度 */
     const customCellHeight = ref(props.cellHeight);
@@ -100,7 +100,8 @@ export default function (
 
     function renderHierarchyCellContent(visualData: VisualData, cell: VisualDataCell, cellPositionMap: Record<string, { left: number; width?: number }>) {
         return (
-            <div ref={cell.setRef} key={cellKey(visualData, cell.index)} class="fv-grid-hierarchy-cell" style={cellPosition(cell, cellPositionMap)}>
+            <div ref={cell.setRef} key={cellKey(visualData, cell.index)} class={gridHierarchyCellClass(cell)} 
+                style={cellPosition(cell, cellPositionMap)}>
                 <div style={hierarchyCellContentStyle(visualData)}>
                     {/* {renderTreeNodeCellLine(visualData, cell)} */}
                     {renderTreeNodeCellToggleIcon(visualData, cell)}
@@ -114,7 +115,8 @@ export default function (
 
     function renderCellContent(visualData: VisualData, cell: VisualDataCell, cellPositionMap: Record<string, { left: number; width?: number }>) {
         return (
-            <div ref={cell.setRef} key={cellKey(visualData, cell.index)} class="fv-grid-cell" style={cellPosition(cell, cellPositionMap)}
+            <div ref={cell.setRef} key={cellKey(visualData, cell.index)} class={gridCellClass(cell)} 
+                style={cellPosition(cell, cellPositionMap)}
                 onClick={(payload: MouseEvent) => onClickCell(payload, cell, visualData, cell.column as DataColumn)}>
                 {
                     context.slots.cellTemplate ?
diff --git a/packages/ui-vue/components/data-view/composition/types.ts b/packages/ui-vue/components/data-view/composition/types.ts
index 45e6260a0b2..d6031c97a98 100644
--- a/packages/ui-vue/components/data-view/composition/types.ts
+++ b/packages/ui-vue/components/data-view/composition/types.ts
@@ -882,6 +882,8 @@ export interface UseSidebar {
 export interface UseRow {
     gridCellClass(cell: VisualDataCell): Record<string, any>;
 
+    gridHierarchyCellClass(cell: VisualDataCell): Record<string, any>;
+
     gridRowClass(dataItem: VisualData): Record<string, any>;
 
     sidebarRowClass(dataItem: VisualData): Record<string, any>;
diff --git a/packages/ui-vue/components/data-view/composition/use-row.ts b/packages/ui-vue/components/data-view/composition/use-row.ts
index d1ac9423b20..4dc99d17f59 100644
--- a/packages/ui-vue/components/data-view/composition/use-row.ts
+++ b/packages/ui-vue/components/data-view/composition/use-row.ts
@@ -66,6 +66,17 @@ export function useRow(
         return cellClassObject;
     }
 
+    function gridHierarchyCellClass(cell: VisualDataCell) {
+        const cellClassObject = {
+            'fv-grid-hierarchy-cell': true,
+        } as Record<string, boolean>;
+        if (props.rowOption?.customCellStyle) {
+            const customClassObject = props.rowOption.customCellStyle(cell) || {};
+            return Object.assign({}, cellClassObject, customClassObject);
+        }
+        return cellClassObject;
+    }
+
     function raiseClickRowEvent(dataItem: VisualData) {
         clickTimes.value += 1;
         setTimeout(() => {
@@ -131,6 +142,7 @@ export function useRow(
     return {
         clickRowItem,
         gridCellClass,
+        gridHierarchyCellClass,
         gridRowClass,
         onClickRow,
         onMouseoverRow,
diff --git a/packages/ui-vue/demos/tree-grid/custom_row_class.vue b/packages/ui-vue/demos/tree-grid/custom_row_class.vue
index 430daddb162..0b896c896aa 100644
--- a/packages/ui-vue/demos/tree-grid/custom_row_class.vue
+++ b/packages/ui-vue/demos/tree-grid/custom_row_class.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { DataColumn } from '../../components/data-view';
+import { DataColumn, VisualDataCell } from '../../components/data-view';
 import { farrisProject } from './demo_data';
 
 const columns: DataColumn[] = [
@@ -7,15 +7,38 @@ const columns: DataColumn[] = [
     { field: 'kind', title: '文件类型', width: 120, resizable: true, dataType: 'string' },
     { field: 'size', title: '尺寸', width: 120, resizable: true, dataType: 'number' }
 ];
+const rowOption = {
+    customRowStyle: (dataItem: any) => {
+        if (dataItem.name === 'farris-vue') {
+            return {
+                'bg-red': true
+            };
+        }
+    },
+    customCellStyle: (cell: VisualDataCell) => {
+        if (cell.data === 'farris-theme') {
+            return {
+                'bg-green': true
+            };
+        }
+    }
+};
 </script>
 
 <template>
     <div class="fv-grid-demo">
-        <f-tree-grid :columns="columns" :data="farrisProject" :fit="true"></f-tree-grid>
+        <f-tree-grid :columns="columns" :data="farrisProject" :fit="true" :rowOption="rowOption"></f-tree-grid>
     </div>
 </template>
 <style>
 .fv-grid-demo{
     height: 480px;
 }
+.bg-red {
+    background-color: rgb(222, 127, 80) !important;
+}
+
+.bg-green {
+    background-color: rgb(120, 190, 120) !important;
+}
 </style>
diff --git a/packages/ui-vue/docs/components/tree-grid/index.md b/packages/ui-vue/docs/components/tree-grid/index.md
index 2ead62c1476..5b2b68c43bd 100644
--- a/packages/ui-vue/docs/components/tree-grid/index.md
+++ b/packages/ui-vue/docs/components/tree-grid/index.md
@@ -43,6 +43,14 @@ Tree View 组件以树形式展现层级结构数据。
 
 :::
 
+## 自定义行列样式
+
+:::vdemo
+```vue
+{demos/tree-grid/custom_row_class.vue}
+```
+:::
+
 ## 行号
 
 :::vdemo
-- 
Gitee


From 36279b5372e86eea0b3aa7d61578884a36bf2e8f Mon Sep 17 00:00:00 2001
From: huyuyang <m15966339253@163.com>
Date: Thu, 20 Feb 2025 14:18:35 +0800
Subject: [PATCH 13/62] =?UTF-8?q?fix:=20=E5=A4=84=E7=90=86ui-vue=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1=E5=99=A8=E5=92=8C=E9=80=9A=E7=94=A8=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E6=89=93=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui-vue/components/color-picker/index.ts   |  1 +
 packages/ui-vue/components/components.ts      | 41 +++++++++++++++----
 packages/ui-vue/components/designer.ts        |  1 +
 .../ui-vue/components/filter-bar/index.ts     | 35 ++++++++--------
 .../ui-vue/components/image-cropper/index.ts  | 32 ++++++++-------
 packages/ui-vue/components/index.ts           |  1 +
 6 files changed, 73 insertions(+), 38 deletions(-)

diff --git a/packages/ui-vue/components/color-picker/index.ts b/packages/ui-vue/components/color-picker/index.ts
index 5b073528c46..6ba08edf728 100644
--- a/packages/ui-vue/components/color-picker/index.ts
+++ b/packages/ui-vue/components/color-picker/index.ts
@@ -18,6 +18,7 @@ import FColorPicker from './src/color-picker.component';
 import { propsResolver } from './src/color-picker.props';
 import FColorPickerDesign from './src/designer/color-picker.design.component';
 import { withInstall } from '@farris/ui-vue/components/common';
+export * from './src/color-picker.props';
 
 FColorPicker.register = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>) => {
     componentMap['color-picker'] = FColorPicker;
diff --git a/packages/ui-vue/components/components.ts b/packages/ui-vue/components/components.ts
index edc0beb09fa..09571a62531 100644
--- a/packages/ui-vue/components/components.ts
+++ b/packages/ui-vue/components/components.ts
@@ -1,4 +1,4 @@
-export { ControllerSchemaRepositorySymbol } from './common';
+
 export { default as FAvatar } from './avatar';
 export type { AvatarProps } from './avatar';
 export { default as FAccordion } from './accordion';
@@ -6,41 +6,58 @@ export type { AccordionItemProps } from './accordion';
 export { default as FButton } from './button';
 export type { ButtonProps } from './button';
 export { default as FButtonEdit } from './button-edit';
+export type { ButtonEditProps } from './button-edit';
 export { default as FButtonGroup } from './button-group';
+export type { ButtonGroupProps } from './button-group';
 export { default as FCalculator } from './calculator';
+export type { CalculatorProps } from './calculator';
 export { default as FCalendar } from './calendar';
+export type { CalendarPropsType } from './calendar';
 export { default as FCapsule } from './capsule';
+export type { CapsuleProps } from './capsule';
 export { default as FCheckBoxGroup, FCheckbox } from './checkbox';
 export type { CheckBoxProps } from './checkbox';
 export { default as FColorPicker } from './color-picker';
+export type { ColorPickerProps } from './color-picker';
 export { default as FComboList } from './combo-list';
+export type { ComboListProps } from './combo-list';
 export { default as FComboTree } from './combo-tree';
+export type { ComboTreeProps } from './combo-tree';
 export { default as FCondition } from './condition';
+export type { ConditionProps } from './condition';
 export { default as FDataGrid } from './data-grid';
 export type { DataGridColumn, DataGridProps } from './data-grid';
 export { default as FDatePicker } from './date-picker';
 export { default as FDropdown } from './dropdown';
 export type { DropdownProps } from './dropdown';
-export * from './data-view';
 export type { DataColumn, VisualData, VisualDataCell, RowOptions } from './data-view';
+export { default as FDrawer } from './drawer';
+export type { DrawerProps } from './drawer';
+export { FResponseForm, FDynamicFormGroup, FDynamicFormInput } from './dynamic-form';
+export { default as FFilterBar } from './filter-bar';
+export type { FilterBarProps } from './filter-bar';
+export { default as FImageCropper } from './image-cropper';
+export type { ImageCropperProps } from './image-cropper';
 export { default as FInputGroup } from './input-group';
 export type { InputGroupProps } from './input-group';
 export { default as FListNav } from './list-nav';
 export type { ListNavProps } from './list-nav';
 export { default as FListView } from './list-view';
+export type { ListViewProps } from './list-view';
 export { default as FLayout } from './layout';
-export { default as FLoading, FLoadingService } from './loading';
+export type { LayoutProps } from './layout';
+export { default as FLoading } from './loading';
 export type { LoadingProps } from './loading';
-export { default as FModal, FModalService, F_MODAL_SERVICE_TOKEN } from './modal';
+export { default as FModal } from './modal';
 export type { ModalProps } from './modal';
-export { default as FMessageBox, FMessageBoxService } from './message-box';
+export { default as FMessageBox } from './message-box';
 export type { MessageBoxProps, MessageType } from './message-box';
 export { default as FNav } from './nav';
 export type { NavProps } from './nav';
+export { default as FNotify } from './notify';
+export type { NotifyProps } from './notify';
 export { default as FNumberSpinner } from './number-spinner';
 export { default as FNumberRange } from './number-range';
-export { default as FNotify, FNotifyService, F_NOTIFY_SERVICE_TOKEN } from './notify';
-export type { NotifyProps } from './notify';
 export { default as FPagination } from './pagination';
 export type { PaginationPropsType } from './pagination';
 export { default as FPopover } from './popover';
@@ -51,11 +68,17 @@ export { default as FRate } from './rate';
 export type { RateProps } from './rate';
 export { default as FRadioGroup, Radio as FRadio } from './radio-group';
 export type { RadioGroupProps } from './radio-group';
+export { default as FRadioButton} from './radio-button';
+export type { RadioButtonProps } from './radio-button';
 export { default as FResponseToolbar } from './response-toolbar';
+export { default as FSection } from './section';
+export type { SectionProps } from './section';
 export { default as FSwitch } from './switch';
 export type { SwitchProps } from './switch';
 export { default as FSplitter, FSplitterPane } from './splitter';
 export type { SplitterPropsType } from './splitter';
+export { default as FStep } from './step';
+export type { StepProps } from './step';
 export { default as FTextarea } from './textarea';
 export type { TextAreaProps } from './textarea';
 export { default as FTimePicker } from './time-picker';
@@ -65,8 +88,12 @@ export { default as FTooltip, FTooltipDirective } from './tooltip';
 export type { TooltipProps } from './tooltip';
 export { default as FTreeView } from './tree-view';
 export type { TreeViewProps } from './tree-view';
+export { default as FTransfer } from './transfer';
+export type { TransferProps } from './transfer';
 export { default as FTabs, FTabPage } from './tabs';
 export type { TabsProps, TabPageProps } from './tabs';
+export { default as FTags } from './tags';
 export { default as FUploader } from './uploader';
 export type { UploaderProps } from './uploader';
 export { default as FSearchBox } from './search-box';
+export type { SearchBoxProps } from './search-box';
diff --git a/packages/ui-vue/components/designer.ts b/packages/ui-vue/components/designer.ts
index cea1c528830..e541c81f614 100644
--- a/packages/ui-vue/components/designer.ts
+++ b/packages/ui-vue/components/designer.ts
@@ -1,3 +1,4 @@
+export { ControllerSchemaRepositorySymbol } from './common';
 export * from './designer-canvas';
 export { FDesignerOutline } from './designer-outline';
 export { FDesignerToolbox } from './designer-toolbox';
diff --git a/packages/ui-vue/components/filter-bar/index.ts b/packages/ui-vue/components/filter-bar/index.ts
index d4592c6f982..98031a3ac45 100644
--- a/packages/ui-vue/components/filter-bar/index.ts
+++ b/packages/ui-vue/components/filter-bar/index.ts
@@ -1,5 +1,5 @@
  
-import type { App } from 'vue';
+import type { App, Plugin } from 'vue';
 import FFilterBar from './src/filter-bar.component';
 import FFilterBarDesign from './src/designer/filter-bar.design.component';
 import FFilterBarConfig from '../query-solution/src/designer/query-solution-config/query-solution-config.component';
@@ -9,20 +9,23 @@ import { configPropsResolver } from './src/designer/filter-bar-config/filter-bar
 export * from './src/types';
 export * from './src/filter-bar.props';
 
+FFilterBar.install = (app: App) => {
+    app.component(FFilterBar.name as string, FFilterBar);
+};
+FFilterBar.register = (
+    componentMap: Record<string, any>, propsResolverMap: Record<string, any>, 
+    configResolverMap: Record<string, any>, resolverMap: Record<string, any>): void => {
+    componentMap['filter-bar'] = FFilterBar;
+    propsResolverMap['filter-bar'] = propsResolver;
+    componentMap['filter-bar-config'] = FFilterBarConfig;
+    propsResolverMap['filter-bar-config'] = configPropsResolver;
+};
+FFilterBar.registerDesigner = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, 
+    configResolverMap: Record<string, any>): void => {
+    componentMap['filter-bar'] = FFilterBarDesign;
+    propsResolverMap['filter-bar'] = propsResolver;
+};
+
 export { FFilterBar };
 
-export default {
-    install(app: App): void {
-        app.component(FFilterBar.name as string, FFilterBar);
-    },
-    register(componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>, resolverMap: Record<string, any>): void {
-        componentMap['filter-bar'] = FFilterBar;
-        propsResolverMap['filter-bar'] = propsResolver;
-        componentMap['filter-bar-config'] = FFilterBarConfig;
-        propsResolverMap['filter-bar-config'] = configPropsResolver;
-    },
-    registerDesigner(componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>): void {
-        componentMap['filter-bar'] = FFilterBarDesign;
-        propsResolverMap['filter-bar'] = propsResolver;
-    }
-};
+export default FFilterBar as typeof FFilterBar & Plugin;
diff --git a/packages/ui-vue/components/image-cropper/index.ts b/packages/ui-vue/components/image-cropper/index.ts
index 6659a8c4c0d..24f1dc20499 100644
--- a/packages/ui-vue/components/image-cropper/index.ts
+++ b/packages/ui-vue/components/image-cropper/index.ts
@@ -1,4 +1,4 @@
- 
+
 /**
  * Copyright (c) 2020 - present, Inspur Genersoft Co., Ltd.
  *
@@ -14,25 +14,27 @@
  * 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 ImageCropper from './src/image-cropper.component';
 import { propsResolver } from './src/image-cropper.props';
 import ImageCropperDesign from './src/designer/image-cropper.design.component';
 
 export * from './src/image-cropper.props';
 
+ImageCropper.install = (app: App): void => {
+    app.component(ImageCropper.name as string, ImageCropper);
+};
+ImageCropper.register = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>,
+    configResolverMap: Record<string, any>, resolverMap: Record<string, any>): void => {
+    componentMap['image-cropper'] = ImageCropper;
+    propsResolverMap['image-cropper'] = propsResolver;
+};
+ImageCropper.registerDesigner = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>,
+    configResolverMap: Record<string, any>): void => {
+    componentMap['image-cropper'] = ImageCropperDesign;
+    propsResolverMap['image-cropper'] = propsResolver;
+};
+
 export { ImageCropper };
 
-export default {
-    install(app: App): void {
-        app.component(ImageCropper.name as string, ImageCropper);
-    },
-    register(componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>, resolverMap: Record<string, any>): void {
-        componentMap['image-cropper'] = ImageCropper;
-        propsResolverMap['image-cropper'] = propsResolver;
-    },
-    registerDesigner(componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>): void {
-        componentMap['image-cropper'] = ImageCropperDesign;
-        propsResolverMap['image-cropper'] = propsResolver;
-    }
-};
+export default ImageCropper as typeof ImageCropper & Plugin;
diff --git a/packages/ui-vue/components/index.ts b/packages/ui-vue/components/index.ts
index 14a3ce76553..5bc388499e0 100644
--- a/packages/ui-vue/components/index.ts
+++ b/packages/ui-vue/components/index.ts
@@ -144,6 +144,7 @@ export default {
             .use(Pagination)
             .use(Popover)
             .use(Progress)
+            .use(QuerySolution)
             .use(ResponseLayout)
             .use(ResponseToolbar)
             .use(RadioGroup)
-- 
Gitee


From fbdbfb673f68cc7fbd11336c40b9c554fdf6b198 Mon Sep 17 00:00:00 2001
From: huyuyang <m15966339253@163.com>
Date: Thu, 20 Feb 2025 15:21:05 +0800
Subject: [PATCH 14/62] =?UTF-8?q?refactor:=20button-edit=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E6=8B=86=E5=88=86=E8=AE=BE=E8=AE=A1=E5=99=A8=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui-vue/components/button-edit/designer.ts | 25 +++++++++++++
 .../ui-vue/components/button-edit/index.ts    | 25 -------------
 .../button-edit/src/button-edit.props.ts      |  7 ----
 .../designer-canvas/src/components/maps.ts    |  2 +-
 .../dynamic-view/src/components/maps.ts       |  2 +-
 packages/ui-vue/components/index.ts           | 12 ------
 .../ui-vue/components/input-group/designer.ts | 37 ++++++++++++-------
 7 files changed, 50 insertions(+), 60 deletions(-)
 create mode 100644 packages/ui-vue/components/button-edit/designer.ts

diff --git a/packages/ui-vue/components/button-edit/designer.ts b/packages/ui-vue/components/button-edit/designer.ts
new file mode 100644
index 00000000000..7ff516bd996
--- /dev/null
+++ b/packages/ui-vue/components/button-edit/designer.ts
@@ -0,0 +1,25 @@
+import { withInstall } from '@farris/ui-vue/components/common';
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
+import FButtonEdit from './src/button-edit.component';
+import FButtonEditDesign from './src/designer/button-edit.design.component';
+import { schemaMapper } from './src/schema/schema-mapper';
+import { schemaResolver } from './src/schema/schema-resolver';
+import buttonEditSchema from './src/schema/button-edit.schema.json';
+import propertyConfig from './src/property-config/button-edit.property-config.json';
+import { buttonEditProps, type ButtonEditProps } from './src/button-edit.props';
+
+const propsResolver = createPropsResolver<ButtonEditProps>(buttonEditProps, buttonEditSchema,
+    schemaMapper, schemaResolver, propertyConfig);
+
+FButtonEditDesign.register = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>, resolverMap: Record<string, any>) => {
+    componentMap['button-edit'] = FButtonEdit;
+    propsResolverMap['button-edit'] = propsResolver;
+};
+FButtonEditDesign.registerDesigner = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>) => {
+    componentMap['button-edit'] = FButtonEditDesign;
+    propsResolverMap['button-edit'] = propsResolver;
+};
+
+export { FButtonEditDesign, propsResolver };
+export default withInstall(FButtonEditDesign);
+
diff --git a/packages/ui-vue/components/button-edit/index.ts b/packages/ui-vue/components/button-edit/index.ts
index 52420642c7b..fd9ca85633f 100644
--- a/packages/ui-vue/components/button-edit/index.ts
+++ b/packages/ui-vue/components/button-edit/index.ts
@@ -15,34 +15,9 @@
  * limitations under the License.
  */
 import FButtonEdit from './src/button-edit.component';
-import { propsResolver } from './src/button-edit.props';
-import FButtonEditDesign from './src/designer/button-edit.design.component';
 import { withInstall } from '@farris/ui-vue/components/common';
 
 export * from './src/button-edit.props';
 
-FButtonEdit.register = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>, resolverMap: Record<string, any>) => {
-    componentMap['button-edit'] = FButtonEdit;
-    propsResolverMap['button-edit'] = propsResolver;
-};
-FButtonEdit.registerDesigner = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>) => {
-    componentMap['button-edit'] = FButtonEditDesign;
-    propsResolverMap['button-edit'] = propsResolver;
-};
-
 export { FButtonEdit };
 export default withInstall(FButtonEdit);
-
-// export default {
-//     install(app: App): void {
-//         app.component(FButtonEdit.name as string, FButtonEdit);
-//     },
-//     register(componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>): void {
-//         componentMap['button-edit'] = FButtonEdit;
-//         propsResolverMap['button-edit'] = propsResolver;
-//     },
-//     registerDesigner(componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>): void {
-//         componentMap['button-edit'] = FButtonEditDesign;
-//         propsResolverMap['button-edit'] = propsResolver;
-//     }
-// };
diff --git a/packages/ui-vue/components/button-edit/src/button-edit.props.ts b/packages/ui-vue/components/button-edit/src/button-edit.props.ts
index 6e30503f6f5..2c0663fee62 100644
--- a/packages/ui-vue/components/button-edit/src/button-edit.props.ts
+++ b/packages/ui-vue/components/button-edit/src/button-edit.props.ts
@@ -15,11 +15,6 @@
  * limitations under the License.
  */
 import { ExtractPropTypes, PropType } from 'vue';
-import { createPropsResolver } from '../../dynamic-resolver';
-import { schemaMapper } from './schema/schema-mapper';
-import { schemaResolver } from './schema/schema-resolver';
-import buttonEditSchema from './schema/button-edit.schema.json';
-import propertyConfig from './property-config/button-edit.property-config.json';
 import { ModalOptions } from '../../modal/src/composition/type';
 
 type TextAlignment = 'left' | 'center' | 'right';
@@ -156,5 +151,3 @@ export const buttonEditProps = {
 } as Record<string, any>;
 
 export type ButtonEditProps = ExtractPropTypes<typeof buttonEditProps>;
-
-export const propsResolver = createPropsResolver<ButtonEditProps>(buttonEditProps, buttonEditSchema, schemaMapper, schemaResolver, propertyConfig);
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 f027f57f96b..9776c186ca5 100644
--- a/packages/ui-vue/components/designer-canvas/src/components/maps.ts
+++ b/packages/ui-vue/components/designer-canvas/src/components/maps.ts
@@ -1,6 +1,6 @@
 import FAccordion from '@farris/ui-vue/components/accordion';
 import FAvatar from '@farris/ui-vue/components/avatar';
-import FButtonEdit from '@farris/ui-vue/components/button-edit';
+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';
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 70b79016fe5..e9076ed3292 100644
--- a/packages/ui-vue/components/dynamic-view/src/components/maps.ts
+++ b/packages/ui-vue/components/dynamic-view/src/components/maps.ts
@@ -1,6 +1,6 @@
 import FAccordion from '@farris/ui-vue/components/accordion';
 import FAvatar from '@farris/ui-vue/components/avatar';
-import FButtonEdit from '@farris/ui-vue/components/button-edit';
+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';
diff --git a/packages/ui-vue/components/index.ts b/packages/ui-vue/components/index.ts
index 5bc388499e0..79839e390b5 100644
--- a/packages/ui-vue/components/index.ts
+++ b/packages/ui-vue/components/index.ts
@@ -29,17 +29,12 @@ import CheckBox from './checkbox';
 import ComboList from './combo-list';
 import ComboTree from './combo-tree';
 import Component from './component';
-import ContentContainer from './content-container';
 import DataGrid from './data-grid';
 import DatePicker from './date-picker';
 import DiscussionList from './discussion-list';
 import DiscussionEditor from './discussion-editor';
 import Dropdown from './dropdown';
 import DynamicForm from './dynamic-form';
-import DynamicView from './dynamic-view';
-import EnumEditor from './enum-editor';
-import EventsEditor from './events-editor';
-import FieldSelector from './field-selector';
 import FilterBar from './filter-bar';
 import ImageCropper from './image-cropper';
 import FInputGroup from './input-group';
@@ -47,7 +42,6 @@ import Layout from './layout';
 import ListNav from './list-nav';
 import Loading from './loading';
 import Lookup from './lookup';
-import MappingEditor from './mapping-editor';
 import Modal from './modal';
 import MessageBox from './message-box';
 import Nav from './nav';
@@ -60,14 +54,11 @@ import PageHeader from './page-header';
 import Pagination from './pagination';
 import Popover from './popover';
 import Progress from './progress';
-import PropertyEditor from './property-editor';
-import PropertyPanel from './property-panel';
 import Condition from './condition';
 import RadioGroup from './radio-group';
 import RadioButton from './radio-button';
 import Rate from './rate';
 import ResponseLayout from './response-layout';
-import ResponseLayoutEditor from './response-layout-editor';
 import ResponseToolbar from './response-toolbar';
 import SearchBox from './search-box';
 import Section from './section';
@@ -88,12 +79,9 @@ import Uploader from './uploader';
 import VerifyDetail from './verify-detail';
 import QuerySolution from './query-solution';
 import Video from './video';
-import ExpressionEditor from './expression-editor';
 import Textarea from './textarea';
 import Drawer from './drawer';
 import Common from './common';
-import EventParemeter from './event-parameter';
-import BindingSelector from './binding-selector';
 import '../public/assets/farris-all.css';
 // 导出所有组件，可以按需加载
 export * from './components';
diff --git a/packages/ui-vue/components/input-group/designer.ts b/packages/ui-vue/components/input-group/designer.ts
index af6db91a3c6..4d666473320 100644
--- a/packages/ui-vue/components/input-group/designer.ts
+++ b/packages/ui-vue/components/input-group/designer.ts
@@ -1,3 +1,4 @@
+import { App } from 'vue';
 import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
 import FInputGroup from './src/input-group.component';
 import FInputGroupDesgin from './src/designer/input-group.design.component';
@@ -5,20 +6,28 @@ import { schemaMapper } from './src/schema/schema-mapper';
 import { schemaResolver } from './src/schema/schema-resolver';
 import inputGroupSchema from './src/schema/input-group.schema.json';
 import { inputGroupProps, type InputGroupProps } from './src/input-group.props';
-import { App } from 'vue';
+import { withInstall } from '@farris/ui-vue/components/common';
 
-export const propsResolver = createPropsResolver<InputGroupProps>(inputGroupProps, inputGroupSchema, schemaMapper, schemaResolver);
+const propsResolver = createPropsResolver<InputGroupProps>(inputGroupProps, inputGroupSchema, schemaMapper, schemaResolver);
 
-export default {
-    install(app: App) {
-        app.component(FInputGroupDesgin.name as string, FInputGroupDesgin);
-    },
-    register(componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>, resolverMap: Record<string, any>) {
-        componentMap['input-group'] = FInputGroup;
-        propsResolverMap['input-group'] = propsResolver;
-    },
-    registerDesigner(componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>) {
-        componentMap['input-group'] = FInputGroupDesgin;
-        propsResolverMap['input-group'] = propsResolver;
-    }
+FInputGroupDesgin.install = (app: App) => {
+    app.component(FInputGroupDesgin.name as string, FInputGroupDesgin);
+};
+FInputGroupDesgin.register = (
+    componentMap: Record<string, any>,
+    propsResolverMap: Record<string, any>,
+    configResolverMap: Record<string, any>,
+    resolverMap: Record<string, any>) => {
+    componentMap['input-group'] = FInputGroup;
+    propsResolverMap['input-group'] = propsResolver;
 };
+FInputGroupDesgin.registerDesigner = (
+    componentMap: Record<string, any>,
+    propsResolverMap: Record<string, any>,
+    configResolverMap: Record<string, any>) => {
+    componentMap['input-group'] = FInputGroupDesgin;
+    propsResolverMap['input-group'] = propsResolver;
+};
+
+export { FInputGroupDesgin, propsResolver };
+export default withInstall(FInputGroupDesgin);
-- 
Gitee


From bb5871d3047b5bceeb9d93d5460865fcab33f8c4 Mon Sep 17 00:00:00 2001
From: huyuyang <m15966339253@163.com>
Date: Thu, 20 Feb 2025 17:18:17 +0800
Subject: [PATCH 15/62] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1=E5=99=A8=E7=BB=84=E4=BB=B6=E5=BC=95=E5=85=A5=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/ui-vue/components/button-edit/designer.ts    | 3 +--
 packages/ui-vue/components/checkbox-group/designer.ts | 3 +--
 packages/ui-vue/components/checkbox/designer.ts       | 3 +--
 packages/ui-vue/components/input-group/designer.ts    | 9 ++-------
 packages/ui-vue/components/input-group/index.ts       | 2 +-
 packages/ui-vue/components/radio-group/designer.ts    | 5 ++---
 6 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/packages/ui-vue/components/button-edit/designer.ts b/packages/ui-vue/components/button-edit/designer.ts
index 7ff516bd996..d874959fa0b 100644
--- a/packages/ui-vue/components/button-edit/designer.ts
+++ b/packages/ui-vue/components/button-edit/designer.ts
@@ -1,12 +1,11 @@
 import { withInstall } from '@farris/ui-vue/components/common';
 import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
-import FButtonEdit from './src/button-edit.component';
+import FButtonEdit, { buttonEditProps, type ButtonEditProps } from '@farris/ui-vue/components/button-edit';
 import FButtonEditDesign from './src/designer/button-edit.design.component';
 import { schemaMapper } from './src/schema/schema-mapper';
 import { schemaResolver } from './src/schema/schema-resolver';
 import buttonEditSchema from './src/schema/button-edit.schema.json';
 import propertyConfig from './src/property-config/button-edit.property-config.json';
-import { buttonEditProps, type ButtonEditProps } from './src/button-edit.props';
 
 const propsResolver = createPropsResolver<ButtonEditProps>(buttonEditProps, buttonEditSchema,
     schemaMapper, schemaResolver, propertyConfig);
diff --git a/packages/ui-vue/components/checkbox-group/designer.ts b/packages/ui-vue/components/checkbox-group/designer.ts
index 52a073550d6..5aafba46cb5 100644
--- a/packages/ui-vue/components/checkbox-group/designer.ts
+++ b/packages/ui-vue/components/checkbox-group/designer.ts
@@ -1,8 +1,7 @@
 import { withInstall } from '@farris/ui-vue/components/common';
 import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
-import FCheckboxGroup from './src/checkbox-group.component';
+import FCheckboxGroup, {checkboxGroupProps, type CheckboxGroupProps} from '@farris/ui-vue/components/checkbox-group';
 import FCheckboxGroupDesigner from './src/designer/checkbox-group.design.component';
-import { checkboxGroupProps, CheckboxGroupProps } from './src/checkbox-group.props';
 import { schemaMapper } from './src/schema/schema-mapper';
 import { schemaResolver } from './src/schema/schema-resolver';
 import checkGropSchema from './src/schema/check-group.schema.json';
diff --git a/packages/ui-vue/components/checkbox/designer.ts b/packages/ui-vue/components/checkbox/designer.ts
index ff9f13c200f..5f92f9f947f 100644
--- a/packages/ui-vue/components/checkbox/designer.ts
+++ b/packages/ui-vue/components/checkbox/designer.ts
@@ -1,8 +1,7 @@
 import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
 import { withInstall } from '@farris/ui-vue/components/common';
-import FCheckbox from './src/checkbox.component';
+import FCheckbox, { type CheckboxProps, checkboxProps } from '@farris/ui-vue/components/checkbox';
 import FCheckboxDesigner from './src/designer/checkbox.design.component';
-import { checkboxProps, CheckboxProps } from './src/checkbox.props';
 import checkboxSchema from './src/schema/checkbox.schema.json';
 import { schemaMapper } from './src/schema/schema-mapper';
 import { schemaResolver } from './src/schema/schema-resolver';
diff --git a/packages/ui-vue/components/input-group/designer.ts b/packages/ui-vue/components/input-group/designer.ts
index 4d666473320..b8a2a36e0e8 100644
--- a/packages/ui-vue/components/input-group/designer.ts
+++ b/packages/ui-vue/components/input-group/designer.ts
@@ -1,18 +1,13 @@
-import { App } from 'vue';
+import { withInstall } from '@farris/ui-vue/components/common';
 import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
-import FInputGroup from './src/input-group.component';
+import FInputGroup, { inputGroupProps, type InputGroupProps } from '@farris/ui-vue/components/input-group';
 import FInputGroupDesgin from './src/designer/input-group.design.component';
 import { schemaMapper } from './src/schema/schema-mapper';
 import { schemaResolver } from './src/schema/schema-resolver';
 import inputGroupSchema from './src/schema/input-group.schema.json';
-import { inputGroupProps, type InputGroupProps } from './src/input-group.props';
-import { withInstall } from '@farris/ui-vue/components/common';
 
 const propsResolver = createPropsResolver<InputGroupProps>(inputGroupProps, inputGroupSchema, schemaMapper, schemaResolver);
 
-FInputGroupDesgin.install = (app: App) => {
-    app.component(FInputGroupDesgin.name as string, FInputGroupDesgin);
-};
 FInputGroupDesgin.register = (
     componentMap: Record<string, any>,
     propsResolverMap: Record<string, any>,
diff --git a/packages/ui-vue/components/input-group/index.ts b/packages/ui-vue/components/input-group/index.ts
index 299abcee552..48c2248fef6 100644
--- a/packages/ui-vue/components/input-group/index.ts
+++ b/packages/ui-vue/components/input-group/index.ts
@@ -18,6 +18,6 @@ import FInputGroup from './src/input-group.component';
 import { withInstall } from '@farris/ui-vue/components/common';
 
 export type { InputGroupProps } from './src/input-group.props';
-
+export * from './src/input-group.props';
 export { FInputGroup };
 export default withInstall(FInputGroup);
diff --git a/packages/ui-vue/components/radio-group/designer.ts b/packages/ui-vue/components/radio-group/designer.ts
index 7493c539ade..970efe86b95 100644
--- a/packages/ui-vue/components/radio-group/designer.ts
+++ b/packages/ui-vue/components/radio-group/designer.ts
@@ -1,13 +1,12 @@
 import { withInstall } from '@farris/ui-vue/components/common';
 import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
-import FRadioGroup from './src/radio-group.component';
+import FRadioGroup, { radioGroupProps, type RadioGroupProps } from '@farris/ui-vue/components/radio-group';
 import FRadioGroupDesign from './src/designer/radio-group.design.component';
 import FItemCollectionEditor from './src/designer/item-collection-editor.component';
-import {itemCollectionEditorPropsResolver} from './src/designer/item-collection-editor.props';
+import { itemCollectionEditorPropsResolver } from './src/designer/item-collection-editor.props';
 import { schemaResolver } from './src/schema/schema-resolver';
 import { schemaMapper } from './src/schema/schema-mapper';
 import radioGroupSchema from './src/schema/radio-group.schema.json';
-import { radioGroupProps, RadioGroupProps } from './src/radio-group.props';
 
 const propsResolver = createPropsResolver<RadioGroupProps>(radioGroupProps, radioGroupSchema, schemaMapper, schemaResolver);
 
-- 
Gitee


From 7bc2244fe885fae1ddce5210dd8a80dd2696fd22 Mon Sep 17 00:00:00 2001
From: huyuyang <m15966339253@163.com>
Date: Thu, 27 Feb 2025 16:59:20 +0800
Subject: [PATCH 16/62] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9query-solution?=
 =?UTF-8?q?=E5=BC=95=E5=85=A5=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/ui-vue/components/filter-bar/src/composition/types.ts  | 2 +-
 .../components/filter-bar/src/composition/use-condition.ts      | 2 +-
 packages/ui-vue/components/query-solution/index.ts              | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/ui-vue/components/filter-bar/src/composition/types.ts b/packages/ui-vue/components/filter-bar/src/composition/types.ts
index 06f34f55cb3..8f399a858f6 100644
--- a/packages/ui-vue/components/filter-bar/src/composition/types.ts
+++ b/packages/ui-vue/components/filter-bar/src/composition/types.ts
@@ -1,7 +1,7 @@
 
 import { Ref } from "vue";
 import { Condition, FieldConfig, FilterItem } from "../types";
-import { QueryItem } from '@farris/ui-vue/components/query-solution/src/composition/types';
+import { QueryItem } from '@farris/ui-vue/components/query-solution';
 
 export interface UseFilterItems {
 
diff --git a/packages/ui-vue/components/filter-bar/src/composition/use-condition.ts b/packages/ui-vue/components/filter-bar/src/composition/use-condition.ts
index 4647089be3e..7319d27a114 100644
--- a/packages/ui-vue/components/filter-bar/src/composition/use-condition.ts
+++ b/packages/ui-vue/components/filter-bar/src/composition/use-condition.ts
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { UseCondition, ValueType, RelationType, CompareType, QueryItem } from '@farris/ui-vue/components/query-solution/src/composition/types';
+import { UseCondition, ValueType, RelationType, CompareType, QueryItem } from '@farris/ui-vue/components/query-solution';
 import { SetupContext } from 'vue';
 import { FilterBarProps } from '../filter-bar.props';
 
diff --git a/packages/ui-vue/components/query-solution/index.ts b/packages/ui-vue/components/query-solution/index.ts
index 53224df6fc8..4083b226cd0 100644
--- a/packages/ui-vue/components/query-solution/index.ts
+++ b/packages/ui-vue/components/query-solution/index.ts
@@ -25,6 +25,8 @@ import { solutionPresetPropsResolver } from './src/designer/solution-preset-conf
 
 export * from './src/query-solution.props';
 
+export * from './src/composition/types';
+
 export { FQuerySolution };
 
 export default {
-- 
Gitee


From 60028c3bb9b3134129267cf4cb83895f05f4bd85 Mon Sep 17 00:00:00 2001
From: huyuyang <m15966339253@163.com>
Date: Wed, 5 Mar 2025 10:50:25 +0800
Subject: [PATCH 17/62] =?UTF-8?q?fix:=20=E5=AE=8C=E5=96=84modal=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E4=BD=BF=E7=94=A8=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui-vue/docs/components/modal/index.md     | 45 +++++++++++++++++--
 1 file changed, 42 insertions(+), 3 deletions(-)

diff --git a/packages/ui-vue/docs/components/modal/index.md b/packages/ui-vue/docs/components/modal/index.md
index 980a994e8ca..ab6c38b4ec4 100644
--- a/packages/ui-vue/docs/components/modal/index.md
+++ b/packages/ui-vue/docs/components/modal/index.md
@@ -82,10 +82,49 @@ export interface ModalButton {
 | :--------- | :--------------- | :----- | :-------------------------------- |
 | title      | `string`         | --     | 窗口标题                          |
 | width      | `number`         | 500    | 窗口宽度                          |
-| height     | `number`         | 320    | 窗口高度                          |
-| buttons     | `ModalButtton[]` | --     | 底部按钮                          |
-| modelValue | `boolean`        | false  | 使用 v-model 绑定是否显示窗口属性 |
+| height     | `number`         | 320    | 窗口高度                        |
+| footerHeight     | `number`         | 60    | 底部区域高度，如果设置为0，则不显示底部区域                        |
+| buttons     | [ModalButton](##ModalButton) | --   | 底部按钮   |
+| modelValue | `boolean`        | false  | 双向绑定属性是否显示窗口 |
+| showHeader | `boolean`        | true  | 展示头部 |
+| showButtons | `boolean`        | true  | 展示默认按钮 |
+| fitContent | `boolean`        | true  | 自适应尺寸 |
+| showHeader | `boolean`        | true  | 展示头部 |
+| showHeader | `boolean`        | true  | 展示头部 |
+| showCloseButton | `boolean`        | true  | 展示右上角关闭弹窗按钮 |
+| showMaxButton | `boolean`        | true  | 展示右上角最大化按钮 |
+| resizeable | `boolean`        | true  |  | 可调整窗口尺寸      |
+| draggable | `boolean`        | true  | 可拖拽窗口 |
+| dragHandle | `string`        | -  | 拖拽抓手，赋值css选择器 |
+| acceptCallback | `function`        | -  | 命令式调用属性，底部默认确定按钮回调事件 |
+| rejectCallback | `function`        | - | 命令式调用属性，底部默认取消按钮回调事件 |
+| closedCallback | `function`        | - | 命令式调用属性，默认关闭按钮回调事件 |
+| render | `function`        | - | 命令式调用属性，默认插槽，返回VNode |
+
+
+## ModalButton
 
+| 属性名     | 类型             | 默认值 | 说明                              |
+| :--------- | :--------------- | :----- | :-------------------------------- |
+| text      | `string`         | --     | 按钮名称                          |
+| class      | `string`         | ''    | 自定义样式                          |
+| disable     | `boolean`         | false    | 禁用                          |
+| iconClass     | `string` | --     | 图标class                          |
+| handle | `Function($event: MouseEvent, contetx: any)`        | -  | 按钮事件 |
+
+
+## 命令式调用
+按照以下方式调用
+```
+import { inject } from 'vue';
+import { F_MODAL_SERVICE_TOKEN } from '@farris/ui-vue';
+const modalService = inject(F_MODAL_SERVICE_TOKEN) as any;
+const modalInstance = modalService.open({
+    ...
+});
+<!-- 销毁 -->
+modalInstance.destroy();
+```
 ## 插槽
 
 ::: tip
-- 
Gitee


From 2e0c44559f491f4444b9c37873cd49eaa6cc0020 Mon Sep 17 00:00:00 2001
From: huyuyang <m15966339253@163.com>
Date: Wed, 12 Mar 2025 21:59:46 +0800
Subject: [PATCH 18/62] =?UTF-8?q?fix:=20modal=E7=BB=84=E4=BB=B6=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=A4=B4=E9=83=A8=E5=92=8C=E5=BA=95=E9=83=A8=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/modal/src/modal.component.tsx  | 65 +++++++++++--------
 .../ui-vue/demos/modal/custom-template.vue    | 31 +++++++++
 .../ui-vue/docs/.vitepress/config/sidebar.ts  |  2 +-
 .../ui-vue/docs/components/modal/index.md     | 10 +++
 4 files changed, 79 insertions(+), 29 deletions(-)
 create mode 100644 packages/ui-vue/demos/modal/custom-template.vue

diff --git a/packages/ui-vue/components/modal/src/modal.component.tsx b/packages/ui-vue/components/modal/src/modal.component.tsx
index 858cbbd0f4c..e737e04e5a8 100644
--- a/packages/ui-vue/components/modal/src/modal.component.tsx
+++ b/packages/ui-vue/components/modal/src/modal.component.tsx
@@ -190,7 +190,7 @@ export default defineComponent({
 
         const modalHeaderStyle = computed(() => {
             const styleObject = { display: showHeader.value ? '' : 'none' };
-            styleObject['pointer-events'] = allowDrag.value ? 'auto': 'none';
+            styleObject['pointer-events'] = allowDrag.value ? 'auto' : 'none';
             return styleObject;
         });
 
@@ -304,7 +304,7 @@ export default defineComponent({
                 )}
                 {enableClose.value && (
                     <li class="f-btn-icon f-bare"
-                        onClick={(payload: MouseEvent) => close(payload, false)}  style="pointer-events: auto;">
+                        onClick={(payload: MouseEvent) => close(payload, false)} style="pointer-events: auto;">
                         <span class="f-icon modal_close"></span>
                     </li>
                 )}
@@ -329,17 +329,25 @@ export default defineComponent({
         }
 
         function renderModalHeader() {
-            return  <div ref={modalHeaderRef} class="modal-header" style={modalHeaderStyle.value} >
-                <div class="modal-title">
-                    {showHeaderIcon.value && <span class={headerIconClass.value} style="margin-right: 8px"></span>}
-                    <span class="modal-title-label">{title.value}</span>
-                </div>
+            return <div ref={modalHeaderRef} class="modal-header" style={modalHeaderStyle.value} >
+                {
+                    context.slots.headerTemplate ? context.slots.headerTemplate() : <div class="modal-title">
+                        {showHeaderIcon.value && <span class={headerIconClass.value} style="margin-right: 8px"></span>}
+                        <span class="modal-title-label">{title.value}</span>
+                    </div>
+                }
                 <div class="actions">
                     {renderFloatingCloseButton()}
                 </div>
             </div>;
         }
 
+        function renderModalFooter() {
+            return context.slots.footerTemplate ?
+            context.slots.footerTemplate() :
+            showFooter.value && renderFooterButtons();
+        }
+
         function onClickModalBackdrop($event) {
             $event.stopPropagation();
         }
@@ -348,30 +356,31 @@ export default defineComponent({
             return (
                 <Teleport to="body">
                     {showModal.value &&
-                    <Transition name="fade" appear>
-                        <div class={modalContainerClass.value} style="display: block"
-                            ref={modalContainerRef} onClick={onClickModalBackdrop}>
-                            <div id={modalId.value} class={modalDialogClass.value} style={modalDialogStyle.value} ref={modalElementRef}>
-                                <div class={modalContentClass.value}>
-                                    { showHeader.value && renderModalHeader() }
-
-                                    <div class={modalBodyClass.value}>
-                                        {context.slots.default?.()}
-                                        {dialogType.value === 'iframe' && (
-                                            <iframe
-                                                title={modalId.value}
-                                                class="f-utils-fill"
-                                                width="100%"
-                                                frameborder="0"
-                                                src={iframeSrc.value}></iframe>
-                                        )}
+                        <Transition name="fade" appear>
+                            <div class={modalContainerClass.value} style="display: block"
+                                ref={modalContainerRef} onClick={onClickModalBackdrop}>
+                                <div id={modalId.value} class={modalDialogClass.value} style={modalDialogStyle.value} ref={modalElementRef}>
+                                    <div class={modalContentClass.value}>
+                                        {showHeader.value && renderModalHeader()}
+                                        <div class={modalBodyClass.value}>
+                                            {context.slots.default?.()}
+                                            {dialogType.value === 'iframe' && (
+                                                <iframe
+                                                    title={modalId.value}
+                                                    class="f-utils-fill"
+                                                    width="100%"
+                                                    frameborder="0"
+                                                    src={iframeSrc.value}></iframe>
+                                            )}
+                                        </div>
+                                        {
+                                            renderModalFooter()
+                                        }
                                     </div>
-                                    {showFooter.value && renderFooterButtons()}
+                                    {!fitContent.value && resizeable.value && modalElementRef.value && !maximized.value && renderResizeBar(modalElementRef.value)}
                                 </div>
-                                {!fitContent.value && resizeable.value && modalElementRef.value && !maximized.value && renderResizeBar(modalElementRef.value)}
                             </div>
-                        </div>
-                    </Transition>}
+                        </Transition>}
                 </Teleport>
             );
         };
diff --git a/packages/ui-vue/demos/modal/custom-template.vue b/packages/ui-vue/demos/modal/custom-template.vue
new file mode 100644
index 00000000000..3c5b52c69df
--- /dev/null
+++ b/packages/ui-vue/demos/modal/custom-template.vue
@@ -0,0 +1,31 @@
+<script lang="ts" setup>
+import { ref } from 'vue'
+
+const visiable = ref(false)
+function toggleModal() {
+    visiable.value = !visiable.value
+}
+
+const className = 'custom-class1 custom-class2'
+</script>
+<template>
+    <f-modal v-model="visiable" :class="className" title="This is the modal dialog title" :fit-content="false">
+       <div style="padding: 10px;">
+        对话框内容
+       </div>
+        <template #headerTemplate>
+            <h1>对话框标题</h1>
+        </template>
+        <template #footerTemplate>
+            <div style="display: flex;padding: 5px;justify-content: end;">
+                <f-button>确定</f-button>
+            </div>
+        </template>
+    </f-modal>
+    <f-button @click="toggleModal">弹出自定义窗口</f-button>
+</template>
+<style>
+.custom-class1 {
+    color:chocolate
+}
+</style>
diff --git a/packages/ui-vue/docs/.vitepress/config/sidebar.ts b/packages/ui-vue/docs/.vitepress/config/sidebar.ts
index 83dffea433e..46aee5a8050 100644
--- a/packages/ui-vue/docs/.vitepress/config/sidebar.ts
+++ b/packages/ui-vue/docs/.vitepress/config/sidebar.ts
@@ -74,7 +74,6 @@ const sidebar = [
             { text: 'Data Grid 表格', link: '/components/data-grid/' },
             { text: 'List Nav 列表导航', link: '/components/list-nav/' },
             { text: 'List View 列表', link: '/components/list-view/' },
-            { text: 'Modal 模态窗口', link: '/components/modal/' },
             { text: 'Progress 进度条', link: '/components/progress/' },
             { text: 'Tree Grid 树表格', link: '/components/tree-grid/' },
             { text: 'Tree View 树列表', link: '/components/tree-view/' },
@@ -91,6 +90,7 @@ const sidebar = [
     {
         text: '反馈',
         items: [
+            { text: 'Modal 模态窗口', link: '/components/modal/' },
             { text: 'Drawer 抽屉', link: '/components/drawer/' },
             { text: 'Message Box 消息弹窗', link: '/components/message-box/' },
             { text: 'Notify 通知消息', link: '/components/notify/' },
diff --git a/packages/ui-vue/docs/components/modal/index.md b/packages/ui-vue/docs/components/modal/index.md
index ab6c38b4ec4..b38484ea7fd 100644
--- a/packages/ui-vue/docs/components/modal/index.md
+++ b/packages/ui-vue/docs/components/modal/index.md
@@ -62,6 +62,16 @@ Modal 组件用来已弹出模态窗口的形式展示页面内容。
 
 :::
 
+## 自定义模板
+
+:::vdemo
+
+```vue
+{demos/modal/custom-template.vue}
+```
+
+:::
+
 
 ## 类型
 
-- 
Gitee


From a6addd391ab72f0318f7cbc3c89c835cd23d1a2f Mon Sep 17 00:00:00 2001
From: huyuyang <m15966339253@163.com>
Date: Thu, 13 Mar 2025 16:13:38 +0800
Subject: [PATCH 19/62] =?UTF-8?q?fix:=20=E5=AE=8C=E5=96=84modal=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/modal/src/modal.component.tsx  | 23 ++++++++++++++---
 .../components/modal/src/modal.props.ts       |  9 +++++++
 .../ui-vue/demos/modal/custom-template.vue    | 16 ++++++++++--
 packages/ui-vue/demos/modal/max-modal.vue     | 25 +++++++++++++++++++
 .../ui-vue/docs/components/modal/index.md     | 10 ++++++++
 5 files changed, 77 insertions(+), 6 deletions(-)
 create mode 100644 packages/ui-vue/demos/modal/max-modal.vue

diff --git a/packages/ui-vue/components/modal/src/modal.component.tsx b/packages/ui-vue/components/modal/src/modal.component.tsx
index e737e04e5a8..d72250f9c80 100644
--- a/packages/ui-vue/components/modal/src/modal.component.tsx
+++ b/packages/ui-vue/components/modal/src/modal.component.tsx
@@ -156,6 +156,11 @@ export default defineComponent({
             } as Record<string, boolean>;
             classObject['f-modal-fitContent'] = !!fitContent.value;
             classObject.show = !!showModal.value;
+            const customClassArray = props.maskClass?.split(' ');
+            customClassArray?.reduce((target: any, className: string) => {
+                target[className] = true;
+                return target;
+            }, classObject);
             return classObject;
         });
 
@@ -344,12 +349,15 @@ export default defineComponent({
 
         function renderModalFooter() {
             return context.slots.footerTemplate ?
-            context.slots.footerTemplate() :
-            showFooter.value && renderFooterButtons();
+                context.slots.footerTemplate() :
+                showFooter.value && renderFooterButtons();
         }
 
         function onClickModalBackdrop($event) {
             $event.stopPropagation();
+            if (props.allowClickMaskToClose) {
+                close($event, false);
+            }
         }
 
         return () => {
@@ -359,7 +367,8 @@ export default defineComponent({
                         <Transition name="fade" appear>
                             <div class={modalContainerClass.value} style="display: block"
                                 ref={modalContainerRef} onClick={onClickModalBackdrop}>
-                                <div id={modalId.value} class={modalDialogClass.value} style={modalDialogStyle.value} ref={modalElementRef}>
+                                <div id={modalId.value} class={modalDialogClass.value} style={modalDialogStyle.value}
+                                    ref={modalElementRef}>
                                     <div class={modalContentClass.value}>
                                         {showHeader.value && renderModalHeader()}
                                         <div class={modalBodyClass.value}>
@@ -377,7 +386,13 @@ export default defineComponent({
                                             renderModalFooter()
                                         }
                                     </div>
-                                    {!fitContent.value && resizeable.value && modalElementRef.value && !maximized.value && renderResizeBar(modalElementRef.value)}
+                                    {
+                                        !fitContent.value &&
+                                        resizeable.value &&
+                                        modalElementRef.value &&
+                                        !maximized.value &&
+                                        renderResizeBar(modalElementRef.value)
+                                    }
                                 </div>
                             </div>
                         </Transition>}
diff --git a/packages/ui-vue/components/modal/src/modal.props.ts b/packages/ui-vue/components/modal/src/modal.props.ts
index 2a468729177..9e1fff8e0a1 100644
--- a/packages/ui-vue/components/modal/src/modal.props.ts
+++ b/packages/ui-vue/components/modal/src/modal.props.ts
@@ -19,10 +19,19 @@ import { ModalButton } from './composition/type';
 export type DragHandleType = HTMLElement | string;
 
 export const modalProps = {
+
+    /**
+     * 允许点击遮罩关闭对话框
+     */
+    allowClickMaskToClose: { type: Boolean, default: false },
     /**
      * 自定义类
      */
     class: { type: String, default: '' },
+    /**
+     * 自定义遮罩类
+     */
+    maskClass: { type: String, default: '' },
     /**
      * 模态框标题
      */
diff --git a/packages/ui-vue/demos/modal/custom-template.vue b/packages/ui-vue/demos/modal/custom-template.vue
index 3c5b52c69df..e189381e8a6 100644
--- a/packages/ui-vue/demos/modal/custom-template.vue
+++ b/packages/ui-vue/demos/modal/custom-template.vue
@@ -6,10 +6,19 @@ function toggleModal() {
     visiable.value = !visiable.value
 }
 
-const className = 'custom-class1 custom-class2'
+const className = 'custom-class1 custom-class2';
+const maskClassName = 'custom-mask-class'
 </script>
 <template>
-    <f-modal v-model="visiable" :class="className" title="This is the modal dialog title" :fit-content="false">
+    <f-modal
+        :maskClass="maskClassName"
+        :allowClickMaskToClose="true" 
+        v-model="visiable" 
+        :class="className" 
+        title="This is the modal dialog title" 
+        :fit-content="false"
+        :resizeable="true"
+    >
        <div style="padding: 10px;">
         对话框内容
        </div>
@@ -28,4 +37,7 @@ const className = 'custom-class1 custom-class2'
 .custom-class1 {
     color:chocolate
 }
+.custom-mask-class {
+    background-color: rgb(222, 184, 135, .6);
+}
 </style>
diff --git a/packages/ui-vue/demos/modal/max-modal.vue b/packages/ui-vue/demos/modal/max-modal.vue
new file mode 100644
index 00000000000..68f84dc76fe
--- /dev/null
+++ b/packages/ui-vue/demos/modal/max-modal.vue
@@ -0,0 +1,25 @@
+<script lang="ts" setup>
+import { ref } from 'vue';
+import OtherModal from './modal-custom-size.vue';
+
+const visiable = ref(false);
+function toggleModal() {
+    visiable.value = !visiable.value;
+}
+
+</script>
+<template>
+    <f-modal 
+        v-model="visiable" 
+        title="This is the modal dialog title" 
+        :fit-content="false"
+        :show-max-button="true" 
+        :class="className" 
+        :resizeable="true"
+        >
+        <div style="padding: 0 20px">
+            <p>This is modal content.</p>
+        </div>
+    </f-modal>
+    <f-button @click="toggleModal">弹出窗口</f-button>
+</template>
diff --git a/packages/ui-vue/docs/components/modal/index.md b/packages/ui-vue/docs/components/modal/index.md
index b38484ea7fd..ee5ba366463 100644
--- a/packages/ui-vue/docs/components/modal/index.md
+++ b/packages/ui-vue/docs/components/modal/index.md
@@ -51,6 +51,16 @@ Modal 组件用来已弹出模态窗口的形式展示页面内容。
 
 :::
 
+## 最大化
+
+:::vdemo
+
+```vue
+{demos/modal/max-modal.vue}
+```
+
+:::
+
 
 ## iframe
 
-- 
Gitee


From 36733b007c6305e95040a9b18d26ee5dc9534f9e Mon Sep 17 00:00:00 2001
From: huyuyang <m15966339253@163.com>
Date: Sat, 15 Mar 2025 11:02:37 +0800
Subject: [PATCH 20/62] =?UTF-8?q?fix:=20modal=E7=BB=84=E4=BB=B6=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E6=A8=A1=E6=80=81=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/modal/src/composition/type.ts  |   1 +
 .../modal/src/composition/use-draggable.ts    |  21 +--
 .../components/modal/src/modal.component.tsx  | 127 ++++++++++++------
 .../components/modal/src/modal.props.ts       |  36 +++--
 .../ui-vue/components/modal/src/modal.scss    |   2 +-
 packages/ui-vue/demos/drawer/position.vue     |   2 +-
 .../ui-vue/demos/modal/custom-template.vue    |   4 +-
 packages/ui-vue/demos/modal/mask.vue          |  34 +++++
 .../ui-vue/docs/components/modal/index.md     |   9 ++
 9 files changed, 167 insertions(+), 69 deletions(-)
 create mode 100644 packages/ui-vue/demos/modal/mask.vue

diff --git a/packages/ui-vue/components/modal/src/composition/type.ts b/packages/ui-vue/components/modal/src/composition/type.ts
index 677b66761c0..5784d124b1b 100644
--- a/packages/ui-vue/components/modal/src/composition/type.ts
+++ b/packages/ui-vue/components/modal/src/composition/type.ts
@@ -31,6 +31,7 @@ export interface ModalOptions {
     resizeable?: boolean;
     showMaxButton?: boolean;
     showCloseButton?: boolean;
+    beforeClose?: () => boolean;
     acceptCallback?: () => void;
     rejectCallback?: () => void;
     closedCallback?: ($event?: Event, from?: 'esc' | 'icon' | 'button') => void;
diff --git a/packages/ui-vue/components/modal/src/composition/use-draggable.ts b/packages/ui-vue/components/modal/src/composition/use-draggable.ts
index 2a239d952c9..9d255607991 100644
--- a/packages/ui-vue/components/modal/src/composition/use-draggable.ts
+++ b/packages/ui-vue/components/modal/src/composition/use-draggable.ts
@@ -1,4 +1,4 @@
-import { Ref, ref, watch } from "vue";
+import { onUnmounted, Ref, ref, watch } from "vue";
 import { Position } from "./resizeable/position";
 
 export function useDraggable(props: any, context: any, canMove: Ref<boolean>) {
@@ -13,8 +13,8 @@ export function useDraggable(props: any, context: any, canMove: Ref<boolean>) {
 
     const origPos = ref<Position | undefined>(new Position(0, 0));
     const oldTranslate = ref<Position>(new Position(0, 0));
-    const movingPos= ref<Position>(new Position(0, 0));
-    const currentPos= ref<Position>(new Position(0, 0));
+    const movingPos = ref<Position>(new Position(0, 0));
+    const currentPos = ref<Position>(new Position(0, 0));
 
     watch(() => canMove.value, (move) => {
         dragHandle.value.style.cursor = move ? 'move' : 'default';
@@ -35,7 +35,7 @@ export function useDraggable(props: any, context: any, canMove: Ref<boolean>) {
         }
 
         // Recursively iterate this elements children
-         
+
         for (const child in element.children) {
             if (Object.prototype.hasOwnProperty.call(element.children, child)) {
                 if (checkHandleTarget(target, element.children[child])) {
@@ -71,14 +71,14 @@ export function useDraggable(props: any, context: any, canMove: Ref<boolean>) {
         currentPos.value.y = translateY;
     }
 
-    function checkBounds(){
-        if(!boundingElement.value || !dragTarget.value){ return null; }
+    function checkBounds() {
+        if (!boundingElement.value || !dragTarget.value) { return null; }
         const boundary = boundingElement.value.getBoundingClientRect();
         const targetRect = dragTarget.value.getBoundingClientRect();
         const result = {
-            'top':  boundary.top < targetRect.top,
+            'top': boundary.top < targetRect.top,
             'right': boundary.right > targetRect.right,
-            'bottom':  boundary.bottom > targetRect.bottom,
+            'bottom': boundary.bottom > targetRect.bottom,
             'left': boundary.left < targetRect.left
         };
 
@@ -199,7 +199,7 @@ export function useDraggable(props: any, context: any, canMove: Ref<boolean>) {
                     dragHandle.value = props.dragHandle;
                 } else if (typeof props.dragHandle === 'string') {
                     const element = hostElement.querySelector(props.dragHandle);
-                    if(element) {
+                    if (element) {
                         dragHandle.value = element as HTMLElement;
                     }
                 }
@@ -217,6 +217,7 @@ export function useDraggable(props: any, context: any, canMove: Ref<boolean>) {
     }
 
     return {
-        registerDraggle, resetTranslate
+        registerDraggle, 
+        resetTranslate
     };
 }
diff --git a/packages/ui-vue/components/modal/src/modal.component.tsx b/packages/ui-vue/components/modal/src/modal.component.tsx
index d72250f9c80..88c974288f7 100644
--- a/packages/ui-vue/components/modal/src/modal.component.tsx
+++ b/packages/ui-vue/components/modal/src/modal.component.tsx
@@ -49,13 +49,20 @@ export default defineComponent({
 
 
         function close($event: MouseEvent, accept?: boolean) {
-            modelValue.value = false;
-            context.emit('update:modelValue', false);
-            if (accept != null) {
-                context.emit(accept ? 'accept' : 'cancel');
-            }
-
-            context.emit('closed', $event);
+            Promise.resolve()
+                .then(() => {
+                    return props.beforeClose?.();
+                })
+                .then((result: boolean | undefined) => {
+                    if (result) {
+                        modelValue.value = false;
+                        context.emit('update:modelValue', false);
+                        if (accept != null) {
+                            context.emit(accept ? 'accept' : 'cancel');
+                        }
+                        context.emit('closed', $event);
+                    }
+                });
         }
         const defaultButtons: ModalButton[] = [
             {
@@ -111,8 +118,20 @@ export default defineComponent({
         watch(() => props.modelValue, (newValue, oldValue) => {
             if (newValue !== oldValue) {
                 modelValue.value = newValue;
-
+                if(modelValue.value && props.draggable) {
+                    // 等待DOM挂载后，注册拖拽handler
+                    nextTick(() => {
+                        if (modalElementRef.value && !containment.value) {
+                            containment.value = (modalElementRef.value as HTMLElement).parentElement;
+                            boundingElement.value = containment.value;
+                            registerDraggle(modalHeaderRef.value, modalElementRef.value, boundingElement.value);
+                        }
+                    });
+                }
                 if (!newValue) {
+                    if(containment.value){
+                        containment.value = null;
+                    }
                     removeModalOpenStyle();
                 }
             }
@@ -165,7 +184,9 @@ export default defineComponent({
         });
 
         const modalDialogClass = computed(() => {
-            const classObject = { 'modal-dialog': true };
+            const classObject = {
+                'modal-dialog': true
+            };
             const customClassArray = customClass.value?.split(' ');
             customClassArray?.reduce((target: any, className: string) => {
                 target[className] = true;
@@ -175,13 +196,27 @@ export default defineComponent({
         });
 
         const modalDialogStyle = computed(() => {
-            const styleObject = {
+            const styleObject: any = {
                 position: 'absolute',
                 top: `${(window.innerHeight - height.value) / 2}px`,
                 left: `${(window.innerWidth - width.value) / 2}px`,
                 width: `${width.value}px`,
                 height: fitContent.value ? 'auto' : `${height.value}px`
             };
+            if (!props.mask) {
+                styleObject.pointerEvents = 'auto';
+            }
+            return styleObject;
+        });
+
+        const modalBackdropStyle = computed(() => {
+            const styleObject: any = {
+                display: 'block'
+            };
+            if(!props.mask) {
+                styleObject.pointerEvents = 'none';
+                styleObject.backgroundColor = 'transparent';
+            }
             return styleObject;
         });
 
@@ -355,47 +390,59 @@ export default defineComponent({
 
         function onClickModalBackdrop($event) {
             $event.stopPropagation();
+            // 点击阴影可以关闭
             if (props.allowClickMaskToClose) {
+                if ($event.target !== modalContainerRef.value) {
+                    return;
+                }
                 close($event, false);
             }
         }
 
+        function renderModal() {
+            return <div id={modalId.value} class={modalDialogClass.value} style={modalDialogStyle.value}
+                ref={modalElementRef}>
+                <div class={modalContentClass.value}>
+                    {showHeader.value && renderModalHeader()}
+                    <div class={modalBodyClass.value}>
+                        {context.slots.default?.()}
+                        {dialogType.value === 'iframe' && (
+                            <iframe
+                                title={modalId.value}
+                                class="f-utils-fill"
+                                width="100%"
+                                frameborder="0"
+                                src={iframeSrc.value}></iframe>
+                        )}
+                    </div>
+                    {
+                        renderModalFooter()
+                    }
+                </div>
+                {
+                    !fitContent.value &&
+                    resizeable.value &&
+                    modalElementRef.value &&
+                    !maximized.value &&
+                    renderResizeBar(modalElementRef.value)
+                }
+            </div>;
+        }
+
         return () => {
             return (
                 <Teleport to="body">
                     {showModal.value &&
                         <Transition name="fade" appear>
-                            <div class={modalContainerClass.value} style="display: block"
-                                ref={modalContainerRef} onClick={onClickModalBackdrop}>
-                                <div id={modalId.value} class={modalDialogClass.value} style={modalDialogStyle.value}
-                                    ref={modalElementRef}>
-                                    <div class={modalContentClass.value}>
-                                        {showHeader.value && renderModalHeader()}
-                                        <div class={modalBodyClass.value}>
-                                            {context.slots.default?.()}
-                                            {dialogType.value === 'iframe' && (
-                                                <iframe
-                                                    title={modalId.value}
-                                                    class="f-utils-fill"
-                                                    width="100%"
-                                                    frameborder="0"
-                                                    src={iframeSrc.value}></iframe>
-                                            )}
-                                        </div>
-                                        {
-                                            renderModalFooter()
-                                        }
-                                    </div>
-                                    {
-                                        !fitContent.value &&
-                                        resizeable.value &&
-                                        modalElementRef.value &&
-                                        !maximized.value &&
-                                        renderResizeBar(modalElementRef.value)
-                                    }
-                                </div>
+                            <div 
+                                ref={modalContainerRef} 
+                                class={modalContainerClass.value}
+                                style={modalBackdropStyle.value}
+                                onClick={onClickModalBackdrop}>
+                                {renderModal()}
                             </div>
-                        </Transition>}
+                        </Transition>
+                    }
                 </Teleport>
             );
         };
diff --git a/packages/ui-vue/components/modal/src/modal.props.ts b/packages/ui-vue/components/modal/src/modal.props.ts
index 9e1fff8e0a1..c3b0961c1ac 100644
--- a/packages/ui-vue/components/modal/src/modal.props.ts
+++ b/packages/ui-vue/components/modal/src/modal.props.ts
@@ -24,6 +24,10 @@ export const modalProps = {
      * 允许点击遮罩关闭对话框
      */
     allowClickMaskToClose: { type: Boolean, default: false },
+    /**
+     * 关闭对话框前事件， 是个函数，返回true或者false
+     */
+    beforeClose: { type: Function, default: () => { return true; } },
     /**
      * 自定义类
      */
@@ -55,6 +59,10 @@ export const modalProps = {
      * 是否展示模态框
      */
     modelValue: { type: Boolean, default: false },
+    /**
+     * 是否模态
+     */
+    mask: { type: Boolean, default: true },
     /**
      * 是否展示头部
      */
@@ -72,21 +80,21 @@ export const modalProps = {
      */
     showCloseButton: { type: Boolean, default: true },
     showMaxButton: { type: Boolean, default: false },
-    minHeight: {type: Number},
-    maxHeight: {type: Number},
-    minWidth: {type: Number},
-    maxWidth: {type: Number},
-    containment: {type: Object as PropType<HTMLElement>, default: null},
+    minHeight: { type: Number },
+    maxHeight: { type: Number },
+    minWidth: { type: Number },
+    maxWidth: { type: Number },
+    containment: { type: Object as PropType<HTMLElement>, default: null },
     resizeable: { type: Boolean, default: false },
-    draggable: { type: Boolean, default: false},
-    dragHandle: { type: Object as PropType<DragHandleType>, default: null},
-    closedCallback: { type: Function, default: null},
-    resizeHandle: { type: Function, default: null},
-    render: { type: Function, default: null},
-    acceptCallback: { type: Function, default: null},
-    rejectCallback: { type: Function, default: null},
-    enableEsc:  { type: Boolean, default: true },
-    enableEnter:  { type: Boolean, default: false },
+    draggable: { type: Boolean, default: false },
+    dragHandle: { type: Object as PropType<DragHandleType>, default: null },
+    closedCallback: { type: Function, default: null },
+    resizeHandle: { type: Function, default: null },
+    render: { type: Function, default: null },
+    acceptCallback: { type: Function, default: null },
+    rejectCallback: { type: Function, default: null },
+    enableEsc: { type: Boolean, default: true },
+    enableEnter: { type: Boolean, default: false },
     dialogType: { type: String, default: '' },
     src: { type: String, default: '' },
     footerHeight: { type: Number, default: 60 }
diff --git a/packages/ui-vue/components/modal/src/modal.scss b/packages/ui-vue/components/modal/src/modal.scss
index 080d52aa71e..5624db9da9b 100644
--- a/packages/ui-vue/components/modal/src/modal.scss
+++ b/packages/ui-vue/components/modal/src/modal.scss
@@ -15,7 +15,7 @@
     touch-action: none;
 
     &:hover {
-        background: rgba(42, 135, 255, .07);
+        background: transparent;
     }
 
     &.fv-resizable-n {
diff --git a/packages/ui-vue/demos/drawer/position.vue b/packages/ui-vue/demos/drawer/position.vue
index e64034e8ec7..e77ecb9da99 100644
--- a/packages/ui-vue/demos/drawer/position.vue
+++ b/packages/ui-vue/demos/drawer/position.vue
@@ -1,7 +1,7 @@
 <template>
     <f-radio-group id="basic" :name="name" :value-field="valueField" :text-field="textField"
     :horizontal="true"
-        :enum-data="radioEnumData" v-model="value">
+        :data="radioEnumData" v-model="value">
     </f-radio-group>
     <f-button @click="openDrawer">打开抽屉</f-button>
     <f-drawer v-model="open" title="抽屉标题" :position="value">
diff --git a/packages/ui-vue/demos/modal/custom-template.vue b/packages/ui-vue/demos/modal/custom-template.vue
index 23c2f391530..1331f68c868 100644
--- a/packages/ui-vue/demos/modal/custom-template.vue
+++ b/packages/ui-vue/demos/modal/custom-template.vue
@@ -18,6 +18,7 @@ const maskClassName = 'custom-mask-class'
         title="This is the modal dialog title" 
         :fit-content="false"
         :resizeable="true"
+        :draggable="true"
     >
        <div style="padding: 10px;">
         对话框内容
@@ -37,10 +38,7 @@ const maskClassName = 'custom-mask-class'
 .custom-class1 {
     color:chocolate
 }
-<<<<<<< HEAD
 .custom-mask-class {
     background-color: rgb(222, 184, 135, .6);
 }
-=======
->>>>>>> 93b12919167c045387aae41afd9111d08838161d
 </style>
diff --git a/packages/ui-vue/demos/modal/mask.vue b/packages/ui-vue/demos/modal/mask.vue
new file mode 100644
index 00000000000..806cb2fc831
--- /dev/null
+++ b/packages/ui-vue/demos/modal/mask.vue
@@ -0,0 +1,34 @@
+<script lang="ts" setup>
+import { ref } from 'vue'
+const mask = ref(true)
+const visiable = ref(false)
+function toggleModal() {
+    visiable.value = !visiable.value
+}
+</script>
+<template>
+    <div class="col-12 col-md-6 col-xl-3 col-el-2">
+        <div class="farris-group-wrap">
+            <div class="form-group farris-form-group">
+                <label class="col-form-label"><span class="farris-label-text">是否模态</span></label>
+                <div class="farris-input-wrap">
+                    <f-switch v-model="mask"></f-switch>
+                </div>
+            </div>
+        </div>
+    </div>
+    <f-modal
+        :draggable="true"
+        v-model="visiable"
+        :mask="mask"
+        title="This is the modal dialog title"
+        :fit-content="false"
+        :show-max-button="true"
+        :resizeable="true"
+    >
+        <div style="padding: 0 20px">
+            <p>This is modal content.</p>
+        </div>
+    </f-modal>
+    <f-button @click="toggleModal">弹出窗口</f-button>
+</template>
diff --git a/packages/ui-vue/docs/components/modal/index.md b/packages/ui-vue/docs/components/modal/index.md
index ee5ba366463..64323b43e7a 100644
--- a/packages/ui-vue/docs/components/modal/index.md
+++ b/packages/ui-vue/docs/components/modal/index.md
@@ -82,6 +82,15 @@ Modal 组件用来已弹出模态窗口的形式展示页面内容。
 
 :::
 
+## 是否模态
+
+:::vdemo
+
+```vue
+{demos/modal/mask.vue}
+```
+
+:::
 
 ## 类型
 
-- 
Gitee


From b8f145717bd00ddee39018a69aa466491cae28bc Mon Sep 17 00:00:00 2001
From: huyuyang <m15966339253@163.com>
Date: Sat, 15 Mar 2025 14:43:12 +0800
Subject: [PATCH 21/62] =?UTF-8?q?fix:=20=E5=AE=8C=E5=96=84drawer=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../drawer/src/drawer.component.tsx           | 76 ++++++++++++++++---
 .../ui-vue/components/drawer/src/drawer.css   |  7 ++
 .../components/drawer/src/drawer.props.ts     | 16 +++-
 .../components/modal/src/modal.component.tsx  |  3 +-
 .../components/modal/src/modal.props.ts       |  3 +-
 .../ui-vue/docs/components/drawer/index.md    |  7 +-
 .../ui-vue/docs/components/modal/index.md     |  5 ++
 7 files changed, 100 insertions(+), 17 deletions(-)

diff --git a/packages/ui-vue/components/drawer/src/drawer.component.tsx b/packages/ui-vue/components/drawer/src/drawer.component.tsx
index 3d6112e536d..62877d48e44 100644
--- a/packages/ui-vue/components/drawer/src/drawer.component.tsx
+++ b/packages/ui-vue/components/drawer/src/drawer.component.tsx
@@ -1,4 +1,4 @@
- 
+
 /**
  * Copyright (c) 2020 - present, Inspur Genersoft Co., Ltd.
  *
@@ -16,6 +16,7 @@
  */
 
 import { computed, defineComponent, SetupContext, Teleport, Transition, withModifiers } from "vue";
+import FButton from '@farris/ui-vue/components/button';
 import { DrawerProps, drawerProps } from "./drawer.props";
 import './drawer.css';
 
@@ -26,9 +27,35 @@ export default defineComponent({
     setup(props: DrawerProps, context: SetupContext) {
 
         const wrapperClassObject = computed(() => {
+            return {
+                
+            };
+        });
+
+        const maskClass = computed(() => {
+            const customMaskClass = {};
+            if(props.maskClass) {
+                props.maskClass.split(' ').forEach((klass: string) => {
+                    customMaskClass[klass] = true;
+                });
+            }
+            return {
+                'f-drawer-mask': true,
+                ...customMaskClass
+            };
+        });
+
+        const drawerClass = computed(() => {
+            const customClass = {};
+            if(props.maskClass) {
+                props.class.split(' ').forEach((klass: string) => {
+                    customClass[klass] = true;
+                });
+            }
             return {
                 'f-drawer-wrapper': true,
-                [`f-drawer-wrapper-${props.position}`]: true
+                [`f-drawer-wrapper-${props.position}`]: true,
+                ...customClass
             };
         });
 
@@ -46,9 +73,22 @@ export default defineComponent({
             return `f-drawer-${props.position}`;
         });
 
-        const onClose = () => {
-            context.emit('update:modelValue', false);
-            context.emit('afterClose');
+        const onClose = (e: MouseEvent) => {
+            Promise.resolve()
+                .then(() => {
+                    return props.beforeClose?.();
+                })
+                .then((result: boolean | undefined) => {
+                    if (result) {
+                        context.emit('update:modelValue', false);
+                        context.emit('afterClose');
+                    }
+                });
+
+        };
+
+        const onConfirm = (e: MouseEvent) => {
+            onClose(e);
         };
 
         return () => {
@@ -56,28 +96,44 @@ export default defineComponent({
                 <Teleport to="body">
                     <div class="f-drawer">
                         <Transition name="f-drawer-mask" appear>
-                            {props.modelValue && props.showMask && <div class="f-drawer-mask" onClick={withModifiers((e) => {
-                                props.closeByMask && onClose();
+                            {props.modelValue && <div class={maskClass.value} onClick={withModifiers((e: any) => {
+                                props.allowClickMaskToClose && onClose(e as MouseEvent);
                             }, ['stop'])}></div>}
                         </Transition>
                         <Transition name={transitionName.value} appear>
-                            {props.modelValue && <div class={wrapperClassObject.value} style={{ width: width.value, height: height.value, backgroundColor: props.backgroundColor }}>
+                            {props.modelValue && 
+                            <div 
+                                class={drawerClass.value} style={{ 
+                                    width: width.value,
+                                    height: height.value, 
+                                    backgroundColor: props.backgroundColor 
+                                }}>
                                 <div class="f-drawer-container">
                                     <div class="f-drawer-header">
                                         {props.showClose &&
                                             <div class="f-drawer-close">
                                                 <span class="f-icon f-icon-close" onClick={withModifiers((e) => {
-                                                    onClose();
+                                                    onClose(e as MouseEvent);
                                                 }, ['stop'])}></span>
                                             </div>
                                         }
                                         <div class="f-drawer-title">
-                                            {context.slots.title ? context.slots.title() : props.title}
+                                            {context.slots.headerTemplate ? context.slots.headerTemplate() : props.title}
                                         </div>
                                     </div>
                                     <div class="f-drawer-body">
                                         {context.slots.content?.()}
                                     </div>
+                                    <div class="f-drawer-footer">
+                                        {
+                                            context.slots.footerTemplate ?
+                                                context.slots.footerTemplate() :
+                                                <>
+                                                    <FButton class="mr-2" onClick={onClose}>取消</FButton>
+                                                    <FButton onClick={onConfirm}>确定</FButton>
+                                                </>
+                                        }
+                                    </div>
                                 </div>
                             </div>}
                         </Transition>
diff --git a/packages/ui-vue/components/drawer/src/drawer.css b/packages/ui-vue/components/drawer/src/drawer.css
index 79370136024..05649b2fcae 100644
--- a/packages/ui-vue/components/drawer/src/drawer.css
+++ b/packages/ui-vue/components/drawer/src/drawer.css
@@ -117,3 +117,10 @@
 .f-drawer-mask-leave-from {
     opacity: 1;
 }
+
+.f-drawer-footer {
+    height: 60px;
+    display: flex;
+    justify-content: end;
+    align-items: center;
+}
diff --git a/packages/ui-vue/components/drawer/src/drawer.props.ts b/packages/ui-vue/components/drawer/src/drawer.props.ts
index eb89640f36a..b134356f65e 100644
--- a/packages/ui-vue/components/drawer/src/drawer.props.ts
+++ b/packages/ui-vue/components/drawer/src/drawer.props.ts
@@ -19,6 +19,18 @@ import { ExtractPropTypes, PropType } from 'vue';
 export const drawerProps = {
     /** 背景色 */
     backgroundColor: { type: String, default: '#fff' },
+    /**
+     * 关闭对话框前事件， 是个函数，返回true或者false
+     */
+    beforeClose: { type: Function, default: () => { return true; } },
+    /**
+     * 自定义抽屉样式
+     */
+    class: { type: String, default: ''},
+    /**
+     * 自定义抽屉蒙层样式
+     */
+    modalClass: { type: String, default: ''},
     /** 高度 */
     height: { type: String as PropType<number | string>, default: 300 },
     /** 打开关闭抽屉 */
@@ -28,9 +40,9 @@ export const drawerProps = {
     /** 是否展示关闭按钮 */
     showClose: { type: Boolean, default: true },
     /** 是否展示遮罩层 */
-    showMask: { type: Boolean, default: true },
+    // mask: { type: Boolean, default: true },
     /** 点击遮罩是否关闭抽屉 */
-    closeByMask: { type: Boolean, default: true },
+    allowClickMaskToClose: { type: Boolean, default: true },
     /** 标题 */
     title: { type: String, default: '' },
     /** 宽度 */
diff --git a/packages/ui-vue/components/modal/src/modal.component.tsx b/packages/ui-vue/components/modal/src/modal.component.tsx
index 88c974288f7..0792cfbcbd4 100644
--- a/packages/ui-vue/components/modal/src/modal.component.tsx
+++ b/packages/ui-vue/components/modal/src/modal.component.tsx
@@ -438,7 +438,8 @@ export default defineComponent({
                                 ref={modalContainerRef} 
                                 class={modalContainerClass.value}
                                 style={modalBackdropStyle.value}
-                                onClick={onClickModalBackdrop}>
+                                onClick={onClickModalBackdrop}
+                            >
                                 {renderModal()}
                             </div>
                         </Transition>
diff --git a/packages/ui-vue/components/modal/src/modal.props.ts b/packages/ui-vue/components/modal/src/modal.props.ts
index c3b0961c1ac..f7d3a2452f8 100644
--- a/packages/ui-vue/components/modal/src/modal.props.ts
+++ b/packages/ui-vue/components/modal/src/modal.props.ts
@@ -19,11 +19,10 @@ import { ModalButton } from './composition/type';
 export type DragHandleType = HTMLElement | string;
 
 export const modalProps = {
-
     /**
      * 允许点击遮罩关闭对话框
      */
-    allowClickMaskToClose: { type: Boolean, default: false },
+    allowClickMaskToClose: { type: Boolean, default: true },
     /**
      * 关闭对话框前事件， 是个函数，返回true或者false
      */
diff --git a/packages/ui-vue/docs/components/drawer/index.md b/packages/ui-vue/docs/components/drawer/index.md
index bd93207d82e..67b4f010a69 100644
--- a/packages/ui-vue/docs/components/drawer/index.md
+++ b/packages/ui-vue/docs/components/drawer/index.md
@@ -26,12 +26,15 @@
 
 | 属性 | 类型                | 默认值         |说明         |
 | :----- | :------------------ | :----------- |:----------- |
-| backgroundColor  | `string` | #fff(白色) | 背景色 |
+| allowClickMaskToClose | `boolean` | true | 允许点击蒙层关闭对话框           |
+| beforeClose | `function` | () => true | 关闭前事件                        |
+| class | `string` | '' | 自定义样式，类名以空格隔开                           |
+| maskClass | `string` | '' | 自定义蒙层样式，类名以空格隔开                   |
+| backgroundColor  | `string` | #fff(白色) | 背景色     |
 | height  | `number 或 string` | 300 | 高度 |
 | modelValue  | `boolean` | false | 开启或者关闭 |
 | position  | `string` | right | 弹出位置 |
 | showClose  | `boolean` | true | 是否展示关闭按钮 |
-| showMask  | `boolean` | true | 是否展示遮罩层 |
 | title  | `string` | -- | 标题 |
 | width  | `number 或 string` | 300 | 宽度 |
 
diff --git a/packages/ui-vue/docs/components/modal/index.md b/packages/ui-vue/docs/components/modal/index.md
index 64323b43e7a..48251000448 100644
--- a/packages/ui-vue/docs/components/modal/index.md
+++ b/packages/ui-vue/docs/components/modal/index.md
@@ -109,6 +109,11 @@ export interface ModalButton {
 
 | 属性名     | 类型             | 默认值 | 说明                              |
 | :--------- | :--------------- | :----- | :-------------------------------- |
+| allowClickMaskToClose | `boolean` | true | 允许点击蒙层关闭对话框           |
+| beforeClose | `function` | () => true | 关闭前事件           |
+| class | `string` | '' | 自定义样式，类名以空格隔开                              |
+| maskClass | `string` | '' | 自定义蒙层样式，类名以空格隔开                      |
+| mask | `boolean` | false | 是否模态                                          |
 | title      | `string`         | --     | 窗口标题                          |
 | width      | `number`         | 500    | 窗口宽度                          |
 | height     | `number`         | 320    | 窗口高度                        |
-- 
Gitee


From beb43654cd7cb39c79f89f12ef6fd4dffc114523 Mon Sep 17 00:00:00 2001
From: huyuyang <m15966339253@163.com>
Date: Sat, 15 Mar 2025 14:55:52 +0800
Subject: [PATCH 22/62] =?UTF-8?q?build:=20=E4=BC=98=E5=8C=96ui=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E6=89=93=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/ui-vue/package.json              |  1 +
 packages/ui-vue/scripts/designer-index.js |  6 ++++++
 packages/ui-vue/scripts/index.js          | 10 ++--------
 3 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 packages/ui-vue/scripts/designer-index.js

diff --git a/packages/ui-vue/package.json b/packages/ui-vue/package.json
index 0b5e9a78c9d..24a1467f363 100644
--- a/packages/ui-vue/package.json
+++ b/packages/ui-vue/package.json
@@ -24,6 +24,7 @@
         "check": "vue-tsc --noEmit",
         "build": "vue-tsc --noEmit && vite build",
         "build:lib": "node --max-old-space-size=8192 ./scripts/index.js build",
+        "build:designerlib": "node --max-old-space-size=8192 ./scripts/designer-index.js build",
         "preview": "vite preview",
         "test": "jest --config jest.config.js",
         "vitest": "vitest",
diff --git a/packages/ui-vue/scripts/designer-index.js b/packages/ui-vue/scripts/designer-index.js
new file mode 100644
index 00000000000..93e86d8b408
--- /dev/null
+++ b/packages/ui-vue/scripts/designer-index.js
@@ -0,0 +1,6 @@
+import { Command} from 'commander';
+import { buildDesignerLibs } from './commands/build-designer.js';
+const designerProgram = new Command();
+
+designerProgram.command('build').description('构建 Farris UI Vue 设计器组件库').action(buildDesignerLibs);
+designerProgram.parse();
diff --git a/packages/ui-vue/scripts/index.js b/packages/ui-vue/scripts/index.js
index f79b780d3b7..2e27389e6bc 100644
--- a/packages/ui-vue/scripts/index.js
+++ b/packages/ui-vue/scripts/index.js
@@ -1,13 +1,7 @@
 #!/usr/bin/env node
-import { Command, Option } from 'commander';
+import { Command} from 'commander';
 import { buildLibs } from './commands/build.js';
-import { buildDesignerLibs } from './commands/build-designer.js';
-
 const program = new Command();
-const designerProgram = new Command();
 
-program.command('build').description('构建 Farris UI Vue 组件库').action(function () {
-    buildLibs()
-    .then(() => {  buildDesignerLibs();});
-});
+program.command('build').description('构建 Farris UI Vue 组件库').action(buildLibs);
 program.parse();
-- 
Gitee


From 5cc613b8a2b3edc585bdd3541427a7412a2b8041 Mon Sep 17 00:00:00 2001
From: huyuyang <m15966339253@163.com>
Date: Mon, 31 Mar 2025 10:34:47 +0800
Subject: [PATCH 23/62] fix: modify position of drawer close button

---
 .ls-lint.yml                                               | 6 +++---
 packages/ui-vue/components/drawer/src/drawer.component.tsx | 6 +++---
 packages/ui-vue/components/drawer/src/drawer.css           | 5 +++++
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.ls-lint.yml b/.ls-lint.yml
index 8136c908ed8..d9aa45a45a3 100644
--- a/.ls-lint.yml
+++ b/.ls-lint.yml
@@ -3,9 +3,9 @@ ls:
     # .dir: kebab-case | regex:__[A-Za-z0-9]+__
     .scss: kebab-case
     .vue: kebab-case
-    .js: kebab-case | pointcase
-    .ts: kebab-case | pointcase
-    .tsx: kebab-case | pointcase
+    .js: kebab-case 
+    .ts: kebab-case 
+    .tsx: kebab-case 
     .component.tsx: kebab-case
     .design.component.tsx: kebab-case
     .item.component.tsx: kebab-case
diff --git a/packages/ui-vue/components/drawer/src/drawer.component.tsx b/packages/ui-vue/components/drawer/src/drawer.component.tsx
index 62877d48e44..ed4b84152db 100644
--- a/packages/ui-vue/components/drawer/src/drawer.component.tsx
+++ b/packages/ui-vue/components/drawer/src/drawer.component.tsx
@@ -110,6 +110,9 @@ export default defineComponent({
                                 }}>
                                 <div class="f-drawer-container">
                                     <div class="f-drawer-header">
+                                        <div class="f-drawer-title">
+                                            {context.slots.headerTemplate ? context.slots.headerTemplate() : props.title}
+                                        </div>
                                         {props.showClose &&
                                             <div class="f-drawer-close">
                                                 <span class="f-icon f-icon-close" onClick={withModifiers((e) => {
@@ -117,9 +120,6 @@ export default defineComponent({
                                                 }, ['stop'])}></span>
                                             </div>
                                         }
-                                        <div class="f-drawer-title">
-                                            {context.slots.headerTemplate ? context.slots.headerTemplate() : props.title}
-                                        </div>
                                     </div>
                                     <div class="f-drawer-body">
                                         {context.slots.content?.()}
diff --git a/packages/ui-vue/components/drawer/src/drawer.css b/packages/ui-vue/components/drawer/src/drawer.css
index 05649b2fcae..cd96c9da084 100644
--- a/packages/ui-vue/components/drawer/src/drawer.css
+++ b/packages/ui-vue/components/drawer/src/drawer.css
@@ -14,6 +14,11 @@
 .f-drawer-header {
     display: flex;
     padding: 16px 24px;
+    justify-content: space-between;
+}
+
+.f-drawer-close:hover {
+    cursor: pointer;
 }
 
 .f-drawer-body {
-- 
Gitee


From e30dbdc721945f61a56d9a5d29f10925727ac67a Mon Sep 17 00:00:00 2001
From: huyuyang <m15966339253@163.com>
Date: Wed, 9 Apr 2025 20:21:04 +0800
Subject: [PATCH 24/62] build: optimize component import paths

---
 .../data-grid/src/data-grid.component.tsx          | 12 ++++++------
 .../date-picker-container.component.tsx            | 14 ++++++--------
 .../date-picker-container.props.ts                 |  2 +-
 .../components/date-range/date-range.component.tsx |  6 +++---
 .../src/composition/use-normalize-date.ts          |  2 +-
 .../date-picker/src/date-picker.component.tsx      |  4 ++--
 .../src/designer/date-picker.design.component.tsx  |  6 +++---
 .../src/designer/date-view.design.component.tsx    |  5 ++---
 .../date-picker/src/designer/use-rules.ts          |  5 ++---
 .../property-config/date-picker.property-config.ts |  4 +---
 .../date-picker/src/schema/schema-mapper.ts        |  2 +-
 .../date-picker/src/schema/schema-resolver.ts      |  2 +-
 .../src/components/number.component.tsx            |  5 ++---
 .../src/components/text-edit.component.tsx         |  4 ++--
 .../input-group/src/composition/types.ts           |  1 -
 .../src/designer/input-group.design.component.tsx  |  5 ++---
 .../input-group/src/input-group.component.tsx      |  2 +-
 .../property-config/input-group.property-config.ts |  2 +-
 packages/ui-vue/components/number-spinner/index.ts |  6 ++++--
 packages/ui-vue/components/property-panel/index.ts |  3 ++-
 .../src/designer/switch.design.component.tsx       |  3 +--
 .../switch/src/designer/use-design-rules.ts        |  3 +--
 .../src/property-config/switch.property-config.ts  |  2 +-
 .../components/switch/src/schema/schema-mapper.ts  |  2 +-
 .../switch/src/schema/schema-resolver.ts           |  2 +-
 packages/ui-vue/components/time-picker/index.ts    |  4 +++-
 26 files changed, 51 insertions(+), 57 deletions(-)

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 22ca8df18a9..99dbd735ec6 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
@@ -303,7 +303,7 @@ export default defineComponent({
                 const previousRow = visibleDatas.value[index - 1];
                 columns.forEach((column: DataColumn) => {
                     if (!visibleData.data[column.field]) {
-                        // 新增单元格对象
+                        // add visual cell
                         visibleData.data[column.field] =
                             useVisualDataCellComposition.createCellByColumn(
                                 column,
@@ -313,7 +313,7 @@ export default defineComponent({
                                 previousRow
                             );
                     } else {
-                        // 修改单元格对象
+                        // update visual cell
                         useVisualDataCellComposition.updateCellByColumn(
                             visibleData.data[column.field], column, previousRow, visibleData.raw);
                     }
@@ -339,8 +339,8 @@ export default defineComponent({
                 resetScroll();
                 dataView.load(newData);
                 visibleDatas.value = getVisualData(0, visibleCapacity.value + preloadCount - 1);
-                
-                if(showSidebarCheckBox.value && showSelectAll.value){
+
+                if (showSidebarCheckBox.value && showSelectAll.value) {
                     // 如果启用全选，更新全选状态,此处用于服务端分页简单的跨页多选场景
                     updateSelectAllStatus();
                 }
@@ -426,7 +426,7 @@ export default defineComponent({
         }
 
         function scrollToRowById() {
-            
+
         }
 
         const dataGridComponentInstance = {
@@ -466,7 +466,7 @@ export default defineComponent({
         return () => {
             return (
                 <div ref={dataGridRef} class={gridClass.value} style={containerStyleObject.value} onWheel={onWheel}>
-                    {gridContentRef.value && renderFilterPanel()}
+                    {gridContentRef.value && props.enableFilter && renderFilterPanel()}
                     {gridContentRef.value && renderGroupPanel()}
                     {gridContentRef.value && shouldShowHeader.value && renderGridHeader()}
                     <div ref={gridContentRef} class={gridContentClass.value}
diff --git a/packages/ui-vue/components/date-picker/src/components/date-picker-container/date-picker-container.component.tsx b/packages/ui-vue/components/date-picker/src/components/date-picker-container/date-picker-container.component.tsx
index f6465e7bbe9..76e843b7a0a 100644
--- a/packages/ui-vue/components/date-picker/src/components/date-picker-container/date-picker-container.component.tsx
+++ b/packages/ui-vue/components/date-picker/src/components/date-picker-container/date-picker-container.component.tsx
@@ -12,11 +12,14 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
+*/
 import { computed, defineComponent, onMounted, ref, SetupContext, watch } from "vue";
+import { cloneDeep } from "lodash-es";
+import { FTimePickerTimeView, convertToDate, convertToString, TimeValueText } from '@farris/ui-vue/components/time-picker';
+import { FButton } from "@farris/ui-vue/components/button";
+import { useDateFormat } from '@farris/ui-vue/components/common';
 import { datePickerContainerProps, DatePickerContainerProps, DisplayMode } from "./date-picker-container.props";
 import FCalenderNavBar from '../calendar-navbar/calendar-navbar.component';
-import FTimePickerTimeView from '../../../../time-picker/src/components/time.component';
 import CalenderView from '../calendar/calendar.component';
 import MonthView from '../month/month.component';
 import YearView from '../year/year.component';
@@ -28,12 +31,7 @@ import { useDate } from "../../composition/use-date";
 import { ActiveMonth } from "../../types/month";
 import { useMonth } from "../../composition/use-month";
 import { useYear } from "../../composition/use-year";
-import { FButton } from "../../../../button";
-import { TimeValueText } from "../../../../time-picker/src/composition/types";
-import { convertToDate, convertToString } from "../../../../time-picker/src/composition/utils";
-import { useDateFormat } from '../../../../common/date/use-date-format';
 import { CalenderDayItem } from "../../types/calendar";
-import { cloneDeep } from "lodash-es";
 
 export default defineComponent({
     name: 'FDateView',
@@ -662,7 +660,7 @@ export default defineComponent({
                 today.year >= minYear.value && today.year <= maxYear.value : false;
             return {
                 "pointer-events": canSelected ? "auto" : "none",
-                opacity: canSelected ? 1: 0.3
+                opacity: canSelected ? 1 : 0.3
             };
         });
 
diff --git a/packages/ui-vue/components/date-picker/src/components/date-picker-container/date-picker-container.props.ts b/packages/ui-vue/components/date-picker/src/components/date-picker-container/date-picker-container.props.ts
index fac44e36fdc..7e9205a40d2 100644
--- a/packages/ui-vue/components/date-picker/src/components/date-picker-container/date-picker-container.props.ts
+++ b/packages/ui-vue/components/date-picker/src/components/date-picker-container/date-picker-container.props.ts
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 import { ExtractPropTypes, PropType } from 'vue';
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
 import { CalendarWeekItem } from '../../types/calendar';
 import { DateObject, Period, SelectMode, weekDays } from '../../types/common';
 import { defaultNameOfMonths, MonthViewItem } from '../../types/month';
 import { YearViewItem } from '../../types/year';
-import { createPropsResolver } from '../../../../dynamic-resolver';
 import { schemaMapper } from '../../schema/schema-mapper';
 import { schemaResolver } from '../../schema/schema-resolver';
 import dateViewSchema from '../../schema/date-view.schema.json';
diff --git a/packages/ui-vue/components/date-picker/src/components/date-range/date-range.component.tsx b/packages/ui-vue/components/date-picker/src/components/date-range/date-range.component.tsx
index 56b51448dac..60aac643700 100644
--- a/packages/ui-vue/components/date-picker/src/components/date-range/date-range.component.tsx
+++ b/packages/ui-vue/components/date-picker/src/components/date-range/date-range.component.tsx
@@ -1,10 +1,10 @@
 import { computed, defineComponent, onMounted, ref, Ref } from "vue";
-import { FInputGroup } from "../../../../input-group";
+import { FInputGroup } from "@farris/ui-vue/components/input-group";
+import FPopover from '@farris/ui-vue/components/popover';
+import { useDateFormat } from "@farris/ui-vue/components/common";
 import { DateRangeProps, dateRangeProps } from "./date-range.props";
-import FPopover from '../../../../popover/src/popover.component';
 import FDatePickerContainer from '../date-picker-container/date-picker-container.component';
 import { DateObject } from "../../types/common";
-import { useDateFormat } from "../../../../common";
 
 export default defineComponent({
     name: 'FDateRange',
diff --git a/packages/ui-vue/components/date-picker/src/composition/use-normalize-date.ts b/packages/ui-vue/components/date-picker/src/composition/use-normalize-date.ts
index a41897d25e3..2be38ae892b 100644
--- a/packages/ui-vue/components/date-picker/src/composition/use-normalize-date.ts
+++ b/packages/ui-vue/components/date-picker/src/composition/use-normalize-date.ts
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { ref } from 'vue';
 import { DatePickerProps } from "../date-picker.props";
 import { DateObject, Period } from "../types/common";
-import { ref } from 'vue';
 import { DateFormatInfo, UseNormalizeDate } from "./types";
 import { useDateFormat } from "./use-date-format";
 import { useNumber } from "./use-number";
diff --git a/packages/ui-vue/components/date-picker/src/date-picker.component.tsx b/packages/ui-vue/components/date-picker/src/date-picker.component.tsx
index 79d709ae2c8..84bab55059f 100644
--- a/packages/ui-vue/components/date-picker/src/date-picker.component.tsx
+++ b/packages/ui-vue/components/date-picker/src/date-picker.component.tsx
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 import { computed, defineComponent, onMounted, ref, SetupContext, watch } from 'vue';
-import { DatePickerProps, datePickerProps } from './date-picker.props';
 import FButtonEdit from '@farris/ui-vue/components/button-edit';
+import { useDateFormat } from '@farris/ui-vue/components/common';
+import { DatePickerProps, datePickerProps } from './date-picker.props';
 import FDatePickerContainer from './components/date-picker-container/date-picker-container.component';
 import FDateRange from './components/date-range/date-range.component';
-import { useDateFormat } from '@farris/ui-vue/components/common';
 import { DateObject } from './types/common';
 import './date-picker.css';
 
diff --git a/packages/ui-vue/components/date-picker/src/designer/date-picker.design.component.tsx b/packages/ui-vue/components/date-picker/src/designer/date-picker.design.component.tsx
index 95912f47d5f..42e51a9ff95 100644
--- a/packages/ui-vue/components/date-picker/src/designer/date-picker.design.component.tsx
+++ b/packages/ui-vue/components/date-picker/src/designer/date-picker.design.component.tsx
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 import { defineComponent, inject, onMounted, ref, SetupContext } from 'vue';
+import FButtonEditDesign from '@farris/ui-vue/components/button-edit';
+import { DesignerItemContext } from '@farris/ui-vue/components/designer-canvas';
+import { useDesignerComponent } from '@farris/ui-vue/components/designer-canvas';
 import { DatePickerDesignProps, datePickerDesignProps } from '../date-picker.props';
-import FButtonEditDesign from '../../../button-edit/src/designer/button-edit.design.component';
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
 import { useDatePickerDesignerRules } from './use-rules';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
 
 export default defineComponent({
     name: 'FDatePickerDesign',
diff --git a/packages/ui-vue/components/date-picker/src/designer/date-view.design.component.tsx b/packages/ui-vue/components/date-picker/src/designer/date-view.design.component.tsx
index 743f2a05110..9f149517a18 100644
--- a/packages/ui-vue/components/date-picker/src/designer/date-view.design.component.tsx
+++ b/packages/ui-vue/components/date-picker/src/designer/date-view.design.component.tsx
@@ -13,10 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { defineComponent, inject, onMounted, ref, SetupContext } from 'vue';
+import { defineComponent, inject, onMounted, ref } from 'vue';
+import { useDesignerComponent, DesignerItemContext } from '@farris/ui-vue/components/designer-canvas';
 import { DatePickerProps, datePickerProps } from '../date-picker.props';
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
 import FDatePickerContainer from '../components/date-picker-container/date-picker-container.component';
 
 export default defineComponent({
diff --git a/packages/ui-vue/components/date-picker/src/designer/use-rules.ts b/packages/ui-vue/components/date-picker/src/designer/use-rules.ts
index 899f3a48279..ba32c2ebd08 100644
--- a/packages/ui-vue/components/date-picker/src/designer/use-rules.ts
+++ b/packages/ui-vue/components/date-picker/src/designer/use-rules.ts
@@ -1,6 +1,5 @@
- 
-import { UseDesignerRules } from "../../../designer-canvas/src/composition/types";
-import { ComponentSchema, DesignerComponentInstance, DesignerItemContext } from "../../../designer-canvas/src/types";
+
+import { ComponentSchema, DesignerComponentInstance, DesignerItemContext, UseDesignerRules } from "@farris/ui-vue/components/designer-canvas";
 import { DatePickerProperty } from "../property-config/date-picker.property-config";
 
 export function useDatePickerDesignerRules(designItemContext: DesignerItemContext, designerHostService): UseDesignerRules {
diff --git a/packages/ui-vue/components/date-picker/src/property-config/date-picker.property-config.ts b/packages/ui-vue/components/date-picker/src/property-config/date-picker.property-config.ts
index 410d68e8a39..eb2a780bdca 100644
--- a/packages/ui-vue/components/date-picker/src/property-config/date-picker.property-config.ts
+++ b/packages/ui-vue/components/date-picker/src/property-config/date-picker.property-config.ts
@@ -1,6 +1,4 @@
-import { FormSchemaEntityFieldTypeName } from "../../../common";
-import { FormPropertyChangeObject } from "../../../property-panel";
-import { InputBaseProperty } from "../../../property-panel/src/composition/entity/input-base-property";
+import { InputBaseProperty } from "@farris/ui-vue/components/property-panel";
 import { DATE_FORMATS } from "./date-format";
 
 export class DatePickerProperty extends InputBaseProperty {
diff --git a/packages/ui-vue/components/date-picker/src/schema/schema-mapper.ts b/packages/ui-vue/components/date-picker/src/schema/schema-mapper.ts
index 97964aee23b..2ca33ca0806 100644
--- a/packages/ui-vue/components/date-picker/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/date-picker/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/date-picker/src/schema/schema-resolver.ts b/packages/ui-vue/components/date-picker/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/date-picker/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/date-picker/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
diff --git a/packages/ui-vue/components/input-group/src/components/number.component.tsx b/packages/ui-vue/components/input-group/src/components/number.component.tsx
index 3c62e751da1..7d8bd6105f0 100644
--- a/packages/ui-vue/components/input-group/src/components/number.component.tsx
+++ b/packages/ui-vue/components/input-group/src/components/number.component.tsx
@@ -1,8 +1,7 @@
-import { SetupContext, computed, onMounted, ref, watch } from 'vue';
+import { SetupContext, computed, onMounted, watch } from 'vue';
 import { InputGroupProps } from '../input-group.props';
 import { useNumber, useFormat, useSpinner, useTextBox } from '@farris/ui-vue/components/number-spinner';
-import getNumberTextBoxRender from '../../../number-spinner/src/components/text-box.component';
-import getSpinnerRender from '../../../number-spinner/src/components/spinner.component';
+import {getSpinnerRender, getNumberTextBoxRender } from '@farris/ui-vue/components/number-spinner';
 
 export default function (
     props: InputGroupProps,
diff --git a/packages/ui-vue/components/input-group/src/components/text-edit.component.tsx b/packages/ui-vue/components/input-group/src/components/text-edit.component.tsx
index 275d968f65b..1ae27f95576 100644
--- a/packages/ui-vue/components/input-group/src/components/text-edit.component.tsx
+++ b/packages/ui-vue/components/input-group/src/components/text-edit.component.tsx
@@ -1,7 +1,7 @@
-import { SetupContext, nextTick, onMounted, ref } from 'vue';
+import { SetupContext, onMounted, ref } from 'vue';
+import { UseTextBox } from '@farris/ui-vue/components/common';
 import { InputGroupProps } from '../input-group.props';
 import { UsePassword } from '../composition/types';
-import { UseTextBox } from '@farris/ui-vue/components/common';
 
 export default function (
     props: InputGroupProps,
diff --git a/packages/ui-vue/components/input-group/src/composition/types.ts b/packages/ui-vue/components/input-group/src/composition/types.ts
index 2969b003629..0a0b3265d1f 100644
--- a/packages/ui-vue/components/input-group/src/composition/types.ts
+++ b/packages/ui-vue/components/input-group/src/composition/types.ts
@@ -1,5 +1,4 @@
 import { ComputedRef, Ref } from "vue";
-import { BigNumber } from 'bignumber.js';
 
 export interface UseAppendedButton {
 
diff --git a/packages/ui-vue/components/input-group/src/designer/input-group.design.component.tsx b/packages/ui-vue/components/input-group/src/designer/input-group.design.component.tsx
index 9717513580d..bb1508a2048 100644
--- a/packages/ui-vue/components/input-group/src/designer/input-group.design.component.tsx
+++ b/packages/ui-vue/components/input-group/src/designer/input-group.design.component.tsx
@@ -16,14 +16,13 @@
  * defination
  */
 import { defineComponent, inject, ref, SetupContext, onMounted } from 'vue';
+import { TextBoxProps, useClear, useTextBoxDesign } from '@farris/ui-vue/components/common';
+import { DesignerItemContext, useDesignerComponent } from '@farris/ui-vue/components/designer-canvas';
 import { InputGroupProps, inputGroupProps } from '../input-group.props';
 import { useAppendedButton } from '../composition/use-appended-button';
 import { usePassword } from '../composition/use-password';
-import { TextBoxProps, useClear, useTextBoxDesign } from '@farris/ui-vue/components/common';
 import getAppendedButtonRender from '../components/appended-button.component';
-import { DesignerItemContext, useDesignerComponent } from '@farris/ui-vue/components/designer-canvas';
 import { useInputGroupDesignerRules } from './use-input-group-rules';
-// import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
 
 export default defineComponent({
     name: 'FInputGroupDesign',
diff --git a/packages/ui-vue/components/input-group/src/input-group.component.tsx b/packages/ui-vue/components/input-group/src/input-group.component.tsx
index 25d60f9abd4..e6e41e7b7fd 100644
--- a/packages/ui-vue/components/input-group/src/input-group.component.tsx
+++ b/packages/ui-vue/components/input-group/src/input-group.component.tsx
@@ -16,8 +16,8 @@
  * defination
  */
 import { computed, defineComponent, onMounted, ref, SetupContext, watch } from 'vue';
-import { InputGroupProps, inputGroupProps } from './input-group.props';
 import { TextBoxProps, useClear, useTextBox } from '@farris/ui-vue/components/common';
+import { InputGroupProps, inputGroupProps } from './input-group.props';
 import { useAppendedButton } from './composition/use-appended-button';
 import { usePassword } from './composition/use-password';
 import getNumberRender from './components/number.component';
diff --git a/packages/ui-vue/components/input-group/src/property-config/input-group.property-config.ts b/packages/ui-vue/components/input-group/src/property-config/input-group.property-config.ts
index ab9861ee4d4..db49b0e7277 100644
--- a/packages/ui-vue/components/input-group/src/property-config/input-group.property-config.ts
+++ b/packages/ui-vue/components/input-group/src/property-config/input-group.property-config.ts
@@ -1,4 +1,4 @@
-import { InputBaseProperty } from "../../../property-panel/src/composition/entity/input-base-property";
+import { InputBaseProperty } from "@farris/ui-vue/components/property-panel";
 
 export class InputGroupProperty extends InputBaseProperty {
 
diff --git a/packages/ui-vue/components/number-spinner/index.ts b/packages/ui-vue/components/number-spinner/index.ts
index f1b016f11be..f2a04754174 100644
--- a/packages/ui-vue/components/number-spinner/index.ts
+++ b/packages/ui-vue/components/number-spinner/index.ts
@@ -1,4 +1,4 @@
- 
+
 /**
  * Copyright (c) 2020 - present, Inspur Genersoft Co., Ltd.
  *
@@ -14,16 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { withInstall } from '@farris/ui-vue/components/common';
 import FNumberSpinner from './src/number-spinner.component';
 import FNumberSpinnerDesign from './src/designer/number-spinner.design.component';
 import { propsResolver } from './src/number-spinner.props';
-import { withInstall } from '@farris/ui-vue/components/common';
 
 export * from './src/number-spinner.props';
 export * from './src/composition/use-format';
 export * from './src/composition/use-number';
 export * from './src/composition/use-spinner';
 export * from './src/composition/use-text-box';
+export { default as getNumberTextBoxRender } from './src/components/text-box.component';
+export { default as getSpinnerRender } from './src/components/spinner.component';
 
 FNumberSpinner.register = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>, resolverMap: Record<string, any>) => {
     componentMap['number-spinner'] = FNumberSpinner;
diff --git a/packages/ui-vue/components/property-panel/index.ts b/packages/ui-vue/components/property-panel/index.ts
index 8d1a0275995..32e8a28c392 100644
--- a/packages/ui-vue/components/property-panel/index.ts
+++ b/packages/ui-vue/components/property-panel/index.ts
@@ -17,13 +17,14 @@ import type { App } from 'vue';
 import FPropertyPanel from './src/property-panel.component';
 import { BaseControlProperty } from './src/composition/entity/base-property';
 import { SchemaDOMMapping } from './src/composition/entity/schema-dom-mapping';
+import { InputBaseProperty } from './src/composition/entity/input-base-property';
 
 export * from './src/composition/props/property-panel-item.props';
 export * from './src/composition/props/property-panel.props';
 
 export * from './src/composition/type';
 
-export { FPropertyPanel, BaseControlProperty, SchemaDOMMapping };
+export { FPropertyPanel, BaseControlProperty, SchemaDOMMapping, InputBaseProperty };
 
 export default {
     install(app: App): void {
diff --git a/packages/ui-vue/components/switch/src/designer/switch.design.component.tsx b/packages/ui-vue/components/switch/src/designer/switch.design.component.tsx
index 65883ca3e4f..b6cf664c8a9 100644
--- a/packages/ui-vue/components/switch/src/designer/switch.design.component.tsx
+++ b/packages/ui-vue/components/switch/src/designer/switch.design.component.tsx
@@ -15,9 +15,8 @@
  * limitations under the License.
  */
 import { computed, defineComponent, inject, onMounted, ref, SetupContext, toRefs } from 'vue';
+import { useDesignerComponent, DesignerItemContext } from '@farris/ui-vue/components/designer-canvas';
 import { switchProps, SwitchProps } from '../switch.props';
-import { DesignerItemContext } from '@farris/ui-vue/components/designer-canvas';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
 import { useSwitchDesignerRules } from './use-design-rules';
 
 export default defineComponent({
diff --git a/packages/ui-vue/components/switch/src/designer/use-design-rules.ts b/packages/ui-vue/components/switch/src/designer/use-design-rules.ts
index ef44e138bc3..f6bf6b64c0d 100644
--- a/packages/ui-vue/components/switch/src/designer/use-design-rules.ts
+++ b/packages/ui-vue/components/switch/src/designer/use-design-rules.ts
@@ -1,7 +1,6 @@
  
  
-import { ComponentSchema, DesignerComponentInstance, DesignerItemContext } from "../../../designer-canvas/src/types";
-import { UseDesignerRules } from "../../../designer-canvas/src/composition/types";
+import { UseDesignerRules, ComponentSchema, DesignerComponentInstance, DesignerItemContext } from "@farris/ui-vue/components/designer-canvas";
 import { SwitchProperty } from "../property-config/switch.property-config";
 export function useSwitchDesignerRules(designItemContext: DesignerItemContext, designerHostService): UseDesignerRules {
     const schema = designItemContext.schema as ComponentSchema;
diff --git a/packages/ui-vue/components/switch/src/property-config/switch.property-config.ts b/packages/ui-vue/components/switch/src/property-config/switch.property-config.ts
index f6735f96eff..c2479dc9f48 100644
--- a/packages/ui-vue/components/switch/src/property-config/switch.property-config.ts
+++ b/packages/ui-vue/components/switch/src/property-config/switch.property-config.ts
@@ -1,4 +1,4 @@
-import { InputBaseProperty } from "../../../property-panel/src/composition/entity/input-base-property";
+import { InputBaseProperty } from "@farris/ui-vue/components/property-panel";
 
 export class SwitchProperty extends InputBaseProperty {
 
diff --git a/packages/ui-vue/components/switch/src/schema/schema-mapper.ts b/packages/ui-vue/components/switch/src/schema/schema-mapper.ts
index 97964aee23b..2ca33ca0806 100644
--- a/packages/ui-vue/components/switch/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/switch/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/switch/src/schema/schema-resolver.ts b/packages/ui-vue/components/switch/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/switch/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/switch/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
diff --git a/packages/ui-vue/components/time-picker/index.ts b/packages/ui-vue/components/time-picker/index.ts
index f933829e8db..b66fd017266 100644
--- a/packages/ui-vue/components/time-picker/index.ts
+++ b/packages/ui-vue/components/time-picker/index.ts
@@ -1,9 +1,11 @@
- 
+
 import type { App, Plugin } from 'vue';
 import FTimePicker from './src/time-picker.component';
 import FTimePickerTimeView from './src/components/time.component';
 import { propsResolver } from './src/time-picker.props';
 import FTimePickerDesign from './src/designer/time-picker.design.component';
+export * from './src/composition/types';
+export * from './src/composition/utils';
 
 export * from './src/time-picker.props';
 export * from './src/components/time.props';
-- 
Gitee


From 9e899922d97adf57d0d010087c51ab1fa23c7abf Mon Sep 17 00:00:00 2001
From: huyuyang <m15966339253@163.com>
Date: Tue, 22 Apr 2025 10:24:06 +0800
Subject: [PATCH 25/62] fix: optimize drawer props modelValue

---
 .../drawer/src/drawer.component.tsx           | 87 ++++++++++---------
 1 file changed, 48 insertions(+), 39 deletions(-)

diff --git a/packages/ui-vue/components/drawer/src/drawer.component.tsx b/packages/ui-vue/components/drawer/src/drawer.component.tsx
index ed4b84152db..26103150a1e 100644
--- a/packages/ui-vue/components/drawer/src/drawer.component.tsx
+++ b/packages/ui-vue/components/drawer/src/drawer.component.tsx
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { computed, defineComponent, SetupContext, Teleport, Transition, withModifiers } from "vue";
+import { computed, defineComponent, ref, SetupContext, Teleport, Transition, watch, withModifiers } from "vue";
 import FButton from '@farris/ui-vue/components/button';
 import { DrawerProps, drawerProps } from "./drawer.props";
 import './drawer.css';
@@ -26,15 +26,17 @@ export default defineComponent({
     emits: ['afterClose', 'update:modelValue'] as (string[] & ThisType<void>) | undefined,
     setup(props: DrawerProps, context: SetupContext) {
 
+        const modelValue = ref(props.modelValue);
+
         const wrapperClassObject = computed(() => {
             return {
-                
+
             };
         });
 
         const maskClass = computed(() => {
             const customMaskClass = {};
-            if(props.maskClass) {
+            if (props.maskClass) {
                 props.maskClass.split(' ').forEach((klass: string) => {
                     customMaskClass[klass] = true;
                 });
@@ -47,7 +49,7 @@ export default defineComponent({
 
         const drawerClass = computed(() => {
             const customClass = {};
-            if(props.maskClass) {
+            if (props.maskClass) {
                 props.class.split(' ').forEach((klass: string) => {
                     customClass[klass] = true;
                 });
@@ -80,7 +82,8 @@ export default defineComponent({
                 })
                 .then((result: boolean | undefined) => {
                     if (result) {
-                        context.emit('update:modelValue', false);
+                        modelValue.value = false;
+                        context.emit('update:modelValue', modelValue.value);
                         context.emit('afterClose');
                     }
                 });
@@ -91,51 +94,57 @@ export default defineComponent({
             onClose(e);
         };
 
+        watch(() => props.modelValue, (newModelValue: boolean, oldModelValue: boolean) => {
+            if (newModelValue !== oldModelValue) {
+                modelValue.value = newModelValue;
+            }
+        });
+
         return () => {
             return (
                 <Teleport to="body">
                     <div class="f-drawer">
                         <Transition name="f-drawer-mask" appear>
-                            {props.modelValue && <div class={maskClass.value} onClick={withModifiers((e: any) => {
+                            {modelValue.value && <div class={maskClass.value} onClick={withModifiers((e: any) => {
                                 props.allowClickMaskToClose && onClose(e as MouseEvent);
                             }, ['stop'])}></div>}
                         </Transition>
                         <Transition name={transitionName.value} appear>
-                            {props.modelValue && 
-                            <div 
-                                class={drawerClass.value} style={{ 
-                                    width: width.value,
-                                    height: height.value, 
-                                    backgroundColor: props.backgroundColor 
-                                }}>
-                                <div class="f-drawer-container">
-                                    <div class="f-drawer-header">
-                                        <div class="f-drawer-title">
-                                            {context.slots.headerTemplate ? context.slots.headerTemplate() : props.title}
-                                        </div>
-                                        {props.showClose &&
-                                            <div class="f-drawer-close">
-                                                <span class="f-icon f-icon-close" onClick={withModifiers((e) => {
-                                                    onClose(e as MouseEvent);
-                                                }, ['stop'])}></span>
+                            {modelValue.value &&
+                                <div
+                                    class={drawerClass.value} style={{
+                                        width: width.value,
+                                        height: height.value,
+                                        backgroundColor: props.backgroundColor
+                                    }}>
+                                    <div class="f-drawer-container">
+                                        <div class="f-drawer-header">
+                                            <div class="f-drawer-title">
+                                                {context.slots.headerTemplate ? context.slots.headerTemplate() : props.title}
                                             </div>
-                                        }
-                                    </div>
-                                    <div class="f-drawer-body">
-                                        {context.slots.content?.()}
-                                    </div>
-                                    <div class="f-drawer-footer">
-                                        {
-                                            context.slots.footerTemplate ?
-                                                context.slots.footerTemplate() :
-                                                <>
-                                                    <FButton class="mr-2" onClick={onClose}>取消</FButton>
-                                                    <FButton onClick={onConfirm}>确定</FButton>
-                                                </>
-                                        }
+                                            {props.showClose &&
+                                                <div class="f-drawer-close">
+                                                    <span class="f-icon f-icon-close" onClick={withModifiers((e) => {
+                                                        onClose(e as MouseEvent);
+                                                    }, ['stop'])}></span>
+                                                </div>
+                                            }
+                                        </div>
+                                        <div class="f-drawer-body">
+                                            {context.slots.content?.()}
+                                        </div>
+                                        <div class="f-drawer-footer">
+                                            {
+                                                context.slots.footerTemplate ?
+                                                    context.slots.footerTemplate() :
+                                                    <>
+                                                        <FButton class="mr-2" onClick={onClose}>取消</FButton>
+                                                        <FButton onClick={onConfirm}>确定</FButton>
+                                                    </>
+                                            }
+                                        </div>
                                     </div>
-                                </div>
-                            </div>}
+                                </div>}
                         </Transition>
                     </div>
                 </Teleport>
-- 
Gitee


From 620a5ecbdd4219d5d58ee6ac079fef03b2c701a2 Mon Sep 17 00:00:00 2001
From: huyuyang <m15966339253@163.com>
Date: Fri, 16 May 2025 14:25:59 +0800
Subject: [PATCH 26/62] fix: adjust query solution import path

---
 packages/ui-vue/components/condition/index.ts        |  4 ++--
 .../src/designer/query-solution.design.component.tsx | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/ui-vue/components/condition/index.ts b/packages/ui-vue/components/condition/index.ts
index 98ef092477a..f3a0bd38ce3 100644
--- a/packages/ui-vue/components/condition/index.ts
+++ b/packages/ui-vue/components/condition/index.ts
@@ -16,6 +16,7 @@
 import type { App, Plugin } from 'vue';
 import FConditionFields from './src/condition-fields.component';
 import FConditionList from './src/condition-list.component';
+import FConditionFieldsDesign from  './src/condition-fields.design.component';
 
 export * from './src/condition.props';
 export * from './src/types';
@@ -24,12 +25,11 @@ export * from './src/composition/condition-value/types';
 export * from './src/composition/use-compare';
 export * from './src/composition/use-condition';
 export * from './src/composition/use-condition-value';
-export * from  './src/condition-fields.design.component';
 
 FConditionList.install = (app: App) => {
     app.component(FConditionFields.name as string, FConditionFields)
         .component(FConditionList.name as string, FConditionList);
 };
 
-export { FConditionFields, FConditionList };
+export { FConditionFields, FConditionList, FConditionFieldsDesign };
 export default FConditionList as typeof FConditionList & Plugin;
diff --git a/packages/ui-vue/components/query-solution/src/designer/query-solution.design.component.tsx b/packages/ui-vue/components/query-solution/src/designer/query-solution.design.component.tsx
index 3aba3d942cd..2aca93adaf7 100644
--- a/packages/ui-vue/components/query-solution/src/designer/query-solution.design.component.tsx
+++ b/packages/ui-vue/components/query-solution/src/designer/query-solution.design.component.tsx
@@ -15,7 +15,7 @@
  */
 import { defineComponent, computed, ref, SetupContext, inject, onMounted, watch } from 'vue';
 import { querySolutionProps, QuerySolutionProps } from '../query-solution.props';
-import FConditionFieldsDesign from '@farris/ui-vue/components/condition/src/condition-fields.design.component';
+import { FConditionFieldsDesign } from '@farris/ui-vue/components/condition';
 
 import { DesignerItemContext } from '@farris/ui-vue/components/designer-canvas';
 import { useDesignerComponent } from '@farris/ui-vue/components/designer-canvas';
@@ -52,7 +52,7 @@ export default defineComponent({
             const updatedFields = cloneDeep(newPresetFields);
             updatedFields.forEach((field) => {
                 field.editor.type = field.controlType;
-                if(field.editor.type === 'datetime-picker') {
+                if (field.editor.type === 'datetime-picker') {
                     field.editor.type = 'date-picker';
                     field.editor.showTime = true;
                 }
@@ -68,10 +68,10 @@ export default defineComponent({
                 };
             });
             modifyCount.value = modifyCount.value + 1;
-        }, 
-        {
-            immediate:true
-        });
+        },
+            {
+                immediate: true
+            });
 
 
         const shouldShowClearButton = ref(true);
-- 
Gitee


From 00febb20f45889c68c6e545680620fe0fa6af33f Mon Sep 17 00:00:00 2001
From: huyuyang <m15966339253@163.com>
Date: Wed, 21 May 2025 17:30:48 +0800
Subject: [PATCH 27/62] fix: adjust import path of drawer

---
 packages/ui-vue/components/designer-canvas/index.ts      | 3 ++-
 .../drawer/src/designer/drawer.design.component.tsx      | 9 ++-------
 .../components/drawer/src/designer/use-designer-rules.ts | 4 +---
 packages/ui-vue/components/drawer/src/drawer.props.ts    | 2 +-
 .../drawer/src/property-config/drawer.property-config.ts | 2 +-
 .../ui-vue/components/drawer/src/schema/schema-mapper.ts | 2 +-
 .../components/drawer/src/schema/schema-resolver.ts      | 2 +-
 7 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/packages/ui-vue/components/designer-canvas/index.ts b/packages/ui-vue/components/designer-canvas/index.ts
index c9435dd2950..43befcbf47d 100644
--- a/packages/ui-vue/components/designer-canvas/index.ts
+++ b/packages/ui-vue/components/designer-canvas/index.ts
@@ -1,5 +1,6 @@
 import FDesignerCanvas from './src/designer-canvas.component';
 import FDesignerItem from './src/components/designer-item.component';
+import FDesignerInnerItem from './src/components/designer-inner-item.component';
 import { DgControl } from './src/composition/dg-control';
 import type { DesignerHostService, UseDesignerRules, DesignerHTMLElement, DraggingResolveContext } from './src/composition/types';
 
@@ -11,4 +12,4 @@ export * from './src/composition/rule/use-dragula-common-rule';
 export * from './src/composition/types';
 export * from './src/types';
 
-export { FDesignerCanvas, FDesignerItem, DgControl, UseDesignerRules, DesignerHostService, DesignerHTMLElement, DraggingResolveContext };
+export { FDesignerCanvas, FDesignerItem, DgControl, UseDesignerRules, DesignerHostService, DesignerHTMLElement, DraggingResolveContext, FDesignerInnerItem };
diff --git a/packages/ui-vue/components/drawer/src/designer/drawer.design.component.tsx b/packages/ui-vue/components/drawer/src/designer/drawer.design.component.tsx
index 5b3a7aa9bfc..0080670667d 100644
--- a/packages/ui-vue/components/drawer/src/designer/drawer.design.component.tsx
+++ b/packages/ui-vue/components/drawer/src/designer/drawer.design.component.tsx
@@ -16,15 +16,10 @@
  */
 
 import { defineComponent, ref, inject, onMounted, Teleport, Transition, withModifiers, computed, watch, CSSProperties } from 'vue';
+import { DesignerItemContext, DesignerHostService, useDesignerComponent, FDesignerInnerItem } from '@farris/ui-vue/components/designer-canvas';
+import FResponseToolbarDesignComponent, { responseToolbarResolver } from '@farris/ui-vue/components/response-toolbar';
 import { drawerPropsDesignerProps } from '../drawer.props';
-
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
 import { useDesignerRules } from './use-designer-rules';
-import { DesignerHostService } from '../../../designer-canvas/src/composition/types';
-import { responseToolbarResolver } from '../../../response-toolbar';
-import FResponseToolbarDesignComponent from '../../../response-toolbar/src/designer/response-toolbar.design.component';
-import FDesignerInnerItem from '../../../designer-canvas/src/components/designer-inner-item.component';
 
 export default defineComponent({
     name: 'FDrawerDesign',
diff --git a/packages/ui-vue/components/drawer/src/designer/use-designer-rules.ts b/packages/ui-vue/components/drawer/src/designer/use-designer-rules.ts
index 083b618f372..c1e399eff4b 100644
--- a/packages/ui-vue/components/drawer/src/designer/use-designer-rules.ts
+++ b/packages/ui-vue/components/drawer/src/designer/use-designer-rules.ts
@@ -1,6 +1,4 @@
-import { DesignerHostService, UseDesignerRules } from "../../../designer-canvas/src/composition/types";
-import { DesignerItemContext } from "../../../designer-canvas/src/types";
-import { UseTemplateDragAndDropRules } from "../../../designer-canvas/src/composition/rule/use-template-rule";
+import { UseTemplateDragAndDropRules, DesignerItemContext, DesignerHostService, UseDesignerRules } from "@farris/ui-vue/components/designer-canvas";
 import { DrawerProperty } from "../property-config/drawer.property-config";
 
 export function useDesignerRules(designItemContext: DesignerItemContext, designerHostService?: DesignerHostService): UseDesignerRules {
diff --git a/packages/ui-vue/components/drawer/src/drawer.props.ts b/packages/ui-vue/components/drawer/src/drawer.props.ts
index 8776e2e8ed0..c7163e43c6e 100644
--- a/packages/ui-vue/components/drawer/src/drawer.props.ts
+++ b/packages/ui-vue/components/drawer/src/drawer.props.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 import { ExtractPropTypes, PropType } from 'vue';
-import { createPropsResolver } from '../../dynamic-resolver';
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
 import { schemaResolver } from './schema/schema-resolver';
 import { schemaMapper } from './schema/schema-mapper';
 import drawerSchema from './schema/drawer.schema.json';
diff --git a/packages/ui-vue/components/drawer/src/property-config/drawer.property-config.ts b/packages/ui-vue/components/drawer/src/property-config/drawer.property-config.ts
index 596b322605f..3e01edb9d4d 100644
--- a/packages/ui-vue/components/drawer/src/property-config/drawer.property-config.ts
+++ b/packages/ui-vue/components/drawer/src/property-config/drawer.property-config.ts
@@ -1,4 +1,4 @@
-import { BaseControlProperty } from "../../../property-panel/src/composition/entity/base-property";
+import { BaseControlProperty } from "@farris/ui-vue/components/property-panel";
 
 export class DrawerProperty extends BaseControlProperty {
     constructor(componentId: string, designerHostService: any) {
diff --git a/packages/ui-vue/components/drawer/src/schema/schema-mapper.ts b/packages/ui-vue/components/drawer/src/schema/schema-mapper.ts
index 97964aee23b..2ca33ca0806 100644
--- a/packages/ui-vue/components/drawer/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/drawer/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/drawer/src/schema/schema-resolver.ts b/packages/ui-vue/components/drawer/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/drawer/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/drawer/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
-- 
Gitee


From d906bcc51db0915e9a7381eacb2101c226255cbb Mon Sep 17 00:00:00 2001
From: huyuyang <m15966339253@163.com>
Date: Thu, 22 May 2025 09:07:56 +0800
Subject: [PATCH 28/62] fix: split designer and component of drawer

---
 .../designer-canvas/src/components/maps.ts    |  2 +-
 packages/ui-vue/components/drawer/designer.ts | 39 +++++++++++++++++++
 packages/ui-vue/components/drawer/index.ts    | 14 +------
 .../src/designer/drawer.design.component.tsx  |  2 +-
 .../src/designer/drawer.design.props.ts       |  7 ++++
 .../components/drawer/src/drawer.props.ts     | 11 ------
 .../dynamic-view/src/components/maps.ts       |  2 +-
 7 files changed, 50 insertions(+), 27 deletions(-)
 create mode 100644 packages/ui-vue/components/drawer/designer.ts
 create mode 100644 packages/ui-vue/components/drawer/src/designer/drawer.design.props.ts

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 966dd0c7170..2bac9ebbff6 100644
--- a/packages/ui-vue/components/designer-canvas/src/components/maps.ts
+++ b/packages/ui-vue/components/designer-canvas/src/components/maps.ts
@@ -54,7 +54,7 @@ import FVideo from '@farris/ui-vue/components/video';
 import FTextArea from '@farris/ui-vue/components/textarea';
 import FTreeGrid from '@farris/ui-vue/components/tree-grid';
 import FFieldset from '@farris/ui-vue/components/fieldset';
-import FDrawer from '@farris/ui-vue/components/drawer';
+import FDrawer from '@farris/ui-vue/components/drawer/designer';
 import FHtmlTemplate from '@farris/ui-vue/components/html-template';
 
 const componentMap: Record<string, any> = {};
diff --git a/packages/ui-vue/components/drawer/designer.ts b/packages/ui-vue/components/drawer/designer.ts
new file mode 100644
index 00000000000..93490f132cc
--- /dev/null
+++ b/packages/ui-vue/components/drawer/designer.ts
@@ -0,0 +1,39 @@
+ 
+/**
+ * Copyright (c) 2020 - present, Inspur Genersoft Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
+import { withInstall } from '@farris/ui-vue/components/common';
+import FDrawer from './src/drawer.component';
+import FDrawerDesign from './src/designer/drawer.design.component';
+import { schemaResolver } from './src/schema/schema-resolver';
+import { schemaMapper } from './src/schema/schema-mapper';
+import drawerSchema from './src/schema/drawer.schema.json';
+import { drawerPropsDesignerProps } from './src/designer/drawer.design.props';
+
+export * from './src/drawer.props';
+
+export const propsResolver = createPropsResolver<typeof drawerPropsDesignerProps>(drawerPropsDesignerProps, drawerSchema, schemaMapper, schemaResolver);
+
+FDrawerDesign.register = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>) => {
+    componentMap['drawer'] = FDrawer;
+    propsResolverMap['drawer'] = propsResolver;
+};
+
+FDrawerDesign.registerDesigner = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>) => {
+    componentMap['drawer'] = FDrawerDesign;
+    propsResolverMap['drawer'] = propsResolver;
+};
+export default withInstall(FDrawerDesign);
diff --git a/packages/ui-vue/components/drawer/index.ts b/packages/ui-vue/components/drawer/index.ts
index b40a1033354..648212efc15 100644
--- a/packages/ui-vue/components/drawer/index.ts
+++ b/packages/ui-vue/components/drawer/index.ts
@@ -14,21 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import FDrawer from './src/drawer.component';
-import { propsResolver } from './src/drawer.props';
-import FDrawerDesign from './src/designer/drawer.design.component';
 import { withInstall } from '@farris/ui-vue/components/common';
+import FDrawer from './src/drawer.component';
 
 export * from './src/drawer.props';
-
-FDrawer.register = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>) => {
-    componentMap['drawer'] = FDrawer;
-    propsResolverMap['drawer'] = propsResolver;
-};
-
-FDrawer.registerDesigner = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>) => {
-    componentMap['drawer'] = FDrawerDesign;
-    propsResolverMap['drawer'] = propsResolver;
-};
 export { FDrawer };
 export default withInstall(FDrawer);
diff --git a/packages/ui-vue/components/drawer/src/designer/drawer.design.component.tsx b/packages/ui-vue/components/drawer/src/designer/drawer.design.component.tsx
index 0080670667d..053a7dbcb93 100644
--- a/packages/ui-vue/components/drawer/src/designer/drawer.design.component.tsx
+++ b/packages/ui-vue/components/drawer/src/designer/drawer.design.component.tsx
@@ -18,8 +18,8 @@
 import { defineComponent, ref, inject, onMounted, Teleport, Transition, withModifiers, computed, watch, CSSProperties } from 'vue';
 import { DesignerItemContext, DesignerHostService, useDesignerComponent, FDesignerInnerItem } from '@farris/ui-vue/components/designer-canvas';
 import FResponseToolbarDesignComponent, { responseToolbarResolver } from '@farris/ui-vue/components/response-toolbar';
-import { drawerPropsDesignerProps } from '../drawer.props';
 import { useDesignerRules } from './use-designer-rules';
+import { drawerPropsDesignerProps } from './drawer.design.props';
 
 export default defineComponent({
     name: 'FDrawerDesign',
diff --git a/packages/ui-vue/components/drawer/src/designer/drawer.design.props.ts b/packages/ui-vue/components/drawer/src/designer/drawer.design.props.ts
new file mode 100644
index 00000000000..0b636277479
--- /dev/null
+++ b/packages/ui-vue/components/drawer/src/designer/drawer.design.props.ts
@@ -0,0 +1,7 @@
+import { ExtractPropTypes } from "vue";
+import { drawerProps } from "../drawer.props";
+
+export const drawerPropsDesignerProps = Object.assign({}, drawerProps, {
+    componentId: { type: String, default: '' }
+});
+export type DrawerDesignerProps = ExtractPropTypes<typeof drawerPropsDesignerProps>;
diff --git a/packages/ui-vue/components/drawer/src/drawer.props.ts b/packages/ui-vue/components/drawer/src/drawer.props.ts
index c7163e43c6e..6ef6700fa8b 100644
--- a/packages/ui-vue/components/drawer/src/drawer.props.ts
+++ b/packages/ui-vue/components/drawer/src/drawer.props.ts
@@ -15,10 +15,6 @@
  * limitations under the License.
  */
 import { ExtractPropTypes, PropType } from 'vue';
-import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
-import { schemaResolver } from './schema/schema-resolver';
-import { schemaMapper } from './schema/schema-mapper';
-import drawerSchema from './schema/drawer.schema.json';
 
 export const drawerProps = {
     /** 背景色 */
@@ -58,10 +54,3 @@ export const drawerProps = {
 } as Record<string, any>;
 
 export type DrawerProps = ExtractPropTypes<typeof drawerProps>;
-
-export const drawerPropsDesignerProps=Object.assign({}, drawerProps, {
-    componentId: { type: String, default: '' }
-});
-export type DrawerDesignerProps = ExtractPropTypes<typeof drawerPropsDesignerProps>;
-
-export const propsResolver = createPropsResolver<typeof drawerPropsDesignerProps>(drawerPropsDesignerProps, drawerSchema, schemaMapper, schemaResolver);
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 c4da05aed69..0e8a427200d 100644
--- a/packages/ui-vue/components/dynamic-view/src/components/maps.ts
+++ b/packages/ui-vue/components/dynamic-view/src/components/maps.ts
@@ -63,7 +63,7 @@ import FFilterConditionEditor from '@farris/ui-vue/components/filter-condition-e
 import FFieldset from '@farris/ui-vue/components/fieldset';
 import FSortConditionEditor from '@farris/ui-vue/components/sort-condition-editor';
 import FMenuLookup from '@farris/ui-vue/components/menu-lookup';
-import FDrawer from '@farris/ui-vue/components/drawer';
+import FDrawer from '@farris/ui-vue/components/drawer/designer';
 import FJsonEditor from '@farris/ui-vue/components/json-editor';
 import FPropertyEditor from '@farris/ui-vue/components/property-editor';
 import FExpressionEditor from '@farris/ui-vue/components/expression-editor';
-- 
Gitee


From e4bf198f3401cfd96b10904d3a9c5ac4ce63ed9f Mon Sep 17 00:00:00 2001
From: huyuyang <m15966339253@163.com>
Date: Fri, 23 May 2025 10:20:31 +0800
Subject: [PATCH 29/62] feature: modal add host props

---
 .../components/modal/src/composition/type.ts  |  1 +
 .../components/modal/src/modal.component.tsx  | 19 ++++++++-----
 .../components/modal/src/modal.props.ts       |  3 ++-
 packages/ui-vue/demos/modal/host.vue          | 27 +++++++++++++++++++
 .../ui-vue/docs/components/modal/index.md     | 10 +++++++
 5 files changed, 53 insertions(+), 7 deletions(-)
 create mode 100644 packages/ui-vue/demos/modal/host.vue

diff --git a/packages/ui-vue/components/modal/src/composition/type.ts b/packages/ui-vue/components/modal/src/composition/type.ts
index 7fcca8f0a58..0512b650a55 100644
--- a/packages/ui-vue/components/modal/src/composition/type.ts
+++ b/packages/ui-vue/components/modal/src/composition/type.ts
@@ -40,6 +40,7 @@ export interface ModalOptions {
     enableEsc?: boolean;
     dialogType?: string;
     src?: string;
+    host?: string | HTMLElement;
 }
 
 export interface ModalFunctions {
diff --git a/packages/ui-vue/components/modal/src/modal.component.tsx b/packages/ui-vue/components/modal/src/modal.component.tsx
index e194c8e7824..8cf6c374250 100644
--- a/packages/ui-vue/components/modal/src/modal.component.tsx
+++ b/packages/ui-vue/components/modal/src/modal.component.tsx
@@ -122,7 +122,7 @@ export default defineComponent({
         watch(() => props.modelValue, (newValue, oldValue) => {
             if (newValue !== oldValue) {
                 modelValue.value = newValue;
-                if(modelValue.value && props.draggable) {
+                if (modelValue.value && props.draggable) {
                     // 等待DOM挂载后，注册拖拽handler
                     nextTick(() => {
                         if (modalElementRef.value && !containment.value) {
@@ -133,7 +133,7 @@ export default defineComponent({
                     });
                 }
                 if (!newValue) {
-                    if(containment.value){
+                    if (containment.value) {
                         containment.value = null;
                     }
                     removeModalOpenStyle();
@@ -221,7 +221,7 @@ export default defineComponent({
             const styleObject: any = {
                 display: 'block'
             };
-            if(!props.mask) {
+            if (!props.mask) {
                 styleObject.pointerEvents = 'none';
                 styleObject.backgroundColor = 'transparent';
             }
@@ -449,13 +449,20 @@ export default defineComponent({
             </div>;
         }
 
+        function getHost(host: string | HTMLElement | undefined) {
+            if (!host) {
+                return 'body';
+            }
+            return host;
+        }
+
         return () => {
             return (
-                <Teleport to="body">
+                <Teleport to={getHost(props.host)}>
                     {showModal.value &&
                         <Transition name="fade" appear>
-                            <div 
-                                ref={modalContainerRef} 
+                            <div
+                                ref={modalContainerRef}
                                 class={modalContainerClass.value}
                                 style={modalBackdropStyle.value}
                                 onClick={onClickModalBackdrop}
diff --git a/packages/ui-vue/components/modal/src/modal.props.ts b/packages/ui-vue/components/modal/src/modal.props.ts
index b94bc6cd17b..92272db8460 100644
--- a/packages/ui-vue/components/modal/src/modal.props.ts
+++ b/packages/ui-vue/components/modal/src/modal.props.ts
@@ -96,7 +96,8 @@ export const modalProps = {
     enableEnter: { type: Boolean, default: false },
     dialogType: { type: String, default: '' },
     src: { type: String, default: '' },
-    footerHeight: { type: Number, default: 60 }
+    footerHeight: { type: Number, default: 60 },
+    host: { type: Object as PropType<DragHandleType>, default: 'body' }
 };
 
 export type ModalProps = Partial<ExtractPropTypes<typeof modalProps>>;
diff --git a/packages/ui-vue/demos/modal/host.vue b/packages/ui-vue/demos/modal/host.vue
new file mode 100644
index 00000000000..2d475fc650b
--- /dev/null
+++ b/packages/ui-vue/demos/modal/host.vue
@@ -0,0 +1,27 @@
+<script setup lang="tsx">
+
+import { inject } from 'vue';
+import { F_MODAL_SERVICE_TOKEN } from '../../components/modal';
+
+const modalService = inject(F_MODAL_SERVICE_TOKEN) as any;
+function renderComponent() {
+    return () => (<><h2 class="m-3 pt-5" style="text-align:center;font-size: 36px;"> 自定义模态框容器 </h2></>);
+}
+function openModal() {
+    modalService.open({
+        host:'.custom-modal-container',
+        fitContent: false,
+        width: 800,
+        height: 600,
+        draggable: true,
+        title: '自定义尺寸',
+        render: renderComponent()
+    });
+}
+
+</script>
+<template>
+    <div class="custom-modal-container" style="padding: 20px">Modal Content
+        <f-button @click="openModal">弹出窗口</f-button>
+    </div>
+</template>
diff --git a/packages/ui-vue/docs/components/modal/index.md b/packages/ui-vue/docs/components/modal/index.md
index 48251000448..c7a67720412 100644
--- a/packages/ui-vue/docs/components/modal/index.md
+++ b/packages/ui-vue/docs/components/modal/index.md
@@ -92,6 +92,16 @@ Modal 组件用来已弹出模态窗口的形式展示页面内容。
 
 :::
 
+## 自定义host
+
+:::vdemo
+
+```vue
+{demos/modal/host.vue}
+```
+
+:::
+
 ## 类型
 
 ```typescript
-- 
Gitee


From 4cc05f39ff39296d2bb25679ff252e2ffccad120 Mon Sep 17 00:00:00 2001
From: huyuyang <m15966339253@163.com>
Date: Fri, 23 May 2025 10:54:19 +0800
Subject: [PATCH 30/62] fix: change drawer position absolute to fixed

---
 packages/ui-vue/components/drawer/src/drawer.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/ui-vue/components/drawer/src/drawer.css b/packages/ui-vue/components/drawer/src/drawer.css
index 342036c3427..247fa7f0cc4 100644
--- a/packages/ui-vue/components/drawer/src/drawer.css
+++ b/packages/ui-vue/components/drawer/src/drawer.css
@@ -34,7 +34,7 @@
     pointer-events: auto;
 }
 .f-drawer-wrapper {
-    position: absolute;
+    position: fixed;
     z-index: 1000;
     transition: all 0.3s;
     pointer-events: auto;
-- 
Gitee


From b7a6cf20ffa8ad4e568d2a951337d20bae9a19b2 Mon Sep 17 00:00:00 2001
From: huyuyang <m15966339253@163.com>
Date: Fri, 23 May 2025 16:37:38 +0800
Subject: [PATCH 31/62] fix: drawer supports host

---
 .../drawer/src/drawer.component.tsx           | 29 +++++++++++++++----
 .../ui-vue/components/drawer/src/drawer.css   |  8 +++--
 .../components/drawer/src/drawer.props.ts     |  3 +-
 packages/ui-vue/demos/drawer/host.vue         | 21 ++++++++++++++
 .../ui-vue/docs/components/drawer/index.md    | 12 +++++++-
 5 files changed, 63 insertions(+), 10 deletions(-)
 create mode 100644 packages/ui-vue/demos/drawer/host.vue

diff --git a/packages/ui-vue/components/drawer/src/drawer.component.tsx b/packages/ui-vue/components/drawer/src/drawer.component.tsx
index 26103150a1e..ff64f33d276 100644
--- a/packages/ui-vue/components/drawer/src/drawer.component.tsx
+++ b/packages/ui-vue/components/drawer/src/drawer.component.tsx
@@ -28,6 +28,23 @@ export default defineComponent({
 
         const modelValue = ref(props.modelValue);
 
+        // const host = computed(() => {
+        //     if (typeof props.host === 'string') {
+        //         const container = document.querySelector(props.host);
+        //         return container;
+        //     }
+        //     return props.host;
+        // });
+        const drawerContainerClass = computed(() => {
+            const showNotInBody = typeof props.host === 'string' ? props.host !== 'body' :
+            document.querySelector(props.host) !== document.body;
+            return {
+                'f-drawer': true,
+                // 在某个DOM内部打开抽屉
+                'f-drawer-inline': showNotInBody
+            };
+        });
+
         const wrapperClassObject = computed(() => {
             return {
 
@@ -102,21 +119,21 @@ export default defineComponent({
 
         return () => {
             return (
-                <Teleport to="body">
-                    <div class="f-drawer">
+                <Teleport to={props.host}>
+                    <div class={drawerContainerClass.value}>
                         <Transition name="f-drawer-mask" appear>
                             {modelValue.value && <div class={maskClass.value} onClick={withModifiers((e: any) => {
                                 props.allowClickMaskToClose && onClose(e as MouseEvent);
                             }, ['stop'])}></div>}
                         </Transition>
-                        <Transition name={transitionName.value} appear>
-                            {modelValue.value &&
+                        <Transition name={transitionName.value}>
+                            
                                 <div
                                     class={drawerClass.value} style={{
                                         width: width.value,
                                         height: height.value,
                                         backgroundColor: props.backgroundColor
-                                    }}>
+                                    }} v-show={modelValue.value}>
                                     <div class="f-drawer-container">
                                         <div class="f-drawer-header">
                                             <div class="f-drawer-title">
@@ -144,7 +161,7 @@ export default defineComponent({
                                             }
                                         </div>
                                     </div>
-                                </div>}
+                                </div>
                         </Transition>
                     </div>
                 </Teleport>
diff --git a/packages/ui-vue/components/drawer/src/drawer.css b/packages/ui-vue/components/drawer/src/drawer.css
index 247fa7f0cc4..4d2ace4cd07 100644
--- a/packages/ui-vue/components/drawer/src/drawer.css
+++ b/packages/ui-vue/components/drawer/src/drawer.css
@@ -1,9 +1,12 @@
 .f-drawer {
-    position: absolute;
+    position: fixed;
     z-index: 1000;
     inset: 0;
     pointer-events: none;
 }
+.f-drawer.f-drawer-inline {
+    position: absolute;
+}
 .f-drawer-container {
     display: flex;
     flex-direction: column;
@@ -34,7 +37,7 @@
     pointer-events: auto;
 }
 .f-drawer-wrapper {
-    position: fixed;
+    position: absolute;
     z-index: 1000;
     transition: all 0.3s;
     pointer-events: auto;
@@ -119,6 +122,7 @@
 
 .f-drawer-right-enter-from,
 .f-drawer-right-leave-to {
+    width: 0;
     transform: translateX(100%);
 }
 
diff --git a/packages/ui-vue/components/drawer/src/drawer.props.ts b/packages/ui-vue/components/drawer/src/drawer.props.ts
index 6ef6700fa8b..6b47ddb0be5 100644
--- a/packages/ui-vue/components/drawer/src/drawer.props.ts
+++ b/packages/ui-vue/components/drawer/src/drawer.props.ts
@@ -50,7 +50,8 @@ export const drawerProps = {
     /** 标题 */
     title: { type: String, default: '' },
     /** 宽度 */
-    width: { type: String as PropType<number | string>, default: 300 }
+    width: { type: String as PropType<number | string>, default: 300 },
+    host: { type: Object as PropType<string | HTMLElement>, default: 'body' }
 } as Record<string, any>;
 
 export type DrawerProps = ExtractPropTypes<typeof drawerProps>;
diff --git a/packages/ui-vue/demos/drawer/host.vue b/packages/ui-vue/demos/drawer/host.vue
new file mode 100644
index 00000000000..dbab3d695f3
--- /dev/null
+++ b/packages/ui-vue/demos/drawer/host.vue
@@ -0,0 +1,21 @@
+<template>
+    <div class="custom-drawer" style="border:1px solid #000;width: 400px;height: 300px;background-color: rgba(0,0,0,.3);position:relative">
+        
+    </div>
+    <f-button @click="openDrawer">打开抽屉</f-button>
+        <f-drawer host=".custom-drawer" v-model="open" title="某个DOM内部打开抽屉">
+            <template #content> 右侧打开内容如下：我是一个抽屉组件 </template>
+            <template #footerTemplate>
+                <f-button>确定</f-button>
+            </template>
+        </f-drawer>
+</template>
+<script lang="ts" setup>
+import { ref } from 'vue'
+
+const open = ref(false)
+
+const openDrawer = () => {
+    open.value = true
+}
+</script>
diff --git a/packages/ui-vue/docs/components/drawer/index.md b/packages/ui-vue/docs/components/drawer/index.md
index 467e42b1570..2248612ffd0 100644
--- a/packages/ui-vue/docs/components/drawer/index.md
+++ b/packages/ui-vue/docs/components/drawer/index.md
@@ -21,7 +21,7 @@
 
 :::
 
-## 显示入口
+<!-- ## 显示入口
 
 :::vdemo
 
@@ -29,6 +29,16 @@
 {demos/drawer/showEntry.vue}
 ```
 
+::: -->
+
+## 渲染在DOM内
+
+:::vdemo
+
+```vue
+{demos/drawer/host.vue}
+```
+
 :::
 
 ## 属性
-- 
Gitee


From 17fde16dcdc982a24397e86c031995f6b018756d Mon Sep 17 00:00:00 2001
From: huyuyang <m15966339253@163.com>
Date: Fri, 23 May 2025 17:01:10 +0800
Subject: [PATCH 32/62] fix: drawer supports host

---
 packages/ui-vue/components/drawer/src/drawer.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/ui-vue/components/drawer/src/drawer.css b/packages/ui-vue/components/drawer/src/drawer.css
index 4d2ace4cd07..11acd12529f 100644
--- a/packages/ui-vue/components/drawer/src/drawer.css
+++ b/packages/ui-vue/components/drawer/src/drawer.css
@@ -122,7 +122,6 @@
 
 .f-drawer-right-enter-from,
 .f-drawer-right-leave-to {
-    width: 0;
     transform: translateX(100%);
 }
 
-- 
Gitee


From 84985748f3ac377fdbbf53ffdbdade71eec419ab Mon Sep 17 00:00:00 2001
From: huyuyang <m15966339253@163.com>
Date: Fri, 23 May 2025 17:11:42 +0800
Subject: [PATCH 33/62] fix: drawer supports host

---
 packages/ui-vue/demos/drawer/host.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/ui-vue/demos/drawer/host.vue b/packages/ui-vue/demos/drawer/host.vue
index dbab3d695f3..a06f422ddf5 100644
--- a/packages/ui-vue/demos/drawer/host.vue
+++ b/packages/ui-vue/demos/drawer/host.vue
@@ -1,5 +1,6 @@
 <template>
-    <div class="custom-drawer" style="border:1px solid #000;width: 400px;height: 300px;background-color: rgba(0,0,0,.3);position:relative">
+    <div class="custom-drawer" style="border:1px solid #000;width: 400px;height: 300px;
+    background-color: rgba(0,0,0,.3);position:relative;overflow: hidden;">
         
     </div>
     <f-button @click="openDrawer">打开抽屉</f-button>
-- 
Gitee


From fddf190805eef2ab12d7d6f9ab97e7de840a9a18 Mon Sep 17 00:00:00 2001
From: huyuyang <huyuyang@inspur.com>
Date: Sat, 24 May 2025 16:40:37 +0800
Subject: [PATCH 34/62] fix: drawer supports host

---
 packages/ui-vue/components/drawer/src/drawer.props.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/ui-vue/components/drawer/src/drawer.props.ts b/packages/ui-vue/components/drawer/src/drawer.props.ts
index 6b47ddb0be5..56a30365150 100644
--- a/packages/ui-vue/components/drawer/src/drawer.props.ts
+++ b/packages/ui-vue/components/drawer/src/drawer.props.ts
@@ -51,6 +51,9 @@ export const drawerProps = {
     title: { type: String, default: '' },
     /** 宽度 */
     width: { type: String as PropType<number | string>, default: 300 },
+    /**
+     * 渲染的DOM容器
+     */
     host: { type: Object as PropType<string | HTMLElement>, default: 'body' }
 } as Record<string, any>;
 
-- 
Gitee


From 6781f74e4e5d67ecb9b7fdca5518278d4ff53ee7 Mon Sep 17 00:00:00 2001
From: hyygzds <m15966339253@163.com>
Date: Sat, 5 Jul 2025 14:03:51 +0800
Subject: [PATCH 35/62] build: modify import path of some components

---
 .../checkbox-group/src/checkbox-group.component.tsx         | 5 ++---
 .../components/checkbox-group/src/checkbox-group.props.ts   | 4 ++--
 .../components/checkbox-group/src/composition/types.ts      | 2 +-
 .../checkbox-group/src/composition/use-checkbox-group.ts    | 2 +-
 .../src/designer/checkbox-group.design.component.tsx        | 6 ++----
 .../components/checkbox-group/src/designer/use-rules.ts     | 3 +--
 .../src/property-config/check-group.property-config.ts      | 2 +-
 .../components/checkbox-group/src/schema/schema-mapper.ts   | 2 +-
 .../components/checkbox-group/src/schema/schema-resolver.ts | 2 +-
 .../checkbox/src/designer/checkbox.design.component.tsx     | 3 +--
 .../ui-vue/components/checkbox/src/designer/use-rules.ts    | 3 +--
 .../src/property-config/checkbox.property-config.ts         | 2 +-
 .../ui-vue/components/checkbox/src/schema/schema-mapper.ts  | 2 +-
 .../components/checkbox/src/schema/schema-resolver.ts       | 2 +-
 .../components/combo-list/src/combo-list.component.tsx      | 2 +-
 .../ui-vue/components/combo-list/src/combo-list.props.ts    | 2 +-
 .../combo-list/src/components/list-container.component.tsx  | 4 ++--
 .../combo-list/src/designer/combo-list.design.component.tsx | 4 ++--
 .../ui-vue/components/combo-list/src/designer/use-rules.ts  | 3 +--
 .../src/property-config/combo-list.property-config.ts       | 3 +--
 .../components/combo-list/src/schema/schema-mapper.ts       | 2 +-
 .../components/combo-list/src/schema/schema-resolver.ts     | 2 +-
 22 files changed, 27 insertions(+), 35 deletions(-)

diff --git a/packages/ui-vue/components/checkbox-group/src/checkbox-group.component.tsx b/packages/ui-vue/components/checkbox-group/src/checkbox-group.component.tsx
index 639e8b8f668..6b4acd97269 100644
--- a/packages/ui-vue/components/checkbox-group/src/checkbox-group.component.tsx
+++ b/packages/ui-vue/components/checkbox-group/src/checkbox-group.component.tsx
@@ -13,11 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { defineComponent, computed, ref, watch, provide } from 'vue';
-import type { SetupContext } from 'vue';
+import { defineComponent, computed, ref, watch, provide, type SetupContext  } from 'vue';
+import { CHECKBOX_CONTEXT, useGuid } from '@farris/ui-vue/components/common';
 import { CheckboxGroupProps, checkboxGroupProps } from './checkbox-group.props';
 import { useCheckboxGroup } from './composition/use-checkbox-group';
-import { CHECKBOX_CONTEXT, useGuid } from '@farris/ui-vue/components/common';
 
 export default defineComponent({
     name: 'FCheckboxGroup',
diff --git a/packages/ui-vue/components/checkbox-group/src/checkbox-group.props.ts b/packages/ui-vue/components/checkbox-group/src/checkbox-group.props.ts
index ceac70d8543..a95ea978ba5 100644
--- a/packages/ui-vue/components/checkbox-group/src/checkbox-group.props.ts
+++ b/packages/ui-vue/components/checkbox-group/src/checkbox-group.props.ts
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ExtractPropTypes, PropType } from 'vue';
-import { Checkbox } from './composition/types';
+import { ExtractPropTypes } from 'vue';
 import { radioCheckboxCommonProps } from '@farris/ui-vue/components/common';
+import { Checkbox } from './composition/types';
 
 export const checkboxGroupProps = {
     ...radioCheckboxCommonProps,
diff --git a/packages/ui-vue/components/checkbox-group/src/composition/types.ts b/packages/ui-vue/components/checkbox-group/src/composition/types.ts
index 8e5b241ef78..b4fda30c4ec 100644
--- a/packages/ui-vue/components/checkbox-group/src/composition/types.ts
+++ b/packages/ui-vue/components/checkbox-group/src/composition/types.ts
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ComputedRef, Ref } from 'vue';
+import { Ref } from 'vue';
 
 export interface Checkbox {
     [key: string]: any;
diff --git a/packages/ui-vue/components/checkbox-group/src/composition/use-checkbox-group.ts b/packages/ui-vue/components/checkbox-group/src/composition/use-checkbox-group.ts
index 5e244085ee1..9392fa267ea 100644
--- a/packages/ui-vue/components/checkbox-group/src/composition/use-checkbox-group.ts
+++ b/packages/ui-vue/components/checkbox-group/src/composition/use-checkbox-group.ts
@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ChangeCheckbox, Checkbox } from './types';
 import { computed, Ref, SetupContext, ref, watch } from 'vue';
+import { ChangeCheckbox, Checkbox } from './types';
 import { CheckboxGroupProps } from '../checkbox-group.props';
 
 export function useCheckboxGroup(
diff --git a/packages/ui-vue/components/checkbox-group/src/designer/checkbox-group.design.component.tsx b/packages/ui-vue/components/checkbox-group/src/designer/checkbox-group.design.component.tsx
index bbec341e593..5d53ee08d37 100644
--- a/packages/ui-vue/components/checkbox-group/src/designer/checkbox-group.design.component.tsx
+++ b/packages/ui-vue/components/checkbox-group/src/designer/checkbox-group.design.component.tsx
@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { defineComponent, computed, ref, watch, inject, onMounted } from 'vue';
-import type { SetupContext } from 'vue';
+import { defineComponent, computed, ref, watch, inject, onMounted, type SetupContext } from 'vue';
+import { useDesignerComponent, DesignerItemContext } from '@farris/ui-vue/components/designer-canvas';
 import { CheckboxGroupProps, checkboxGroupProps } from '../checkbox-group.props';
 import { useCheckboxGroup } from '../composition/use-checkbox-group';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
 import { useCheckGroupDesignerRules } from './use-rules';
 
 export default defineComponent({
diff --git a/packages/ui-vue/components/checkbox-group/src/designer/use-rules.ts b/packages/ui-vue/components/checkbox-group/src/designer/use-rules.ts
index e3af56d9852..d583636e08a 100644
--- a/packages/ui-vue/components/checkbox-group/src/designer/use-rules.ts
+++ b/packages/ui-vue/components/checkbox-group/src/designer/use-rules.ts
@@ -1,6 +1,5 @@
  
-import { UseDesignerRules } from "../../../designer-canvas/src/composition/types";
-import { ComponentSchema, DesignerComponentInstance, DesignerItemContext } from "../../../designer-canvas/src/types";
+import { UseDesignerRules, ComponentSchema, DesignerComponentInstance, DesignerItemContext } from "@farris/ui-vue/components/designer-canvas";
 import { CheckGroupProperty } from "../property-config/check-group.property-config";
 
 
diff --git a/packages/ui-vue/components/checkbox-group/src/property-config/check-group.property-config.ts b/packages/ui-vue/components/checkbox-group/src/property-config/check-group.property-config.ts
index b98207025a8..abadb8ec8ca 100644
--- a/packages/ui-vue/components/checkbox-group/src/property-config/check-group.property-config.ts
+++ b/packages/ui-vue/components/checkbox-group/src/property-config/check-group.property-config.ts
@@ -1,4 +1,4 @@
-import { InputBaseProperty } from "../../../property-panel/src/composition/entity/input-base-property";
+import { InputBaseProperty } from "@farris/ui-vue/components/property-panel";
 
 export class CheckGroupProperty extends InputBaseProperty {
 
diff --git a/packages/ui-vue/components/checkbox-group/src/schema/schema-mapper.ts b/packages/ui-vue/components/checkbox-group/src/schema/schema-mapper.ts
index 97964aee23b..2ca33ca0806 100644
--- a/packages/ui-vue/components/checkbox-group/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/checkbox-group/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/checkbox-group/src/schema/schema-resolver.ts b/packages/ui-vue/components/checkbox-group/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/checkbox-group/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/checkbox-group/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
diff --git a/packages/ui-vue/components/checkbox/src/designer/checkbox.design.component.tsx b/packages/ui-vue/components/checkbox/src/designer/checkbox.design.component.tsx
index 666584d3879..997136dd87c 100644
--- a/packages/ui-vue/components/checkbox/src/designer/checkbox.design.component.tsx
+++ b/packages/ui-vue/components/checkbox/src/designer/checkbox.design.component.tsx
@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 import { defineComponent, inject, onMounted, ref, SetupContext, watch } from 'vue';
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
+import { DesignerItemContext, useDesignerComponent } from '@farris/ui-vue/components/designer-canvas';
 import { useCheckBoxDesignerRules } from './use-rules';
 import { checkboxProps, CheckboxProps } from '../checkbox.props';
 
diff --git a/packages/ui-vue/components/checkbox/src/designer/use-rules.ts b/packages/ui-vue/components/checkbox/src/designer/use-rules.ts
index db4c484b8b6..8119618dcbe 100644
--- a/packages/ui-vue/components/checkbox/src/designer/use-rules.ts
+++ b/packages/ui-vue/components/checkbox/src/designer/use-rules.ts
@@ -1,6 +1,5 @@
  
-import { UseDesignerRules } from "../../../designer-canvas/src/composition/types";
-import { ComponentSchema, DesignerComponentInstance, DesignerItemContext } from "../../../designer-canvas/src/types";
+import { ComponentSchema, DesignerComponentInstance, DesignerItemContext, UseDesignerRules } from "@farris/ui-vue/components/designer-canvas";
 import { CheckBoxProperty } from "../property-config/checkbox.property-config";
 
 export function useCheckBoxDesignerRules(designItemContext: DesignerItemContext, designerHostService): UseDesignerRules {
diff --git a/packages/ui-vue/components/checkbox/src/property-config/checkbox.property-config.ts b/packages/ui-vue/components/checkbox/src/property-config/checkbox.property-config.ts
index 1f5c247d112..abad398ae35 100644
--- a/packages/ui-vue/components/checkbox/src/property-config/checkbox.property-config.ts
+++ b/packages/ui-vue/components/checkbox/src/property-config/checkbox.property-config.ts
@@ -1,4 +1,4 @@
-import { InputBaseProperty } from "../../../property-panel/src/composition/entity/input-base-property";
+import { InputBaseProperty } from "@farris/ui-vue/components/property-panel";
 
 export class CheckBoxProperty extends InputBaseProperty {
 
diff --git a/packages/ui-vue/components/checkbox/src/schema/schema-mapper.ts b/packages/ui-vue/components/checkbox/src/schema/schema-mapper.ts
index 97964aee23b..2ca33ca0806 100644
--- a/packages/ui-vue/components/checkbox/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/checkbox/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/checkbox/src/schema/schema-resolver.ts b/packages/ui-vue/components/checkbox/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/checkbox/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/checkbox/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
diff --git a/packages/ui-vue/components/combo-list/src/combo-list.component.tsx b/packages/ui-vue/components/combo-list/src/combo-list.component.tsx
index 58d3b9f1ebc..aaa6d684f86 100644
--- a/packages/ui-vue/components/combo-list/src/combo-list.component.tsx
+++ b/packages/ui-vue/components/combo-list/src/combo-list.component.tsx
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 import { computed, defineComponent, nextTick, Ref, ref, SetupContext, watch } from 'vue';
+import FButtonEdit from '@farris/ui-vue/components/button-edit';
 import { comboListProps, ComboListProps, Option } from './combo-list.props';
 import ComboListContainer from './components/list-container.component';
-import FButtonEdit from '@farris/ui-vue/components/button-edit';
 import { useDataSource } from './composition/use-data-source';
 
 export default defineComponent({
diff --git a/packages/ui-vue/components/combo-list/src/combo-list.props.ts b/packages/ui-vue/components/combo-list/src/combo-list.props.ts
index 842b02602bd..3a60e886b03 100644
--- a/packages/ui-vue/components/combo-list/src/combo-list.props.ts
+++ b/packages/ui-vue/components/combo-list/src/combo-list.props.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 import { ExtractPropTypes, PropType } from 'vue';
-import { createPropsResolver } from '../../dynamic-resolver';
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
 import { schemaMapper } from './schema/schema-mapper';
 import comboListSchema from './schema/combo-list.schema.json';
 import { schemaResolver } from './schema/schema-resolver';
diff --git a/packages/ui-vue/components/combo-list/src/components/list-container.component.tsx b/packages/ui-vue/components/combo-list/src/components/list-container.component.tsx
index 21a83a0b4b8..561174c674c 100644
--- a/packages/ui-vue/components/combo-list/src/components/list-container.component.tsx
+++ b/packages/ui-vue/components/combo-list/src/components/list-container.component.tsx
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 import { computed, defineComponent, onMounted, ref, watch } from 'vue';
-import { ListContainerProps, listContainerProps } from './list-container.props';
-import FListView from '@farris/ui-vue/components/list-view';
 import { isUndefined } from 'lodash-es';
+import FListView from '@farris/ui-vue/components/list-view';
+import { ListContainerProps, listContainerProps } from './list-container.props';
 
 export default defineComponent({
     name: 'FComboListContainer',
diff --git a/packages/ui-vue/components/combo-list/src/designer/combo-list.design.component.tsx b/packages/ui-vue/components/combo-list/src/designer/combo-list.design.component.tsx
index 32ab321e413..e4f60e5e3a9 100644
--- a/packages/ui-vue/components/combo-list/src/designer/combo-list.design.component.tsx
+++ b/packages/ui-vue/components/combo-list/src/designer/combo-list.design.component.tsx
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 import { defineComponent, inject, onMounted, ref, SetupContext } from 'vue';
-import { comboListDesignProps, ComboListDesignProps } from '../combo-list.props';
 import FButtonEditDesign from '@farris/ui-vue/components/button-edit/designer';
-import { useComboListDesignerRules } from './use-rules';
 import { DesignerItemContext, useDesignerComponent } from '@farris/ui-vue/components/designer-canvas';
+import { comboListDesignProps, ComboListDesignProps } from '../combo-list.props';
+import { useComboListDesignerRules } from './use-rules';
 
 export default defineComponent({
     name: 'FComboListDesign',
diff --git a/packages/ui-vue/components/combo-list/src/designer/use-rules.ts b/packages/ui-vue/components/combo-list/src/designer/use-rules.ts
index bfdc09bb58a..ee7b99176f7 100644
--- a/packages/ui-vue/components/combo-list/src/designer/use-rules.ts
+++ b/packages/ui-vue/components/combo-list/src/designer/use-rules.ts
@@ -1,6 +1,5 @@
  
-import { UseDesignerRules } from "../../../designer-canvas/src/composition/types";
-import { ComponentSchema, DesignerComponentInstance, DesignerItemContext } from "../../../designer-canvas/src/types";
+import { UseDesignerRules, ComponentSchema, DesignerComponentInstance, DesignerItemContext } from "@farris/ui-vue/components/designer-canvas";
 import { ComboListProperty } from "../property-config/combo-list.property-config";
 
 export function useComboListDesignerRules(designItemContext: DesignerItemContext, designerHostService): UseDesignerRules {
diff --git a/packages/ui-vue/components/combo-list/src/property-config/combo-list.property-config.ts b/packages/ui-vue/components/combo-list/src/property-config/combo-list.property-config.ts
index 7c5bb94e3c9..c0d2870c5e6 100644
--- a/packages/ui-vue/components/combo-list/src/property-config/combo-list.property-config.ts
+++ b/packages/ui-vue/components/combo-list/src/property-config/combo-list.property-config.ts
@@ -1,6 +1,5 @@
 import { FormSchemaEntityFieldType$Type } from "@farris/ui-vue/components/common";
-import { FormPropertyChangeObject } from "../../../property-panel";
-import { InputBaseProperty } from "../../../property-panel/src/composition/entity/input-base-property";
+import { FormPropertyChangeObject, InputBaseProperty } from "@farris/ui-vue/components/property-panel";
 import { comboListRemoteConverter } from "./converters/combo-list-property.converter";
 export class ComboListProperty extends InputBaseProperty {
     constructor(componentId: string, designerHostService: any) {
diff --git a/packages/ui-vue/components/combo-list/src/schema/schema-mapper.ts b/packages/ui-vue/components/combo-list/src/schema/schema-mapper.ts
index 97964aee23b..2ca33ca0806 100644
--- a/packages/ui-vue/components/combo-list/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/combo-list/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/combo-list/src/schema/schema-resolver.ts b/packages/ui-vue/components/combo-list/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/combo-list/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/combo-list/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
-- 
Gitee


From 8263be76c03de1a00e24bb45e14d62cf5727cc99 Mon Sep 17 00:00:00 2001
From: hyygzds <m15966339253@163.com>
Date: Sun, 6 Jul 2025 11:20:11 +0800
Subject: [PATCH 36/62] build: modify import path of some components

---
 .../components/code-editor/src/code-textbox.props.ts   |  2 +-
 .../components/code-editor/src/schema/schema-mapper.ts |  2 +-
 .../code-editor/src/schema/schema-resolver.ts          |  2 +-
 packages/ui-vue/components/combo-tree/index.ts         |  2 +-
 .../components/combo-tree/src/combo-tree.component.tsx |  2 +-
 .../components/combo-tree/src/combo-tree.props.ts      |  2 +-
 .../components/combo-tree/src/schema/schema-mapper.ts  |  2 +-
 .../combo-tree/src/schema/schema-resolver.ts           |  2 +-
 packages/ui-vue/components/component/index.ts          |  3 ++-
 .../src/designer/dropdown.design.component.tsx         |  3 +--
 .../ui-vue/components/dropdown/src/dropdown.props.ts   |  2 +-
 .../components/dropdown/src/schema/schema-mapper.ts    |  2 +-
 .../components/dropdown/src/schema/schema-resolver.ts  |  2 +-
 .../dynamic-form-group.design.component.tsx            |  3 +--
 .../dynamic-form-group/dynamic-form-group.props.ts     |  3 +--
 .../dynamic-form-input/dynamic-form-input.props.ts     |  2 +-
 .../src/composition/form-binding-resolver-design.ts    |  7 +++----
 .../response-form-component-creator.service.ts         | 10 ++++------
 18 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/packages/ui-vue/components/code-editor/src/code-textbox.props.ts b/packages/ui-vue/components/code-editor/src/code-textbox.props.ts
index 50e71c881fc..8f2abe82ff6 100644
--- a/packages/ui-vue/components/code-editor/src/code-textbox.props.ts
+++ b/packages/ui-vue/components/code-editor/src/code-textbox.props.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { ExtractPropTypes, PropType } from 'vue';
-import { createPropsResolver } from "../../dynamic-resolver";
+import { createPropsResolver } from "@farris/ui-vue/components/dynamic-resolver";
 import codeEditorSchema from './schema/code-editor.schema.json';
 import { schemaMapper } from './schema/schema-mapper';
 import { schemaResolver } from './schema/schema-resolver';
diff --git a/packages/ui-vue/components/code-editor/src/schema/schema-mapper.ts b/packages/ui-vue/components/code-editor/src/schema/schema-mapper.ts
index ec92a2a712f..8e0bbfafa57 100644
--- a/packages/ui-vue/components/code-editor/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/code-editor/src/schema/schema-mapper.ts
@@ -1,3 +1,3 @@
-import { MapperFunction } from '../../../dynamic-resolver';
+import { MapperFunction } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([]);
diff --git a/packages/ui-vue/components/code-editor/src/schema/schema-resolver.ts b/packages/ui-vue/components/code-editor/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/code-editor/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/code-editor/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
diff --git a/packages/ui-vue/components/combo-tree/index.ts b/packages/ui-vue/components/combo-tree/index.ts
index 397c7d5773a..97afc1ea3d4 100644
--- a/packages/ui-vue/components/combo-tree/index.ts
+++ b/packages/ui-vue/components/combo-tree/index.ts
@@ -14,8 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import FComboTree from './src/combo-tree.component';
 import { withInstall } from '@farris/ui-vue/components/common';
+import FComboTree from './src/combo-tree.component';
 import { propsResolver } from './src/combo-tree.props';
 
 export * from './src/combo-tree.props';
diff --git a/packages/ui-vue/components/combo-tree/src/combo-tree.component.tsx b/packages/ui-vue/components/combo-tree/src/combo-tree.component.tsx
index 4881cf5a634..9a30d9864c3 100644
--- a/packages/ui-vue/components/combo-tree/src/combo-tree.component.tsx
+++ b/packages/ui-vue/components/combo-tree/src/combo-tree.component.tsx
@@ -1,9 +1,9 @@
 import { Ref, SetupContext, computed, defineComponent, ref, watch, watchEffect } from "vue";
+import { cloneDeep } from "lodash-es";
 import FButtonEdit from '@farris/ui-vue/components/button-edit';
 import { ComboTreeProps, comboTreeProps, Option } from "./combo-tree.props";
 import ComboTreeContainer from './components/tree-container.component';
 import { useDataSource } from "./composition/use-data-source";
-import { cloneDeep } from "lodash-es";
 
 export default defineComponent({
     name: 'FComboTree',
diff --git a/packages/ui-vue/components/combo-tree/src/combo-tree.props.ts b/packages/ui-vue/components/combo-tree/src/combo-tree.props.ts
index 97937e4e799..e1c2e3b8abf 100644
--- a/packages/ui-vue/components/combo-tree/src/combo-tree.props.ts
+++ b/packages/ui-vue/components/combo-tree/src/combo-tree.props.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 import { ExtractPropTypes, PropType } from 'vue';
-import { createPropsResolver } from '../../dynamic-resolver';
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
 import { schemaMapper } from './schema/schema-mapper';
 import comboTreeSchema from './schema/combo-tree.schema.json';
 import { schemaResolver } from './schema/schema-resolver';
diff --git a/packages/ui-vue/components/combo-tree/src/schema/schema-mapper.ts b/packages/ui-vue/components/combo-tree/src/schema/schema-mapper.ts
index 97964aee23b..2ca33ca0806 100644
--- a/packages/ui-vue/components/combo-tree/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/combo-tree/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/combo-tree/src/schema/schema-resolver.ts b/packages/ui-vue/components/combo-tree/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/combo-tree/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/combo-tree/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
diff --git a/packages/ui-vue/components/component/index.ts b/packages/ui-vue/components/component/index.ts
index 2eecb92deb7..b36866466dc 100644
--- a/packages/ui-vue/components/component/index.ts
+++ b/packages/ui-vue/components/component/index.ts
@@ -19,8 +19,9 @@ import Component from './src/component.component';
 import ComponentDesign from './src/designer/component.design.component';
 import { propsResolver } from './src/component.props';
 import { componentPropsResolver } from './src/component-ref.props';
+import { ComponentBuildInfo } from './src/composition/inner-component-build-info';
 export * from './src/component.props';
-export { Component, ComponentDesign };
+export { Component, ComponentDesign, type ComponentBuildInfo };
 
 export default {
     install(app: App): void {
diff --git a/packages/ui-vue/components/dropdown/src/designer/dropdown.design.component.tsx b/packages/ui-vue/components/dropdown/src/designer/dropdown.design.component.tsx
index b71bef6980d..a31d4055b10 100644
--- a/packages/ui-vue/components/dropdown/src/designer/dropdown.design.component.tsx
+++ b/packages/ui-vue/components/dropdown/src/designer/dropdown.design.component.tsx
@@ -19,8 +19,7 @@ import { defineComponent, SetupContext, ref, inject, onMounted } from 'vue';
 import { dropdownProps, DropdownProps } from '../dropdown.props';
 import { useDropdown } from '../composition/use-dropdown';
 import FDropdownItem from '../dropdown.item.component';
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
+import { DesignerItemContext, useDesignerComponent } from '@farris/ui-vue/components/designer-canvas';
 
 export default defineComponent({
     name: 'FDropdownDesign',
diff --git a/packages/ui-vue/components/dropdown/src/dropdown.props.ts b/packages/ui-vue/components/dropdown/src/dropdown.props.ts
index 67c6f8c3ab4..322576964a4 100644
--- a/packages/ui-vue/components/dropdown/src/dropdown.props.ts
+++ b/packages/ui-vue/components/dropdown/src/dropdown.props.ts
@@ -16,7 +16,7 @@
  */
 import { ExtractPropTypes, PropType } from 'vue';
 import { DropdownItem } from './types/types';
-import { createPropsResolver } from '../../dynamic-resolver';
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
 import { schemaResolver } from './schema/schema-resolver';
 import { schemaMapper } from './schema/schema-mapper';
 import dropdownSchema from './schema/dropdown.schema.json';
diff --git a/packages/ui-vue/components/dropdown/src/schema/schema-mapper.ts b/packages/ui-vue/components/dropdown/src/schema/schema-mapper.ts
index 97964aee23b..2ca33ca0806 100644
--- a/packages/ui-vue/components/dropdown/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/dropdown/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/dropdown/src/schema/schema-resolver.ts b/packages/ui-vue/components/dropdown/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/dropdown/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/dropdown/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
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 80cdec0c46b..65135641cd2 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,9 +1,8 @@
 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 { useTypeResolverDesign } from '../../composition/use-type-resolver-design';
-import { DesignerHostService } from '../../../../../components/designer-canvas/src/composition/types';
-import { DesignerItemContext } from '../../../../designer-canvas/src/types';
 import { useFormBindingResolverDesign } from '../../composition/form-binding-resolver-design';
 
 export default defineComponent({
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 66860ea7b2c..d793be5543d 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,9 +1,8 @@
 import { ExtractPropTypes, PropType } from 'vue';
+import { createPropsResolver, createFormGroupEditorResolver } from '@farris/ui-vue/components/dynamic-resolver';
 import { EditorType, EditorConfig } from '../../types';
-import { createPropsResolver } from '../../../../dynamic-resolver';
 import { schemaMapper } from '../../schema/schema-mapper';
 import formGroupSchema from '../../schema/form-group.schema.json';
-import { createFormGroupEditorResolver } from '../../../../dynamic-resolver/src/editor-resolver';
 import { FormValidationInfo } from '../validation-message/validation-message.props';
 
 export const dynamicFormGroupProps = {
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 60b6b887270..ca1e683748b 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,6 +1,6 @@
 import { ExtractPropTypes, PropType } from 'vue';
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
 import { EditorConfig } from '../../types';
-import { createPropsResolver } from '../../../../dynamic-resolver';
 import { schemaMapper } from '../../schema/schema-mapper';
 import formGroupSchema from '../../schema/form-group.schema.json';
 
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 51ddabb2f8e..0a9ca047534 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,6 @@
-import { FormBindingType } from "../../../../components/property-panel";
-import { DesignerHostService } from "../../../../components/designer-canvas/src/composition/types";
-import { DesignerItemContext } from "../../../../components/designer-canvas";
-import { FormSchemaEntityField$Type } from "../../../../components/common/entity/entity-schema";
+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";
 
 export function useFormBindingResolverDesign(designerHostService: DesignerHostService, designItemContext: DesignerItemContext, props: DynamicFormGroupPropsType) {
diff --git a/packages/ui-vue/components/dynamic-form/src/composition/response-form-component-creator.service.ts b/packages/ui-vue/components/dynamic-form/src/composition/response-form-component-creator.service.ts
index 1a4dcd986fa..e59782da37c 100644
--- a/packages/ui-vue/components/dynamic-form/src/composition/response-form-component-creator.service.ts
+++ b/packages/ui-vue/components/dynamic-form/src/composition/response-form-component-creator.service.ts
@@ -1,10 +1,8 @@
-import { inject } from 'vue';
-import { DesignerHostService } from '../../../designer-canvas/src/composition/types';
-import { DynamicResolver } from '../../../../components/dynamic-resolver';
-import { ComponentBuildInfo } from '../../../component/src/composition/inner-component-build-info';
-import { ComponentSchema } from '../../../../components/designer-canvas';
-import { FormSchemaEntityFieldTypeName } from '@farris/ui-vue/components/common';
 import { cloneDeep } from 'lodash-es';
+import { FormSchemaEntityFieldTypeName } from '@farris/ui-vue/components/common';
+import { DesignerHostService, ComponentSchema } from '@farris/ui-vue/components/designer-canvas';
+import { DynamicResolver } from '@farris/ui-vue/components/dynamic-resolver';
+import { ComponentBuildInfo } from '@farris/ui-vue/components/component';
 
 const ROOT_VIEW_MODEL_ID = 'root-viewmodel';
 /**
-- 
Gitee


From f925bb763f6906dfde60c89fab2d4e4548171c95 Mon Sep 17 00:00:00 2001
From: hyygzds <m15966339253@163.com>
Date: Mon, 7 Jul 2025 08:46:00 +0800
Subject: [PATCH 37/62] build: modify import path of some components

---
 .../components/data/data-area.component.tsx   |  2 +-
 .../item/content-item.component.tsx           |  4 ++--
 .../item/draggable-item.component.tsx         |  3 +--
 .../components/item/group-item.component.tsx  |  2 +-
 .../components/item/single-item.component.tsx |  4 ++--
 .../src/composition/use-draggable.ts          |  2 +-
 .../list-view/src/composition/use-item.ts     |  2 +-
 .../list-view-table.design.component.tsx      |  3 +--
 .../designer/list-view.design.component.tsx   | 22 ++++++++++---------
 .../src/list-view-table.component.tsx         |  2 +-
 .../list-view/src/list-view-table.props.ts    |  4 ++--
 .../list-view/src/list-view.component.tsx     |  4 ++--
 .../list-view/src/list-view.props.ts          |  4 ++--
 .../list-view/src/schema/schema-mapper.ts     |  2 +-
 .../list-view/src/schema/schema-resolver.ts   |  2 +-
 .../src/composition/use-number.ts             |  2 +-
 16 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/packages/ui-vue/components/list-view/src/components/data/data-area.component.tsx b/packages/ui-vue/components/list-view/src/components/data/data-area.component.tsx
index ca98c793739..c16a5c60c12 100644
--- a/packages/ui-vue/components/list-view/src/components/data/data-area.component.tsx
+++ b/packages/ui-vue/components/list-view/src/components/data/data-area.component.tsx
@@ -1,7 +1,7 @@
  
 import { computed, Ref, ref, SetupContext } from 'vue';
+import { UseDataView, UseGroupData, UseSelection, UseVisualData, VisualData } from '@farris/ui-vue/components/data-view';
 import { ListViewProps } from '../../list-view.props';
-import { UseDataView, UseGroupData, UseSelection, UseVisualData, VisualData } from '../../../../data-view';
 import getSingleItem from '../item/single-item.component';
 import getContentItem from '../item/content-item.component';
 import getDraggableItem from '../item/draggable-item.component';
diff --git a/packages/ui-vue/components/list-view/src/components/item/content-item.component.tsx b/packages/ui-vue/components/list-view/src/components/item/content-item.component.tsx
index 237e0e90390..92df9f77f99 100644
--- a/packages/ui-vue/components/list-view/src/components/item/content-item.component.tsx
+++ b/packages/ui-vue/components/list-view/src/components/item/content-item.component.tsx
@@ -1,8 +1,8 @@
 import { Ref, SetupContext, ref } from "vue";
-import { UseDraggable, UseHover, UseItem, UseRemove } from "../../composition/types";
-import { ListViewProps } from "../../list-view.props";
 import { UseGroupData, UseSelection, UseVisualData, VisualData } from '@farris/ui-vue/components/data-view';
 import { FCheckbox } from '@farris/ui-vue/components/checkbox';
+import { UseDraggable, UseHover, UseItem, UseRemove } from "../../composition/types";
+import { ListViewProps } from "../../list-view.props";
 
 export default function (
     props: ListViewProps,
diff --git a/packages/ui-vue/components/list-view/src/components/item/draggable-item.component.tsx b/packages/ui-vue/components/list-view/src/components/item/draggable-item.component.tsx
index 047d8dd5fa7..6f6a767b89b 100644
--- a/packages/ui-vue/components/list-view/src/components/item/draggable-item.component.tsx
+++ b/packages/ui-vue/components/list-view/src/components/item/draggable-item.component.tsx
@@ -1,9 +1,8 @@
 import { Ref, SetupContext, computed, ref } from "vue";
-import { debounce, throttle } from 'lodash-es';
 import { UseGroupData, UseSelection, UseVisualData, VisualData } from '@farris/ui-vue/components/data-view';
+import { FCheckbox } from '@farris/ui-vue/components/checkbox';
 import { UseDraggable, UseHover, UseItem, UseRemove } from "../../composition/types";
 import { ListViewProps } from "../../list-view.props";
-import { FCheckbox } from '@farris/ui-vue/components/checkbox';
 // import './draggable-item.css';
 export default function (
     props: ListViewProps,
diff --git a/packages/ui-vue/components/list-view/src/components/item/group-item.component.tsx b/packages/ui-vue/components/list-view/src/components/item/group-item.component.tsx
index 01ed882df30..98c4e503b37 100644
--- a/packages/ui-vue/components/list-view/src/components/item/group-item.component.tsx
+++ b/packages/ui-vue/components/list-view/src/components/item/group-item.component.tsx
@@ -1,6 +1,6 @@
 import { Ref, SetupContext, computed, ref } from "vue";
-import { UseDraggable, UseHover, UseItem, UseRemove } from "../../composition/types";
 import { UseGroupData, UseSelection, UseVisualData, VisualData } from '@farris/ui-vue/components/data-view';
+import { UseDraggable, UseHover, UseItem, UseRemove } from "../../composition/types";
 import { ListViewProps } from "../../list-view.props";
 
 import './group-item.css';
diff --git a/packages/ui-vue/components/list-view/src/components/item/single-item.component.tsx b/packages/ui-vue/components/list-view/src/components/item/single-item.component.tsx
index 3918fa414c9..2d6d61ecb0d 100644
--- a/packages/ui-vue/components/list-view/src/components/item/single-item.component.tsx
+++ b/packages/ui-vue/components/list-view/src/components/item/single-item.component.tsx
@@ -1,9 +1,9 @@
  
 import { Ref, SetupContext, computed, ref } from "vue";
-import { UseDraggable, UseHover, UseItem, UseRemove } from "../../composition/types";
 import { UseGroupData, UseSelection, UseVisualData, VisualData } from '@farris/ui-vue/components/data-view';
-import { ListViewProps } from "../../list-view.props";
 import { FCheckbox } from '@farris/ui-vue/components/checkbox';
+import { UseDraggable, UseHover, UseItem, UseRemove } from "../../composition/types";
+import { ListViewProps } from "../../list-view.props";
 
 export default function (
     props: ListViewProps,
diff --git a/packages/ui-vue/components/list-view/src/composition/use-draggable.ts b/packages/ui-vue/components/list-view/src/composition/use-draggable.ts
index 25aa7d44f56..11a5a0d2886 100644
--- a/packages/ui-vue/components/list-view/src/composition/use-draggable.ts
+++ b/packages/ui-vue/components/list-view/src/composition/use-draggable.ts
@@ -1,7 +1,7 @@
 import { Ref, SetupContext, ref } from "vue";
 import { ListViewProps } from "../list-view.props";
 import { UseDraggable, UseHover } from "./types";
-import { UseDataView, VisualData } from '../../../data-view';
+import { UseDataView, VisualData } from '@farris/ui-vue/components/data-view';
 
 export function useDraggable(
     props: ListViewProps,
diff --git a/packages/ui-vue/components/list-view/src/composition/use-item.ts b/packages/ui-vue/components/list-view/src/composition/use-item.ts
index f31e507091c..21f912e0a41 100644
--- a/packages/ui-vue/components/list-view/src/composition/use-item.ts
+++ b/packages/ui-vue/components/list-view/src/composition/use-item.ts
@@ -1,7 +1,7 @@
 import { Ref, SetupContext, computed, ref } from "vue";
+import { UseRow, UseSelection, VisualData } from '@farris/ui-vue/components/data-view';
 import { ListViewProps, MultiSelectMode } from "../list-view.props";
 import { UseDraggable, UseHover, UseItem } from "./types";
-import { UseRow, UseSelection, VisualData } from '@farris/ui-vue/components/data-view';
 
 export function useItem(
     props: ListViewProps,
diff --git a/packages/ui-vue/components/list-view/src/designer/list-view-table.design.component.tsx b/packages/ui-vue/components/list-view/src/designer/list-view-table.design.component.tsx
index 11164485378..c3466efd3ce 100644
--- a/packages/ui-vue/components/list-view/src/designer/list-view-table.design.component.tsx
+++ b/packages/ui-vue/components/list-view/src/designer/list-view-table.design.component.tsx
@@ -17,9 +17,8 @@
  
  
 import { SetupContext, computed, defineComponent, inject, onMounted, ref, watch } from 'vue';
+import { DesignerItemContext, useDesignerComponent } from '@farris/ui-vue/components/designer-canvas';
 import { ListViewTableProps, listViewTableProps } from '../list-view-table.props';
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
 
 export default defineComponent({
     name: 'FListViewTableDesign',
diff --git a/packages/ui-vue/components/list-view/src/designer/list-view.design.component.tsx b/packages/ui-vue/components/list-view/src/designer/list-view.design.component.tsx
index 6d31fbd58b0..6f5d9eef26d 100644
--- a/packages/ui-vue/components/list-view/src/designer/list-view.design.component.tsx
+++ b/packages/ui-vue/components/list-view/src/designer/list-view.design.component.tsx
@@ -14,12 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { computed, defineComponent, inject, onMounted, ref, SetupContext, TransitionGroup, withModifiers } from 'vue';
-import { ListViewProps, listViewProps } from '../list-view.props';
+import { computed, defineComponent, inject, onMounted, ref, SetupContext } from 'vue';
+import { DesignerItemContext, useDesignerComponent } from '@farris/ui-vue/components/designer-canvas';
+import {
+    DataViewOptions, UseCellEditor, VisualData, useDataView, useEdit, useFilter, useGroupData, useHierarchy, useIdentify,
+    useRow, useSelection, useVisualData, useVisualDataBound, useVisualDataCell, useVisualDataRow, useVisualGroupRow, useVisualSummaryRow
+} from '@farris/ui-vue/components/data-view';
 import { useSearch } from '../composition/use-search';
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
-import { DataViewOptions, UseCellEditor, VisualData, useDataView, useEdit, useFilter, useGroupData, useHierarchy, useIdentify, usePagination, useRow, useSelection, useVisualData, useVisualDataBound, useVisualDataCell, useVisualDataRow, useVisualGroupRow, useVisualSummaryRow } from '../../../data-view';
+import { ListViewProps, listViewProps } from '../list-view.props';
 import getListArea from '../components/data/data-area.component';
 import getContentHeader from '../components/header/content-header.component';
 import getSearchHeader from '../components/header/search-header.component';
@@ -56,7 +58,7 @@ export default defineComponent({
             return dataView.dataView.value.length;
         });
         const useRowComposition = useRow(props as DataViewOptions, context as SetupContext, useSelectionComposition, useIdentifyComposition);
-        const useEditComposition = useEdit(props as DataViewOptions, context as SetupContext, useIdentifyComposition, useRowComposition,visibleDatas);
+        const useEditComposition = useEdit(props as DataViewOptions, context as SetupContext, useIdentifyComposition, useRowComposition, visibleDatas);
 
         const useVisualDataBoundComposition = useVisualDataBound(props as DataViewOptions);
 
@@ -129,12 +131,12 @@ export default defineComponent({
         const useHoverComposition = useHover();
         const useDraggableComposition = useDraggable(props, context, dataView,
             useHoverComposition);
-        const useItemCompostion = useItem(props, context, visibleDatas, 
+        const useItemCompostion = useItem(props, context, visibleDatas,
             useDraggableComposition, useHoverComposition, useSelectionComposition);
         /** 渲染树状区域 */
-        const { renderListArea } = getListArea(props, context, 
-            visibleDatas, dataView, useGroupDataComposition, 
-            useHoverComposition, useSelectionComposition, 
+        const { renderListArea } = getListArea(props, context,
+            visibleDatas, dataView, useGroupDataComposition,
+            useHoverComposition, useSelectionComposition,
             useVisualDataComposition, useItemCompostion, useDraggableComposition);
 
         function onClick(payload: MouseEvent) {
diff --git a/packages/ui-vue/components/list-view/src/list-view-table.component.tsx b/packages/ui-vue/components/list-view/src/list-view-table.component.tsx
index 19f27b32aec..29e5b031c6c 100644
--- a/packages/ui-vue/components/list-view/src/list-view-table.component.tsx
+++ b/packages/ui-vue/components/list-view/src/list-view-table.component.tsx
@@ -17,7 +17,7 @@
  */
  
  
-import { SetupContext, computed, defineComponent, ref, watch } from 'vue';
+import { SetupContext, computed, defineComponent } from 'vue';
 import { ListViewProps, listViewProps } from './list-view.props';
 
 export default defineComponent({
diff --git a/packages/ui-vue/components/list-view/src/list-view-table.props.ts b/packages/ui-vue/components/list-view/src/list-view-table.props.ts
index e4b2fb45654..5a320e081ab 100644
--- a/packages/ui-vue/components/list-view/src/list-view-table.props.ts
+++ b/packages/ui-vue/components/list-view/src/list-view-table.props.ts
@@ -14,8 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ExtractPropTypes, PropType } from 'vue';
-import { createPropsResolver } from '../../dynamic-resolver/src/props-resolver';
+import { ExtractPropTypes } from 'vue';
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
 import { schemaMapper } from './schema/schema-mapper';
 import { schemaResolver } from './schema/schema-resolver';
 import listViewTableSchema from './schema/list-view-table.schema.json';
diff --git a/packages/ui-vue/components/list-view/src/list-view.component.tsx b/packages/ui-vue/components/list-view/src/list-view.component.tsx
index 509fc943fa0..406853a9aaf 100644
--- a/packages/ui-vue/components/list-view/src/list-view.component.tsx
+++ b/packages/ui-vue/components/list-view/src/list-view.component.tsx
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 import { computed, defineComponent, ref, SetupContext, watch } from 'vue';
-import { ListViewProps, listViewProps } from './list-view.props';
-import { useSearch } from './composition/use-search';
 import { getCustomClass } from '@farris/ui-vue/components/common';
 import {
     DataViewOptions, UseCellEditor, VisualData, useDataView, useEdit, useFilter,
     useGroupData, useHierarchy, useIdentify, useRow, useSelection, useVisualData,
     useVisualDataBound, useVisualDataCell, useVisualDataRow, useVisualGroupRow, useVisualSummaryRow
 } from '@farris/ui-vue/components/data-view';
+import { ListViewProps, listViewProps } from './list-view.props';
+import { useSearch } from './composition/use-search';
 import getListArea from './components/data/data-area.component';
 import getContentHeader from './components/header/content-header.component';
 import getSearchHeader from './components/header/search-header.component';
diff --git a/packages/ui-vue/components/list-view/src/list-view.props.ts b/packages/ui-vue/components/list-view/src/list-view.props.ts
index c4ad1470ac9..6e4baa49b7d 100644
--- a/packages/ui-vue/components/list-view/src/list-view.props.ts
+++ b/packages/ui-vue/components/list-view/src/list-view.props.ts
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 import { ExtractPropTypes, PropType } from 'vue';
-import { createPropsResolver } from '../../dynamic-resolver/src/props-resolver';
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
 import { schemaMapper } from './schema/schema-mapper';
 import { schemaResolver } from './schema/schema-resolver';
 import listViewSchema from './schema/list-view.schema.json';
 import propertyConfig from './property-config/list-view.property-config.json';
-import { DataColumn, SelectionOptions } from '../../data-view';
+import { DataColumn, SelectionOptions } from '@farris/ui-vue/components/data-view';
 
 export type MultiSelectMode = 'OnCheck' | 'OnClick' | 'OnCheckAndClick' | 'OnCheckClearByClick';
 
diff --git a/packages/ui-vue/components/list-view/src/schema/schema-mapper.ts b/packages/ui-vue/components/list-view/src/schema/schema-mapper.ts
index 97964aee23b..2ca33ca0806 100644
--- a/packages/ui-vue/components/list-view/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/list-view/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/list-view/src/schema/schema-resolver.ts b/packages/ui-vue/components/list-view/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/list-view/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/list-view/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
diff --git a/packages/ui-vue/components/number-spinner/src/composition/use-number.ts b/packages/ui-vue/components/number-spinner/src/composition/use-number.ts
index 8e580609280..249ea0c31e1 100644
--- a/packages/ui-vue/components/number-spinner/src/composition/use-number.ts
+++ b/packages/ui-vue/components/number-spinner/src/composition/use-number.ts
@@ -1,6 +1,6 @@
 import { SetupContext, computed, ref } from "vue";
-import { NumberSpinnerProps } from "../number-spinner.props";
 import BigNumber from "bignumber.js";
+import { NumberSpinnerProps } from "../number-spinner.props";
 import { UseNumber } from "./types";
 
 export function useNumber(props: NumberSpinnerProps, context: SetupContext): UseNumber {
-- 
Gitee


From 21c2abe7fc0a78bbdc14bf573d1c5627fd48da4d Mon Sep 17 00:00:00 2001
From: hyygzds <m15966339253@163.com>
Date: Tue, 8 Jul 2025 16:31:13 +0800
Subject: [PATCH 38/62] build: split the tree table design componnents

---
 .../ui-vue/components/data-grid/designer.ts   |  3 +-
 packages/ui-vue/components/data-grid/index.ts |  1 -
 .../data-grid/src/data-grid.component.tsx     |  4 +--
 .../text-filter-editor.component.tsx          |  2 +-
 .../column-format/boolean.component.tsx       |  1 -
 .../column-header/column-header.component.tsx |  6 ++--
 .../column-setting-icon.component.tsx         |  2 +-
 .../column-setting.component.tsx              |  8 ++---
 .../components/editors/commands.component.tsx |  2 +-
 .../filter-panel/filter-panel.component.tsx   |  2 +-
 .../data-grid-pagination.component.tsx        |  2 +-
 .../row/hierarchy-row.component.tsx           |  6 ++--
 .../appearance/use-hierarchy-style.ts         |  2 +-
 .../composition/data/use-data-view.ts         |  5 ++-
 .../data-view/composition/data/use-loading.ts |  6 ++--
 .../composition/filter/use-filter.ts          |  4 +--
 .../hierarchy/use-select-hierarchy-item.ts    |  2 +-
 .../composition/pagination/use-pagination.ts  |  5 ++-
 .../components/data-view/composition/types.ts | 11 +++---
 .../visualization/use-visual-data-cell.ts     |  1 -
 .../ui-vue/components/data-view/designer.ts   |  3 ++
 .../components/data-view/designer/index.ts    |  3 --
 .../designer-canvas/src/components/maps.ts    |  2 +-
 .../dynamic-view/src/components/maps.ts       |  2 +-
 .../ui-vue/components/tree-grid/designer.ts   | 36 +++++++++++++++++++
 packages/ui-vue/components/tree-grid/index.ts | 15 +-------
 .../components/data/data-area.component.tsx   |  4 ++-
 .../designer/tree-grid.design.component.tsx   | 11 +++---
 .../src/designer/use-designer-rules.ts        |  3 +-
 .../tree-grid.property-config.ts              |  3 +-
 .../tree-grid/src/schema/schema-mapper.ts     |  2 +-
 .../tree-grid/src/schema/schema-resolver.ts   |  4 +--
 .../tree-grid/src/tree-grid.component.tsx     |  2 +-
 .../tree-grid/src/tree-grid.props.ts          |  6 ++--
 34 files changed, 95 insertions(+), 76 deletions(-)
 create mode 100644 packages/ui-vue/components/data-view/designer.ts
 delete mode 100644 packages/ui-vue/components/data-view/designer/index.ts
 create mode 100644 packages/ui-vue/components/tree-grid/designer.ts

diff --git a/packages/ui-vue/components/data-grid/designer.ts b/packages/ui-vue/components/data-grid/designer.ts
index c7d345d0da6..47d66585338 100644
--- a/packages/ui-vue/components/data-grid/designer.ts
+++ b/packages/ui-vue/components/data-grid/designer.ts
@@ -31,6 +31,7 @@ import { schemaMapper } from './src/schema/schema-mapper';
 import { schemaResolver } from "./src/schema/schema-resolver";
 import dataGridSchema from './src/schema/data-grid.schema.json';
 import { createDataGridCallbackResolver } from './src/schema/callback-resolvers';
+import getColumnHeader from './src/designer/column-header.design.component';
 
 
 export const propsResolver = createPropsResolver<DataGridProps>(dataGridProps, dataGridSchema, schemaMapper, schemaResolver);
@@ -65,5 +66,5 @@ FDataGridDesign.registerDesigner = (componentMap: Record<string, any>, propsReso
 
 };
 
-export { FDataGridDesign };
+export { FDataGridDesign, getColumnHeader };
 export default withInstall(FDataGridDesign);
diff --git a/packages/ui-vue/components/data-grid/index.ts b/packages/ui-vue/components/data-grid/index.ts
index c2d880ad2a4..f5caf13b728 100644
--- a/packages/ui-vue/components/data-grid/index.ts
+++ b/packages/ui-vue/components/data-grid/index.ts
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { App } from 'vue';
 import { withInstall  } from '@farris/ui-vue/components/common';
 import FDataGrid from './src/data-grid.component';
 
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 b5c3eea21af..c984f63818c 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
@@ -49,9 +49,9 @@ export default defineComponent({
         const useGroupDataComposition = useGroupData(props as DataViewOptions, useIdentifyComposition);
         const useFilterComposition = useFilter();
         const useHierarchyComposition = useHierarchy(props as DataViewOptions);
-        const { showLoading, renderLoading } = useLoading(props, dataGridRef);
+        const { showLoading, renderLoading } = useLoading(props as DataViewOptions, dataGridRef);
         const dataView = useDataView(props as DataViewOptions, new Map(), useFilterComposition, useHierarchyComposition, useIdentifyComposition);
-        const usePaginationComposition = usePagination(props, dataView);
+        const usePaginationComposition = usePagination(props as DataViewOptions, dataView);
         const { shouldRenderPagination } = usePaginationComposition;
         const useSelectionComposition = useSelection(props as DataViewOptions, dataView, useIdentifyComposition, visibleDatas, context as SetupContext);
         const { showSelectAll, updateSelectAllStatus } = useSelectionComposition;
diff --git a/packages/ui-vue/components/data-view/components/column-filter/text-filter-editor.component.tsx b/packages/ui-vue/components/data-view/components/column-filter/text-filter-editor.component.tsx
index dcc34b0853f..0cc879563b9 100644
--- a/packages/ui-vue/components/data-view/components/column-filter/text-filter-editor.component.tsx
+++ b/packages/ui-vue/components/data-view/components/column-filter/text-filter-editor.component.tsx
@@ -1,7 +1,7 @@
 import { ref, Ref } from "vue";
-import { HeaderCell, UseDataView, UseFilterHistory, UseVirtualScroll } from "../../composition/types";
 import { FSearchBox } from "@farris/ui-vue/components/search-box";
 import { FTags, Tag } from "@farris/ui-vue/components/tags";
+import { HeaderCell, UseDataView, UseFilterHistory, UseVirtualScroll } from "../../composition/types";
 
 export default function (
     headerCell: HeaderCell,
diff --git a/packages/ui-vue/components/data-view/components/column-format/boolean.component.tsx b/packages/ui-vue/components/data-view/components/column-format/boolean.component.tsx
index 959fc404984..0ad59a023d0 100644
--- a/packages/ui-vue/components/data-view/components/column-format/boolean.component.tsx
+++ b/packages/ui-vue/components/data-view/components/column-format/boolean.component.tsx
@@ -1,4 +1,3 @@
-import { escape } from 'lodash-es';
 import { InnerFormatter } from '../../composition/types';
 
 export default function () {
diff --git a/packages/ui-vue/components/data-view/components/column-header/column-header.component.tsx b/packages/ui-vue/components/data-view/components/column-header/column-header.component.tsx
index 7d3753b8255..44897eb7606 100644
--- a/packages/ui-vue/components/data-view/components/column-header/column-header.component.tsx
+++ b/packages/ui-vue/components/data-view/components/column-header/column-header.component.tsx
@@ -13,7 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { computed, ref, Ref, SetupContext, watch } from 'vue';
+import { computed, ref, Ref, SetupContext } from 'vue';
+import { FCheckbox } from '@farris/ui-vue/components/checkbox';
+import { useArrayProcessor } from '@farris/ui-vue/components/common';
 import {
     HeaderCell,
     HeaderCellStatus,
@@ -35,8 +37,6 @@ import {
 import getHeaderCellHander from './column-header-handler.component';
 import getGridSettingsIconRender from '../column-setting/column-setting-icon.component';
 import { useResize } from '../../composition/column/use-resize';
-import { FCheckbox } from '@farris/ui-vue/components/checkbox';
-import { useArrayProcessor } from '@farris/ui-vue/components/common';
 
 export default function (
     props: DataViewOptions,
diff --git a/packages/ui-vue/components/data-view/components/column-setting/column-setting-icon.component.tsx b/packages/ui-vue/components/data-view/components/column-setting/column-setting-icon.component.tsx
index 85ea7554873..701eac4457c 100644
--- a/packages/ui-vue/components/data-view/components/column-setting/column-setting-icon.component.tsx
+++ b/packages/ui-vue/components/data-view/components/column-setting/column-setting-icon.component.tsx
@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { F_MODAL_SERVICE_TOKEN } from '@farris/ui-vue/components/modal';
 import { DataViewOptions, UseColumn, UseDataView, UseFilter, UseFitColumn, UseSort, UseVirtualScroll } from '../../composition/types';
-import { F_MODAL_SERVICE_TOKEN, FModalService } from '@farris/ui-vue/components/modal';
 import getDataGridSettingsRender from './column-setting.component';
 import { inject, Ref } from 'vue';
 
diff --git a/packages/ui-vue/components/data-view/components/column-setting/column-setting.component.tsx b/packages/ui-vue/components/data-view/components/column-setting/column-setting.component.tsx
index 5ce7f9b2e59..823eed601bd 100644
--- a/packages/ui-vue/components/data-view/components/column-setting/column-setting.component.tsx
+++ b/packages/ui-vue/components/data-view/components/column-setting/column-setting.component.tsx
@@ -1,15 +1,13 @@
+import { App, Ref, computed, inject, nextTick, ref } from 'vue';
 import FTransfer from '@farris/ui-vue/components/transfer';
 import FTabs, { FTabPage } from '@farris/ui-vue/components/tabs';
-// import FTabPage from '../../../tabs/src/components/tab-page.component';
 import { FOrder, OrderedItem, SortType } from '@farris/ui-vue/components/order';
-import FConditionList, { Condition, FieldConfig } from '@farris/ui-vue/components/condition';
-import { App, Ref, computed, inject, nextTick, ref } from 'vue';
+import FConditionList, { Condition, FieldConfig, ConditionValue } from '@farris/ui-vue/components/condition';
+import { EditorConfig } from '@farris/ui-vue/components/dynamic-form';
 import {
     DataColumn, DataViewOptions, UseColumn, UseDataView,
     UseFilter, UseFitColumn, UseSort, UseVirtualScroll
 } from '../../composition/types';
-import { ConditionValue } from '../../../condition/src/composition/condition-value/types';
-import { EditorConfig } from '@farris/ui-vue/components/dynamic-form';
 
 export default function (
     props: DataViewOptions,
diff --git a/packages/ui-vue/components/data-view/components/editors/commands.component.tsx b/packages/ui-vue/components/data-view/components/editors/commands.component.tsx
index 24eecfa8bf3..c0ad9b61959 100644
--- a/packages/ui-vue/components/data-view/components/editors/commands.component.tsx
+++ b/packages/ui-vue/components/data-view/components/editors/commands.component.tsx
@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { DataColumn, DataColumnCommand, VisualData, VisualDataStatus } from '../../composition/types';
 import FButton from '@farris/ui-vue/components/button';
+import { DataColumn, DataColumnCommand, VisualData, VisualDataStatus } from '../../composition/types';
 export default function () {
 
     function shouldShowCurrentCommandButton(command: DataColumnCommand,visualDataRow: VisualData) {
diff --git a/packages/ui-vue/components/data-view/components/filter-panel/filter-panel.component.tsx b/packages/ui-vue/components/data-view/components/filter-panel/filter-panel.component.tsx
index 0648f00d770..37e15c8ebd1 100644
--- a/packages/ui-vue/components/data-view/components/filter-panel/filter-panel.component.tsx
+++ b/packages/ui-vue/components/data-view/components/filter-panel/filter-panel.component.tsx
@@ -3,7 +3,7 @@ import {
     DataViewOptions, HeaderCell, HeaderCellStatus, UseColumn,
     UseDataView, UseFilter, UseVirtualScroll
 } from '../../composition/types';
-import { Condition, FieldConfig } from '../../../condition/src/types';
+import { Condition, FieldConfig } from '@farris/ui-vue/components/condition';
 import { FFilterBar } from '@farris/ui-vue/components/filter-bar';
 
 export default function (
diff --git a/packages/ui-vue/components/data-view/components/pagination/data-grid-pagination.component.tsx b/packages/ui-vue/components/data-view/components/pagination/data-grid-pagination.component.tsx
index 2e6a1b1fd51..d4b3cac2ea8 100644
--- a/packages/ui-vue/components/data-view/components/pagination/data-grid-pagination.component.tsx
+++ b/packages/ui-vue/components/data-view/components/pagination/data-grid-pagination.component.tsx
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 import { computed, onMounted, ref, SetupContext, watch } from 'vue';
-import { DataViewOptions, UseDataView, UsePagination, UseVirtualScroll } from '../../composition/types';
 import FPagination from '@farris/ui-vue/components/pagination';
+import { DataViewOptions, UseDataView, UsePagination, UseVirtualScroll } from '../../composition/types';
 
 export default function (
     props: DataViewOptions,
diff --git a/packages/ui-vue/components/data-view/components/row/hierarchy-row.component.tsx b/packages/ui-vue/components/data-view/components/row/hierarchy-row.component.tsx
index f35fc8da161..72c3b53e14b 100644
--- a/packages/ui-vue/components/data-view/components/row/hierarchy-row.component.tsx
+++ b/packages/ui-vue/components/data-view/components/row/hierarchy-row.component.tsx
@@ -1,11 +1,13 @@
 import { Fragment, Ref, SetupContext, VNodeArrayChildren, isVNode, ref } from "vue";
 import FTooltip from '@farris/ui-vue/components/tooltip';
-import { CellMode, ColumnContext, DataColumn, DataViewOptions, UseDataView, UseEdit, UseHierarchy, UseRow, UseSelectHierarchyItem, UseSelection, UseVirtualScroll, UseVisualData, UseVisualDataBound, VisualData, VisualDataCell } from "../../composition/types";
+import { FCheckbox } from '@farris/ui-vue/components/checkbox';
+import { CellMode, ColumnContext, DataColumn, DataViewOptions, UseDataView, 
+    UseEdit, UseHierarchy, UseRow, UseSelectHierarchyItem, UseSelection, UseVirtualScroll, 
+    UseVisualData, UseVisualDataBound, VisualData, VisualDataCell } from "../../composition/types";
 import { useCellPosition } from "../../composition/appearance/use-cell-position";
 import { useHierarchyStyle } from "../../composition/appearance/use-hierarchy-style";
 import { useTreeNodeIcon } from "../../composition/hierarchy/use-tree-node-icon";
 import { useToggleHierarchyItem } from "../../composition/hierarchy/use-toggle-hierarchy-item";
-import { FCheckbox } from '@farris/ui-vue/components/checkbox';
 import { useCellContentStyle } from "../../composition/appearance/use-cell-content-style";
 
 export default function (
diff --git a/packages/ui-vue/components/data-view/composition/appearance/use-hierarchy-style.ts b/packages/ui-vue/components/data-view/composition/appearance/use-hierarchy-style.ts
index 237427662d1..e237db9563b 100644
--- a/packages/ui-vue/components/data-view/composition/appearance/use-hierarchy-style.ts
+++ b/packages/ui-vue/components/data-view/composition/appearance/use-hierarchy-style.ts
@@ -1,7 +1,7 @@
  
 import { Ref, ref } from "vue";
-import { DataViewOptions, DictTreeItem, UseHierarchy, VisualData } from "../types";
 import { isUndefined } from "lodash-es";
+import { DataViewOptions, DictTreeItem, UseHierarchy, VisualData } from "../types";
 
 export function useHierarchyStyle(
     props: DataViewOptions,
diff --git a/packages/ui-vue/components/data-view/composition/data/use-data-view.ts b/packages/ui-vue/components/data-view/composition/data/use-data-view.ts
index a4a57a81775..28a369f4ca7 100644
--- a/packages/ui-vue/components/data-view/composition/data/use-data-view.ts
+++ b/packages/ui-vue/components/data-view/composition/data/use-data-view.ts
@@ -13,16 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { computed, ref, watch } from 'vue';
 import { cloneDeep } from 'lodash-es';
+import { FNotifyService } from '@farris/ui-vue/components/notify';
 import {
     DataViewFilter, DataViewOptions, DataViewSorter, DataViewType,
     UseDataView, UseFilter, UseHierarchy, UseIdentify, VisualData
 } from '../types';
-import { computed, ref, watch } from 'vue';
-import { useFilter } from '../filter/use-filter';
 import { useGroupData } from './use-group-data';
 import { useHierarchyData } from './use-hierarchy-data';
-import { FNotifyService } from '../../../notify';
 import { useTreeData } from '../..';
 export function useDataView(
     props: DataViewOptions,
diff --git a/packages/ui-vue/components/data-view/composition/data/use-loading.ts b/packages/ui-vue/components/data-view/composition/data/use-loading.ts
index 52c5ab0bec4..4567347e5c9 100644
--- a/packages/ui-vue/components/data-view/composition/data/use-loading.ts
+++ b/packages/ui-vue/components/data-view/composition/data/use-loading.ts
@@ -1,8 +1,8 @@
 import { computed, inject, Ref, ref, watch } from 'vue';
-import { FLoadingService } from '../../../loading';
-import { DataGridProps, dataGridProps } from '../../../data-grid/src/data-grid.props';
+import { FLoadingService } from '@farris/ui-vue/components/loading';
+import { DataViewOptions } from '../types';
 
-export function useLoading(props: DataGridProps, gridRef: Ref<any>) {
+export function useLoading(props: DataViewOptions, gridRef: Ref<any>) {
     const LoadingService: FLoadingService | any = inject<FLoadingService>('FLoadingService');
     const showLoading = computed(() => typeof props.loading === 'object' ? props.loading.show : props.loading);
     const loadingMessage = computed(() => typeof props.loading === 'object' ? props.loading.message : '正在加载...');
diff --git a/packages/ui-vue/components/data-view/composition/filter/use-filter.ts b/packages/ui-vue/components/data-view/composition/filter/use-filter.ts
index 2b40d2f9571..b1ff9f61528 100644
--- a/packages/ui-vue/components/data-view/composition/filter/use-filter.ts
+++ b/packages/ui-vue/components/data-view/composition/filter/use-filter.ts
@@ -1,13 +1,13 @@
 import { ref } from "vue";
-import { DataColumn, DataFilter, FilterFunction, FilterRelation, HeaderCell, UseFilter } from "../types";
 import {
     Condition, ConditionGroup, ConditionValue, useCondition, CompareType,
     CheckBoxValue, ComboLookupValue, ComboListValue, DatePickerValue, DateRangeValue, DateTimePickerValue,
     InputGroupValue, LookupValue, MonthPickerValue, MonthRangeValue, NumberRangeValue, NumberSpinnerValue,
     RadioGroupValue, YearPickerValue, TextValue,
     ValueType
-} from "../../../condition";
+} from "@farris/ui-vue/components/condition";
 import { EditorType } from '@farris/ui-vue/components/dynamic-form';
+import { DataColumn, DataFilter, FilterFunction, FilterRelation, HeaderCell, UseFilter } from "../types";
 
 
 type CompareFunction = (dataItem: Record<string, any>, field: string, value: any) => boolean;
diff --git a/packages/ui-vue/components/data-view/composition/hierarchy/use-select-hierarchy-item.ts b/packages/ui-vue/components/data-view/composition/hierarchy/use-select-hierarchy-item.ts
index 1b34d493b87..168a65b462e 100644
--- a/packages/ui-vue/components/data-view/composition/hierarchy/use-select-hierarchy-item.ts
+++ b/packages/ui-vue/components/data-view/composition/hierarchy/use-select-hierarchy-item.ts
@@ -1,7 +1,7 @@
 import { Ref, SetupContext } from 'vue';
+import { cloneDeep } from 'lodash-es';
 import { useArrayProcessor, useCommonUtils } from '@farris/ui-vue/components/common';
 import { DataViewOptions, UseSelection, UseSelectHierarchyItem, VisualData, VisualDataCell, UseIdentify, UseDataView } from '../types';
-import { cloneDeep } from 'lodash-es';
 import { useCascade } from './use-cascade';
 
 /** 用于处理树自动勾选子节点和优先返回父节点相关功能 */
diff --git a/packages/ui-vue/components/data-view/composition/pagination/use-pagination.ts b/packages/ui-vue/components/data-view/composition/pagination/use-pagination.ts
index d97dc61bae0..03370783876 100644
--- a/packages/ui-vue/components/data-view/composition/pagination/use-pagination.ts
+++ b/packages/ui-vue/components/data-view/composition/pagination/use-pagination.ts
@@ -1,10 +1,9 @@
 import { computed, ref, watch } from 'vue';
 import { useCommonUtils } from '@farris/ui-vue/components/common';
-import { PaginatonOptions, UseData, UseDataView, UsePagination } from '../types';
-import { DataGridProps } from '../../../data-grid';
+import { DataViewOptions, PaginatonOptions, UseData, UseDataView, UsePagination } from '../types';
 
 export function usePagination(
-    props: DataGridProps,
+    props: DataViewOptions,
     dataView: UseDataView
 ): UsePagination {
     const { isUndefined } = useCommonUtils();
diff --git a/packages/ui-vue/components/data-view/composition/types.ts b/packages/ui-vue/components/data-view/composition/types.ts
index fe5a59884a7..1ee573484cb 100644
--- a/packages/ui-vue/components/data-view/composition/types.ts
+++ b/packages/ui-vue/components/data-view/composition/types.ts
@@ -1,8 +1,8 @@
 /* eslint-disable no-use-before-define */
 import { ComputedRef, ExtractPropTypes, PropType, Ref, VNode } from "vue";
-import { Condition } from "../../condition";
-import { EditorConfig, EditorType } from '../../dynamic-form';
-import { ButtonSize } from "../../button";
+import { Condition } from "@farris/ui-vue/components/condition";
+import { EditorConfig, EditorType } from '@farris/ui-vue/components/dynamic-form';
+import { ButtonSize } from "@farris/ui-vue/components/button";
 
 export interface CollpasableItem {
     collapse: boolean;
@@ -99,7 +99,7 @@ export interface DataColumn {
     format?: (cell: VisualDataCell, visualDataRow: VisualData) => VNode | string;
     binding?: any;
     draggable?: boolean;
-    headerFormatter?: (context: { headerCell: HeaderCell, headerCells: HeaderCell[], columnIndex: number }) => VNode| string;
+    headerFormatter?: (context: { headerCell: HeaderCell, headerCells: HeaderCell[], columnIndex: number }) => VNode | string;
 }
 
 export interface DataFilter {
@@ -521,6 +521,7 @@ export interface DataViewOptions {
     /** 自动高度 */
     autoHeight: boolean;
     showBorder: boolean;
+    loading: boolean | { show?: boolean, message?: string }
 }
 
 export interface UseDataView {
@@ -657,7 +658,7 @@ export interface UseEdit {
 
     onClickCell: (payload: MouseEvent, cell: VisualDataCell, row: VisualData, column: DataColumn) => any;
 
-    onClickOutOfCell:(payload: MouseEvent | KeyboardEvent) => void;
+    onClickOutOfCell: (payload: MouseEvent | KeyboardEvent) => void;
     onClickCellByKeyboard: (payload: MouseEvent, cell: VisualDataCell, row: VisualData, column: DataColumn) => any;
 
     onMousedownCell: (payload: MouseEvent) => any;
diff --git a/packages/ui-vue/components/data-view/composition/visualization/use-visual-data-cell.ts b/packages/ui-vue/components/data-view/composition/visualization/use-visual-data-cell.ts
index 5eaf99b1c2b..01c9a2d001b 100644
--- a/packages/ui-vue/components/data-view/composition/visualization/use-visual-data-cell.ts
+++ b/packages/ui-vue/components/data-view/composition/visualization/use-visual-data-cell.ts
@@ -8,7 +8,6 @@ import {
 import getCommandColumn from '../../components/editors/commands.component';
 import getFormatColumn from '../../components/column-format/column-format.component';
 import { resolveField, setFieldValue } from "@farris/ui-vue/components/common";
-import { isUndefined } from "lodash";
 
 export function useVisualDataCell(
     props: DataViewOptions,
diff --git a/packages/ui-vue/components/data-view/designer.ts b/packages/ui-vue/components/data-view/designer.ts
new file mode 100644
index 00000000000..9cd068520f6
--- /dev/null
+++ b/packages/ui-vue/components/data-view/designer.ts
@@ -0,0 +1,3 @@
+export * from './designer/use-designer-fit-column';
+export * from './designer/use-column';
+export * from './designer/use-visual-data';
diff --git a/packages/ui-vue/components/data-view/designer/index.ts b/packages/ui-vue/components/data-view/designer/index.ts
deleted file mode 100644
index b7ffb38ef79..00000000000
--- a/packages/ui-vue/components/data-view/designer/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './use-designer-fit-column';
-export * from './use-column';
-export * from './use-visual-data';
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 2bac9ebbff6..2e2a2651561 100644
--- a/packages/ui-vue/components/designer-canvas/src/components/maps.ts
+++ b/packages/ui-vue/components/designer-canvas/src/components/maps.ts
@@ -52,7 +52,7 @@ import FVerifyDetail from '@farris/ui-vue/components/verify-detail';
 import FComponent from '@farris/ui-vue/components/component';
 import FVideo from '@farris/ui-vue/components/video';
 import FTextArea from '@farris/ui-vue/components/textarea';
-import FTreeGrid from '@farris/ui-vue/components/tree-grid';
+import FTreeGrid from '@farris/ui-vue/components/tree-grid/designer';
 import FFieldset from '@farris/ui-vue/components/fieldset';
 import FDrawer from '@farris/ui-vue/components/drawer/designer';
 import FHtmlTemplate from '@farris/ui-vue/components/html-template';
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 0e8a427200d..b8d63b0139a 100644
--- a/packages/ui-vue/components/dynamic-view/src/components/maps.ts
+++ b/packages/ui-vue/components/dynamic-view/src/components/maps.ts
@@ -57,7 +57,7 @@ import FVerifyDetail from '@farris/ui-vue/components/verify-detail';
 import FVideo from '@farris/ui-vue/components/video';
 import FTextArea from '@farris/ui-vue/components/textarea';
 import FSchemaSelector from '@farris/ui-vue/components/schema-selector';
-import FTreeGrid from '@farris/ui-vue/components/tree-grid';
+import FTreeGrid from '@farris/ui-vue/components/tree-grid/designer';
 import FEventParameter from '@farris/ui-vue/components/event-parameter';
 import FFilterConditionEditor from '@farris/ui-vue/components/filter-condition-editor';
 import FFieldset from '@farris/ui-vue/components/fieldset';
diff --git a/packages/ui-vue/components/tree-grid/designer.ts b/packages/ui-vue/components/tree-grid/designer.ts
new file mode 100644
index 00000000000..ba1350bc77b
--- /dev/null
+++ b/packages/ui-vue/components/tree-grid/designer.ts
@@ -0,0 +1,36 @@
+ 
+/**
+ * Copyright (c) 2020 - present, Inspur Genersoft Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { withInstall } from '@farris/ui-vue/components/common';
+import FTreeGrid from './src/tree-grid.component';
+import FTreeGridDesign from './src/designer/tree-grid.design.component';
+import { designPropsResolver, propsResolver, selectionItemResolver, bindingResolver, updateColumnsResolver } from './src/tree-grid.props';
+
+export * from './src/tree-grid.props';
+
+FTreeGridDesign.register = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>, resolverMap: Record<string, any>) => {
+    componentMap['tree-grid'] = FTreeGrid;
+    propsResolverMap['tree-grid'] = propsResolver;
+    resolverMap['tree-grid'] = { bindingResolver, selectionItemResolver, updateColumnsResolver };
+};
+
+FTreeGridDesign.registerDesigner = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>) => {
+    componentMap['tree-grid'] = FTreeGridDesign;
+    propsResolverMap['tree-grid'] = designPropsResolver;
+};
+
+export { FTreeGridDesign };
+export default withInstall(FTreeGridDesign);
diff --git a/packages/ui-vue/components/tree-grid/index.ts b/packages/ui-vue/components/tree-grid/index.ts
index b9bbed2ed98..e0e08d783cd 100644
--- a/packages/ui-vue/components/tree-grid/index.ts
+++ b/packages/ui-vue/components/tree-grid/index.ts
@@ -14,23 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import FTreeGrid from './src/tree-grid.component';
-import FTreeGridDesign from './src/designer/tree-grid.design.component';
-import { designPropsResolver, propsResolver, selectionItemResolver, bindingResolver, updateColumnsResolver } from './src/tree-grid.props';
 import { withInstall } from '@farris/ui-vue/components/common';
+import FTreeGrid from './src/tree-grid.component';
 
 export * from './src/tree-grid.props';
 
-FTreeGrid.register = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>, resolverMap: Record<string, any>) => {
-    componentMap['tree-grid'] = FTreeGrid;
-    propsResolverMap['tree-grid'] = propsResolver;
-    resolverMap['tree-grid'] = { bindingResolver, selectionItemResolver, updateColumnsResolver };
-};
-
-FTreeGrid.registerDesigner = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>) => {
-    componentMap['tree-grid'] = FTreeGridDesign;
-    propsResolverMap['tree-grid'] = designPropsResolver;
-};
-
 export { FTreeGrid };
 export default withInstall(FTreeGrid);
diff --git a/packages/ui-vue/components/tree-grid/src/components/data/data-area.component.tsx b/packages/ui-vue/components/tree-grid/src/components/data/data-area.component.tsx
index 7fbcb0a0549..e2cf182c916 100644
--- a/packages/ui-vue/components/tree-grid/src/components/data/data-area.component.tsx
+++ b/packages/ui-vue/components/tree-grid/src/components/data/data-area.component.tsx
@@ -16,7 +16,9 @@
  */
 import { Ref, SetupContext } from 'vue';
 import { DataGridColumn, TreeGridProps } from '../../tree-grid.props';
-import { DataColumn, DataViewOptions, getHierarchyRow, UseCellPosition, UseColumn, UseDataView, UseEdit, UseHierarchy, UseRow, UseSelectHierarchyItem, UseSelection, UseVirtualScroll, UseVisualData, UseVisualDataBound, VisualData } from '../../../../data-view';
+import { DataColumn, DataViewOptions, getHierarchyRow, UseCellPosition, UseColumn, 
+    UseDataView, UseEdit, UseHierarchy, UseRow, UseSelectHierarchyItem, UseSelection, 
+    UseVirtualScroll, UseVisualData, UseVisualDataBound, VisualData } from '@farris/ui-vue/components/data-view';
 
 export default function (
     props: TreeGridProps,
diff --git a/packages/ui-vue/components/tree-grid/src/designer/tree-grid.design.component.tsx b/packages/ui-vue/components/tree-grid/src/designer/tree-grid.design.component.tsx
index 80b6bba5b56..6cb6e1d32aa 100644
--- a/packages/ui-vue/components/tree-grid/src/designer/tree-grid.design.component.tsx
+++ b/packages/ui-vue/components/tree-grid/src/designer/tree-grid.design.component.tsx
@@ -20,17 +20,16 @@ import { TreeGridDesignProps, treeGridDesignProps } from '../tree-grid.props';
 import {
     getHorizontalScrollbar, DataViewOptions, useDataView, useDataViewContainerStyle, useEdit, useHierarchy, useVirtualScroll,
      useVisualDataBound, useVisualDataCell, useVisualDataRow, useSelection, useSidebar, VisualData,
-    useCommandColumn, useIdentify, useGroupColumn, usePagination,
+    useCommandColumn, useIdentify, useGroupColumn,
     useFilter,
     useRow,
     DataColumn,
     useSort
-} from '../../../data-view';
-import getColumnHeader from '../../../data-grid/src/designer/column-header.design.component';
-import { DesignerItemContext } from '../../../designer-canvas';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
+} from '@farris/ui-vue/components/data-view';
+import { getColumnHeader } from '@farris/ui-vue/components/data-grid/designer';
+import { DesignerItemContext, useDesignerComponent } from '@farris/ui-vue/components/designer-canvas';
 import { useDesignerRulesForTreeGrid } from './use-designer-rules';
-import { useDesignerColumn, useDesignerFitColumn, useDesignerVisualData } from '../../../data-view/designer';
+import { useDesignerColumn, useDesignerFitColumn, useDesignerVisualData } from '@farris/ui-vue/components/data-view/designer';
 
 export default defineComponent({
     name: 'FTreeGridDesign',
diff --git a/packages/ui-vue/components/tree-grid/src/designer/use-designer-rules.ts b/packages/ui-vue/components/tree-grid/src/designer/use-designer-rules.ts
index 92ba11e7299..a6af129f237 100644
--- a/packages/ui-vue/components/tree-grid/src/designer/use-designer-rules.ts
+++ b/packages/ui-vue/components/tree-grid/src/designer/use-designer-rules.ts
@@ -1,6 +1,5 @@
 import { ref } from "vue";
-import { DraggingResolveContext, UseDesignerRules } from "../../../designer-canvas/src/composition/types";
-import { ComponentSchema, DesignerItemContext } from "../../../designer-canvas/src/types";
+import { DraggingResolveContext, UseDesignerRules, ComponentSchema, DesignerItemContext } from "@farris/ui-vue/components/designer-canvas";
 import { TreeGridProperty } from "../property-config/tree-grid.property-config";
 
 export function useDesignerRulesForTreeGrid(designItemContext: DesignerItemContext, designerHostService): UseDesignerRules {
diff --git a/packages/ui-vue/components/tree-grid/src/property-config/tree-grid.property-config.ts b/packages/ui-vue/components/tree-grid/src/property-config/tree-grid.property-config.ts
index dd0746d5b5a..45dd1e89036 100644
--- a/packages/ui-vue/components/tree-grid/src/property-config/tree-grid.property-config.ts
+++ b/packages/ui-vue/components/tree-grid/src/property-config/tree-grid.property-config.ts
@@ -1,5 +1,4 @@
-import { PropertyChangeObject } from "../../../property-panel/src/composition/entity/property-entity";
-import { BaseControlProperty } from "../../../property-panel/src/composition/entity/base-property";
+import { PropertyChangeObject, BaseControlProperty } from "@farris/ui-vue/components/property-panel";
 import { FormSchemaEntity } from "@farris/ui-vue/components/common";
 
 export class TreeGridProperty extends BaseControlProperty {
diff --git a/packages/ui-vue/components/tree-grid/src/schema/schema-mapper.ts b/packages/ui-vue/components/tree-grid/src/schema/schema-mapper.ts
index ac59744a976..85590ef3489 100644
--- a/packages/ui-vue/components/tree-grid/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/tree-grid/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance],
diff --git a/packages/ui-vue/components/tree-grid/src/schema/schema-resolver.ts b/packages/ui-vue/components/tree-grid/src/schema/schema-resolver.ts
index 49e4b6aad28..ffaeda879e3 100644
--- a/packages/ui-vue/components/tree-grid/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/tree-grid/src/schema/schema-resolver.ts
@@ -1,6 +1,6 @@
  
-import { ComponentSchema, DesignerComponentInstance } from "../../../designer-canvas/src/types";
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { ComponentSchema, DesignerComponentInstance } from "@farris/ui-vue/components/designer-canvas";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 function wrapComponentForDataGrid(resolver: DynamicResolver, schema: ComponentSchema, context: Record<string, any>): ComponentSchema {
     const parentComponentInstance = context.parentComponentInstance as DesignerComponentInstance;
diff --git a/packages/ui-vue/components/tree-grid/src/tree-grid.component.tsx b/packages/ui-vue/components/tree-grid/src/tree-grid.component.tsx
index 8b9f7c92ee8..abe025c1fcf 100644
--- a/packages/ui-vue/components/tree-grid/src/tree-grid.component.tsx
+++ b/packages/ui-vue/components/tree-grid/src/tree-grid.component.tsx
@@ -56,7 +56,7 @@ export default defineComponent({
         const useFilterComposition = useFilter();
         const useHierarchyComposition = useHierarchy(props as DataViewOptions);
         const { collapseField } = useHierarchyComposition;
-        const { showLoading, renderLoading } = useLoading(props, dataGridRef);
+        const { showLoading, renderLoading } = useLoading(props as DataViewOptions, dataGridRef);
         const treeDataView = useDataView(props as DataViewOptions, new Map(), useFilterComposition, useHierarchyComposition, useIdentifyComposition);
         const { dataView: dataViewValues } = treeDataView;
         const useSelectionComposition = useSelection(props as DataViewOptions, treeDataView, useIdentifyComposition, visibleDatas, context as SetupContext);
diff --git a/packages/ui-vue/components/tree-grid/src/tree-grid.props.ts b/packages/ui-vue/components/tree-grid/src/tree-grid.props.ts
index 850441e63be..1265528883b 100644
--- a/packages/ui-vue/components/tree-grid/src/tree-grid.props.ts
+++ b/packages/ui-vue/components/tree-grid/src/tree-grid.props.ts
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 import { ExtractPropTypes, PropType } from 'vue';
-import { EditorConfig } from '../../dynamic-form';
-import { createDataViewUpdateColumnsResolver, createPropsResolver, createTreeGridBindingResolver, createTreeGridSelectionItemResolver } from '../../dynamic-resolver';
+import { EditorConfig } from '@farris/ui-vue/components/dynamic-form';
+import { createDataViewUpdateColumnsResolver, createPropsResolver, createTreeGridBindingResolver, createTreeGridSelectionItemResolver } from '@farris/ui-vue/components/dynamic-resolver';
+import { CommandOptions, HierarchyOptions, RowNumberOptions, SelectionOptions, VisualData } from '@farris/ui-vue/components/data-view';
 import { schemaMapper } from './schema/schema-mapper';
 import { schemaResolver } from "./schema/schema-resolver";
-import { CommandOptions, HierarchyOptions, RowNumberOptions, SelectionOptions, VisualData } from '../../data-view';
 import treeGridSchema from './schema/tree-grid.schema.json';
 
 export type DataGridAlignment = 'left' | 'center' | 'right';
-- 
Gitee


From 6e181e66ac460f6f68dbe940d76ebcbbee5f3e3b Mon Sep 17 00:00:00 2001
From: hyygzds <m15966339253@163.com>
Date: Thu, 10 Jul 2025 20:11:16 +0800
Subject: [PATCH 39/62] fix: optimize import path

---
 .../components/nav/src/designer/nav.design.component.tsx  | 4 +---
 .../ui-vue/components/nav/src/schema/schema-mapper.ts     | 2 +-
 .../ui-vue/components/nav/src/schema/schema-resolver.ts   | 2 +-
 packages/ui-vue/components/tree-view/index.ts             | 3 +--
 .../tree-view/src/components/data/tree-area.component.tsx | 3 ++-
 .../tree-view/src/designer/tree-view.design.component.tsx | 8 +++-----
 .../components/tree-view/src/schema/schema-mapper.ts      | 2 +-
 .../components/tree-view/src/schema/schema-resolver.ts    | 2 +-
 .../components/tree-view/src/tree-view.component.tsx      | 4 ++--
 9 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/packages/ui-vue/components/nav/src/designer/nav.design.component.tsx b/packages/ui-vue/components/nav/src/designer/nav.design.component.tsx
index 1db2a0ce02d..92579c171e2 100644
--- a/packages/ui-vue/components/nav/src/designer/nav.design.component.tsx
+++ b/packages/ui-vue/components/nav/src/designer/nav.design.component.tsx
@@ -15,11 +15,9 @@
  * limitations under the License.
  */
 import { computed, defineComponent, inject, onMounted, ref, SetupContext } from 'vue';
+import { DesignerItemContext, useDesignerComponent } from '@farris/ui-vue/components/designer-canvas';
 import { navProps, NavProps } from '../nav.props';
 
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
-// import { useDesignerRules } from '../../../dynamic-form/src/designer/use-designer-rules';
 
 export default defineComponent({
     name: 'FNavDesign',
diff --git a/packages/ui-vue/components/nav/src/schema/schema-mapper.ts b/packages/ui-vue/components/nav/src/schema/schema-mapper.ts
index 97964aee23b..2ca33ca0806 100644
--- a/packages/ui-vue/components/nav/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/nav/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/nav/src/schema/schema-resolver.ts b/packages/ui-vue/components/nav/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/nav/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/nav/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
diff --git a/packages/ui-vue/components/tree-view/index.ts b/packages/ui-vue/components/tree-view/index.ts
index cca30a1cfbe..9b04c3b3b12 100644
--- a/packages/ui-vue/components/tree-view/index.ts
+++ b/packages/ui-vue/components/tree-view/index.ts
@@ -1,9 +1,8 @@
  
+import { withInstall } from '@farris/ui-vue/components/common';
 import FTreeView from './src/tree-view.component';
 import FTreeViewDesign from './src/designer/tree-view.design.component';
-
 import { propsResolver } from './src/tree-view.props';
-import { withInstall } from '@farris/ui-vue/components/common';
 
 export * from './src/tree-view.props';
 
diff --git a/packages/ui-vue/components/tree-view/src/components/data/tree-area.component.tsx b/packages/ui-vue/components/tree-view/src/components/data/tree-area.component.tsx
index ea665d20067..d836ffbb058 100644
--- a/packages/ui-vue/components/tree-view/src/components/data/tree-area.component.tsx
+++ b/packages/ui-vue/components/tree-view/src/components/data/tree-area.component.tsx
@@ -1,6 +1,7 @@
 import { Ref, SetupContext } from 'vue';
 import { TreeViewProps } from '../../tree-view.props';
-import { DataViewOptions, UseCellPosition, UseColumn, UseDataView, UseEdit, UseHierarchy, UseRow, UseSelectHierarchyItem, UseSelection, UseVirtualScroll, UseVisualData, UseVisualDataBound, VisualData, getHierarchyRow } from '../../../../data-view';
+import { DataViewOptions, UseCellPosition, UseColumn, UseDataView, UseEdit, UseHierarchy, 
+    UseRow, UseSelectHierarchyItem, UseSelection, UseVirtualScroll, UseVisualData, UseVisualDataBound, VisualData, getHierarchyRow } from '@farris/ui-vue/components/data-view';
 
 /** 渲染树状区域 */
 export default function (
diff --git a/packages/ui-vue/components/tree-view/src/designer/tree-view.design.component.tsx b/packages/ui-vue/components/tree-view/src/designer/tree-view.design.component.tsx
index 85bb0e616ad..7cbf028fa4d 100644
--- a/packages/ui-vue/components/tree-view/src/designer/tree-view.design.component.tsx
+++ b/packages/ui-vue/components/tree-view/src/designer/tree-view.design.component.tsx
@@ -4,12 +4,10 @@ import { Ref, SetupContext, computed, defineComponent, inject, ref } from 'vue';
 import { TreeViewProps, treeViewProps } from '../tree-view.props';
 import {
     DataViewOptions, UseCellEditor, VisualData, useCellPosition, useColumn, useDataView, useDataViewContainerStyle, useEdit, useFilter, useHierarchy, useIdentify,
-    usePagination, useRow, useSelectHierarchyItem, useSelection, useVirtualScroll, useVisualData, useVisualDataBound, useVisualDataCell, useVisualDataRow
-} from '../../../data-view';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
+    useRow, useSelectHierarchyItem, useSelection, useVirtualScroll, useVisualData, useVisualDataBound, useVisualDataCell, useVisualDataRow
+} from '@farris/ui-vue/components/data-view';
+import { useDesignerComponent, DesignerItemContext } from '@farris/ui-vue/components/designer-canvas';
 import getTreeArea from '../components/data/tree-area.component';
-import treeView from '../..';
 
 export default defineComponent({
     name: 'FTreeViewDesign',
diff --git a/packages/ui-vue/components/tree-view/src/schema/schema-mapper.ts b/packages/ui-vue/components/tree-view/src/schema/schema-mapper.ts
index 97964aee23b..2ca33ca0806 100644
--- a/packages/ui-vue/components/tree-view/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/tree-view/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/tree-view/src/schema/schema-resolver.ts b/packages/ui-vue/components/tree-view/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/tree-view/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/tree-view/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
diff --git a/packages/ui-vue/components/tree-view/src/tree-view.component.tsx b/packages/ui-vue/components/tree-view/src/tree-view.component.tsx
index f87dd3aaf3b..63e0b7b3ffc 100644
--- a/packages/ui-vue/components/tree-view/src/tree-view.component.tsx
+++ b/packages/ui-vue/components/tree-view/src/tree-view.component.tsx
@@ -1,6 +1,7 @@
 
 
 import { SetupContext, computed, defineComponent, nextTick, onMounted, ref, watch } from 'vue';
+import { useResizeObserver } from '@vueuse/core';
 import { TreeViewProps, treeViewProps } from './tree-view.props';
 import {
     DataViewOptions, UpdateDataOption, UseCellEditor, VisualData, getEmpty, getHorizontalScrollbar, getSidebar, getVerticalScrollbar, useCellPosition, useColumn,
@@ -9,8 +10,7 @@ import {
 } from '@farris/ui-vue/components/data-view';
 import getTreeArea from './components/data/tree-area.component';
 import getContentHeader from './components/header/content-header.component';
-import { useSelectHierarchyItem } from '../../data-view/composition/hierarchy/use-select-hierarchy-item';
-import { useResizeObserver } from '@vueuse/core';
+import { useSelectHierarchyItem } from '@farris/ui-vue/components/data-view';
 import './tree-view.css';
 export default defineComponent({
     name: 'FTreeView',
-- 
Gitee


From 183df1317b3a864e56310cc4b6863bbb8e40220a Mon Sep 17 00:00:00 2001
From: hyygzds <m15966339253@163.com>
Date: Tue, 15 Jul 2025 09:28:31 +0800
Subject: [PATCH 40/62] build: modify import path to build more quickly

---
 .../ui-vue/components/designer-canvas/index.ts    | 15 ++++++++++++++-
 .../components/tab-header-capsule.component.tsx   |  2 +-
 .../src/components/tab-header-item.component.tsx  |  2 +-
 .../tabs/src/components/tab-page.component.tsx    |  4 ++--
 .../tabs/src/components/tab-page.props.ts         |  2 +-
 .../tabs/src/composition/tab-header-dragula.ts    |  4 +---
 .../components/tabs/src/composition/types.ts      |  3 +--
 .../designer/tab-header-item.design.component.tsx |  2 +-
 .../src/designer/tab-header.design.component.tsx  |  6 ++----
 .../src/designer/tab-page-use-designer-rules.ts   |  5 +----
 .../src/designer/tab-page.design.component.tsx    |  8 +++-----
 .../tabs/src/designer/tab-toolbar-item.props.ts   |  4 ++--
 .../src/designer/tab-toolbar.design.component.tsx |  8 +++-----
 .../tabs/src/designer/tab-use-designer-rules.ts   |  4 +---
 .../tabs/src/designer/tabs-use-design.ts          | 12 +++++++-----
 .../tabs/src/designer/tabs.design.component.tsx   |  6 ++----
 .../property-config/tab-page.property-config.ts   |  2 +-
 .../tab-toolbar-item.property-config.ts           |  3 +--
 .../src/property-config/tabs.property-config.ts   |  2 +-
 .../components/tabs/src/schema/schema-mapper.ts   |  2 +-
 .../components/tabs/src/schema/schema-resolver.ts |  5 ++---
 .../tabs/src/schema/tab-page-schema-mapper.ts     |  2 +-
 .../ui-vue/components/tabs/src/tabs.component.tsx |  4 ++--
 packages/ui-vue/components/tabs/src/tabs.props.ts |  2 +-
 24 files changed, 53 insertions(+), 56 deletions(-)

diff --git a/packages/ui-vue/components/designer-canvas/index.ts b/packages/ui-vue/components/designer-canvas/index.ts
index 43befcbf47d..59918465f6e 100644
--- a/packages/ui-vue/components/designer-canvas/index.ts
+++ b/packages/ui-vue/components/designer-canvas/index.ts
@@ -3,6 +3,7 @@ import FDesignerItem from './src/components/designer-item.component';
 import FDesignerInnerItem from './src/components/designer-inner-item.component';
 import { DgControl } from './src/composition/dg-control';
 import type { DesignerHostService, UseDesignerRules, DesignerHTMLElement, DraggingResolveContext } from './src/composition/types';
+import { canvasChanged, setPositionForSelectedElement, setPositionOfButtonGroup } from './src/composition/designer-canvas-changed';
 
 export * from './src/composition/props/designer-canvas.props';
 export * from './src/composition/function/use-designer-component';
@@ -12,4 +13,16 @@ export * from './src/composition/rule/use-dragula-common-rule';
 export * from './src/composition/types';
 export * from './src/types';
 
-export { FDesignerCanvas, FDesignerItem, DgControl, UseDesignerRules, DesignerHostService, DesignerHTMLElement, DraggingResolveContext, FDesignerInnerItem };
+export {
+    FDesignerCanvas,
+    canvasChanged,
+    setPositionForSelectedElement,
+    setPositionOfButtonGroup,
+    FDesignerItem,
+    DgControl, 
+    UseDesignerRules, 
+    DesignerHostService, 
+    DesignerHTMLElement, 
+    DraggingResolveContext, 
+    FDesignerInnerItem
+};
diff --git a/packages/ui-vue/components/tabs/src/components/tab-header-capsule.component.tsx b/packages/ui-vue/components/tabs/src/components/tab-header-capsule.component.tsx
index e1430f802f9..f71fe6a89ac 100644
--- a/packages/ui-vue/components/tabs/src/components/tab-header-capsule.component.tsx
+++ b/packages/ui-vue/components/tabs/src/components/tab-header-capsule.component.tsx
@@ -1,7 +1,7 @@
 import { ShallowRef, computed, onMounted, ref, watch } from "vue";
+import FCapsule, { CapsuleItem } from '@farris/ui-vue/components/capsule';
 import { TabsProps } from "../tabs.props";
 import { TabPageContext, UseNav, UseOnePage, UseTabs } from "../composition/types";
-import FCapsule, { CapsuleItem } from '@farris/ui-vue/components/capsule';
 
 export default function (
     props: TabsProps,
diff --git a/packages/ui-vue/components/tabs/src/components/tab-header-item.component.tsx b/packages/ui-vue/components/tabs/src/components/tab-header-item.component.tsx
index 2d663bf76c9..206738730c4 100644
--- a/packages/ui-vue/components/tabs/src/components/tab-header-item.component.tsx
+++ b/packages/ui-vue/components/tabs/src/components/tab-header-item.component.tsx
@@ -1,8 +1,8 @@
 import { computed, reactive, ref } from "vue";
+import { getCustomClass } from "@farris/ui-vue/components/common";
 import { TabPageContext, UseOnePage, UseTabs } from "../composition/types";
 import { TabPageProps } from "./tab-page.props";
 import { TabsProps } from "../tabs.props";
-import { getCustomClass } from "@farris/ui-vue/components/common";
 
 export default function (
     tabsProps: TabsProps,
diff --git a/packages/ui-vue/components/tabs/src/components/tab-page.component.tsx b/packages/ui-vue/components/tabs/src/components/tab-page.component.tsx
index d4282f0e018..ffb0f620dba 100644
--- a/packages/ui-vue/components/tabs/src/components/tab-page.component.tsx
+++ b/packages/ui-vue/components/tabs/src/components/tab-page.component.tsx
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 import { defineComponent, inject, onMounted, SetupContext, watch, ref, onUnmounted, computed } from 'vue';
+import { JSX } from 'vue/jsx-runtime';
+import FSection from '@farris/ui-vue/components/section';
 import { TabPageContext, TabsContext } from '../composition/types';
 import { TabPageProps, tabPageProps } from './tab-page.props';
-import FSection from '@farris/ui-vue/components/section';
-import { JSX } from 'vue/jsx-runtime';
 
 export default defineComponent({
     name: 'FTabPage',
diff --git a/packages/ui-vue/components/tabs/src/components/tab-page.props.ts b/packages/ui-vue/components/tabs/src/components/tab-page.props.ts
index 5e28ced1bcb..02bb213f43d 100644
--- a/packages/ui-vue/components/tabs/src/components/tab-page.props.ts
+++ b/packages/ui-vue/components/tabs/src/components/tab-page.props.ts
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 import { ExtractPropTypes, PropType } from 'vue';
-import { ToolbarPosition, ToolbarContentsConf } from '../composition/types';
 import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
+import { ToolbarPosition, ToolbarContentsConf } from '../composition/types';
 import { schemaMapper } from '../schema/tab-page-schema-mapper';
 import tabPageSchema from '../schema/tab-page.schema.json';
 
diff --git a/packages/ui-vue/components/tabs/src/composition/tab-header-dragula.ts b/packages/ui-vue/components/tabs/src/composition/tab-header-dragula.ts
index 988fa1c90cc..90aeebb7d73 100644
--- a/packages/ui-vue/components/tabs/src/composition/tab-header-dragula.ts
+++ b/packages/ui-vue/components/tabs/src/composition/tab-header-dragula.ts
@@ -1,8 +1,6 @@
-import { DesignerHTMLElement } from '../../../designer-canvas/src/composition/types';
+import { DesignerHTMLElement, DesignerItemContext, canvasChanged } from '@farris/ui-vue/components/designer-canvas';
 import dragula from '@farris/designer-dragula';
-import { DesignerItemContext } from '../../../designer-canvas';
 import { nextTick, Ref } from 'vue';
-import { canvasChanged } from '../../../designer-canvas/src/composition/designer-canvas-changed';
 import { TabPageContext } from './types';
 
 export function tabHeaderItemDragula(designItemContext: DesignerItemContext, tabPages: Ref<TabPageContext[]>) {
diff --git a/packages/ui-vue/components/tabs/src/composition/types.ts b/packages/ui-vue/components/tabs/src/composition/types.ts
index 9e6ade11d73..fa36368ab4f 100644
--- a/packages/ui-vue/components/tabs/src/composition/types.ts
+++ b/packages/ui-vue/components/tabs/src/composition/types.ts
@@ -15,8 +15,7 @@
  */
 import { ComputedRef, Ref, ShallowRef, Slots } from 'vue';
 import { TabPageProps } from '../components/tab-page.props';
-import { ComponentSchema, DesignerComponentInstance } from '../../../designer-canvas/src/types';
-import { DesignerHTMLElement } from '../../../designer-canvas/src/composition/types';
+import { ComponentSchema, DesignerComponentInstance, DesignerHTMLElement } from '@farris/ui-vue/components/designer-canvas';
 
 export interface TabPageContext {
     props: TabPageProps;
diff --git a/packages/ui-vue/components/tabs/src/designer/tab-header-item.design.component.tsx b/packages/ui-vue/components/tabs/src/designer/tab-header-item.design.component.tsx
index d2338e4e343..4255e9a1b5f 100644
--- a/packages/ui-vue/components/tabs/src/designer/tab-header-item.design.component.tsx
+++ b/packages/ui-vue/components/tabs/src/designer/tab-header-item.design.component.tsx
@@ -1,9 +1,9 @@
 
 import { computed, Ref, ref, watch, nextTick } from "vue";
+import { DesignerComponentInstance } from "@farris/ui-vue/components/designer-canvas";
 import { TabPageContext, UseOnePage, UseDesignTabs } from "../composition/types";
 import { TabPageProps } from "../components/tab-page.props";
 import { TabsProps } from "../tabs.props";
-import { DesignerComponentInstance } from "../../../designer-canvas/src/types";
 
 
 export default function (
diff --git a/packages/ui-vue/components/tabs/src/designer/tab-header.design.component.tsx b/packages/ui-vue/components/tabs/src/designer/tab-header.design.component.tsx
index 8352ddf2770..3f141f16042 100644
--- a/packages/ui-vue/components/tabs/src/designer/tab-header.design.component.tsx
+++ b/packages/ui-vue/components/tabs/src/designer/tab-header.design.component.tsx
@@ -1,11 +1,9 @@
 import { Ref, ShallowRef, computed, nextTick } from "vue";
+import { getSchemaByType } from "@farris/ui-vue/components/dynamic-resolver";
+import { UseDesignerRules, ComponentSchema, DesignerComponentInstance } from "@farris/ui-vue/components/designer-canvas";
 import { TabsProps } from "../tabs.props";
 import { TabPageContext, UseDesignTabs, UseNav, UseOnePage } from "../composition/types";
-
 import renderTabHeaderItem from './tab-header-item.design.component';
-import { ComponentSchema, DesignerComponentInstance } from "../../../designer-canvas/src/types";
-import { getSchemaByType } from "../../../dynamic-resolver/src/schema-resolver";
-import { UseDesignerRules } from "../../../designer-canvas/src/composition/types";
 
 export default function (
     props: TabsProps,
diff --git a/packages/ui-vue/components/tabs/src/designer/tab-page-use-designer-rules.ts b/packages/ui-vue/components/tabs/src/designer/tab-page-use-designer-rules.ts
index 739e7fd8a05..4e7dbed9064 100644
--- a/packages/ui-vue/components/tabs/src/designer/tab-page-use-designer-rules.ts
+++ b/packages/ui-vue/components/tabs/src/designer/tab-page-use-designer-rules.ts
@@ -1,7 +1,4 @@
-import { UseTemplateDragAndDropRules } from "../../../designer-canvas/src/composition/rule/use-template-rule";
-import { DesignerHostService, DraggingResolveContext, UseDesignerRules } from "../../../designer-canvas/src/composition/types";
-import { useDragulaCommonRule } from "../../../designer-canvas/src/composition/rule/use-dragula-common-rule";
-import { DesignerItemContext } from "../../../designer-canvas/src/types";
+import { UseTemplateDragAndDropRules, useDragulaCommonRule, DesignerItemContext, DesignerHostService, DraggingResolveContext, UseDesignerRules } from "@farris/ui-vue/components/designer-canvas";
 
 export function useDesignerRules(designItemContext: DesignerItemContext, designerHostService?: DesignerHostService): UseDesignerRules {
     const dragAndDropRules = new UseTemplateDragAndDropRules();
diff --git a/packages/ui-vue/components/tabs/src/designer/tab-page.design.component.tsx b/packages/ui-vue/components/tabs/src/designer/tab-page.design.component.tsx
index 9272467189c..efde345c2a2 100644
--- a/packages/ui-vue/components/tabs/src/designer/tab-page.design.component.tsx
+++ b/packages/ui-vue/components/tabs/src/designer/tab-page.design.component.tsx
@@ -14,14 +14,12 @@
  * limitations under the License.
  */
 import { defineComponent, inject, onMounted, SetupContext, watch, ref, onUnmounted, computed } from 'vue';
+import { JSX } from 'vue/jsx-runtime';
+import FSection from '@farris/ui-vue/components/section';
+import { DesignerItemContext, useDesignerComponent, DesignerHostService } from '@farris/ui-vue/components/designer-canvas';
 import { TabPageContext, TabsContext } from '../composition/types';
 import { TabPageProps, tabPageProps } from '../components/tab-page.props';
-import FSection from '../../../section/src/section.component';
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
 import { useDesignerRules } from './tab-page-use-designer-rules';
-import { JSX } from 'vue/jsx-runtime';
-import { DesignerHostService } from '../../../designer-canvas/src/composition/types';
 
 export default defineComponent({
     name: 'FTabPageDesign',
diff --git a/packages/ui-vue/components/tabs/src/designer/tab-toolbar-item.props.ts b/packages/ui-vue/components/tabs/src/designer/tab-toolbar-item.props.ts
index f5f14c4ea27..15cea407c18 100644
--- a/packages/ui-vue/components/tabs/src/designer/tab-toolbar-item.props.ts
+++ b/packages/ui-vue/components/tabs/src/designer/tab-toolbar-item.props.ts
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 // 暂未使用
-import { ExtractPropTypes, PropType } from 'vue';
-import { createPropsResolver } from '../../../dynamic-resolver';
+import { ExtractPropTypes } from 'vue';
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
 import { schemaMapper } from '../schema/schema-mapper';
 import { tabToolbarItemSchemaResolver } from '../schema/schema-resolver';
 import tabToolbarItemSchema from '../schema/tab-toolbar-item.schema.json';
diff --git a/packages/ui-vue/components/tabs/src/designer/tab-toolbar.design.component.tsx b/packages/ui-vue/components/tabs/src/designer/tab-toolbar.design.component.tsx
index 1f8bed52c0c..2382dea1e20 100644
--- a/packages/ui-vue/components/tabs/src/designer/tab-toolbar.design.component.tsx
+++ b/packages/ui-vue/components/tabs/src/designer/tab-toolbar.design.component.tsx
@@ -1,9 +1,7 @@
-import { Ref, watch } from 'vue';
-import { DesignerComponentInstance, DesignerItemContext } from '../../../designer-canvas/src/types';
-import FResponseToolbarDesign from '../../../response-toolbar/src/designer/response-toolbar.design.component';
+import { Ref } from 'vue';
+import { DesignerComponentInstance, DesignerItemContext, UseDesignerRules, FDesignerInnerItem } from '@farris/ui-vue/components/designer-canvas';
+import FResponseToolbarDesign from '@farris/ui-vue/components/response-toolbar';
 import { UseDesignTabs } from '../composition/types';
-import { UseDesignerRules } from '../../../designer-canvas/src/composition/types';
-import FDesignerInnerItem from '../../../designer-canvas/src/components/designer-inner-item.component';
 
 export default function (
     useTabsComposition: UseDesignTabs,
diff --git a/packages/ui-vue/components/tabs/src/designer/tab-use-designer-rules.ts b/packages/ui-vue/components/tabs/src/designer/tab-use-designer-rules.ts
index 61dcfdd3f70..ed0179dd3fe 100644
--- a/packages/ui-vue/components/tabs/src/designer/tab-use-designer-rules.ts
+++ b/packages/ui-vue/components/tabs/src/designer/tab-use-designer-rules.ts
@@ -1,7 +1,5 @@
 import { nextTick } from "vue";
-import { UseTemplateDragAndDropRules } from "../../../designer-canvas/src/composition/rule/use-template-rule";
-import { DesignerHostService, DesignerHTMLElement, DraggingResolveContext, UseDesignerRules } from "../../../designer-canvas/src/composition/types";
-import { ComponentSchema, DesignerItemContext } from "../../../designer-canvas/src/types";
+import { DesignerHostService, DesignerHTMLElement, DraggingResolveContext, UseDesignerRules, UseTemplateDragAndDropRules, ComponentSchema, DesignerItemContext } from "@farris/ui-vue/components/designer-canvas";
 import { TabPageProperty } from "../property-config/tab-page.property-config";
 import { TabsProperty } from "../property-config/tabs.property-config";
 
diff --git a/packages/ui-vue/components/tabs/src/designer/tabs-use-design.ts b/packages/ui-vue/components/tabs/src/designer/tabs-use-design.ts
index 37ed8bb5076..fc87fa0ff59 100644
--- a/packages/ui-vue/components/tabs/src/designer/tabs-use-design.ts
+++ b/packages/ui-vue/components/tabs/src/designer/tabs-use-design.ts
@@ -14,12 +14,14 @@
  * limitations under the License.
  */
 import { Ref, SetupContext, ShallowRef, computed, nextTick, ref, watch } from 'vue';
-import { TabsProps } from '../tabs.props';
+import {
+    ComponentSchema, DesignerComponentInstance, DesignerItemContext,
+    canvasChanged, setPositionForSelectedElement, setPositionOfButtonGroup,
+    DesignerHostService, DesignerHTMLElement
+} from '@farris/ui-vue/components/designer-canvas';
+import { getSchemaByType } from '@farris/ui-vue/components/dynamic-resolver';
 import { TabPageContext, ToolbarItemService, UseDesignTabs } from '../composition/types';
-import { ComponentSchema, DesignerComponentInstance, DesignerItemContext } from '../../../designer-canvas/src/types';
-import { canvasChanged, setPositionForSelectedElement, setPositionOfButtonGroup } from '../../../designer-canvas/src/composition/designer-canvas-changed';
-import { getSchemaByType } from '../../../dynamic-resolver/src/schema-resolver';
-import { DesignerHostService, DesignerHTMLElement } from '../../../designer-canvas/src/composition/types';
+import { TabsProps } from '../tabs.props';
 
 export function useDesignTabs(
     props: TabsProps,
diff --git a/packages/ui-vue/components/tabs/src/designer/tabs.design.component.tsx b/packages/ui-vue/components/tabs/src/designer/tabs.design.component.tsx
index b44d92afe90..f7cba8d6c4d 100644
--- a/packages/ui-vue/components/tabs/src/designer/tabs.design.component.tsx
+++ b/packages/ui-vue/components/tabs/src/designer/tabs.design.component.tsx
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 import { computed, defineComponent, provide, SetupContext, onMounted, shallowRef, nextTick, ref, inject, onUnmounted } from 'vue';
+import { JSX } from 'vue/jsx-runtime';
+import { ComponentSchema, DesignerItemContext, useDesignerComponent, DesignerHostService } from '@farris/ui-vue/components/designer-canvas';
 import { TabsDesignProps, tabsDesignProps } from '../tabs.props';
 import { TabPageContext, TabsContext, ToolbarItemService } from '../composition/types';
 import getTabHeaderRender from './tab-header.design.component';
@@ -22,13 +24,9 @@ import getTabHeaderCapsuleRender from '../components/tab-header-capsule.componen
 import { useNav } from '../composition/use-nav';
 import { useDropdown } from '../composition/use-dropdown';
 import { useOnePage } from '../composition/use-one-page';
-import { ComponentSchema, DesignerItemContext } from '../../../designer-canvas/src/types';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
 import { useDesignerRules } from './tab-use-designer-rules';
 import { useDesignTabs } from './tabs-use-design';
 import tabToolbarDesignRender from './tab-toolbar.design.component';
-import { JSX } from 'vue/jsx-runtime';
-import { DesignerHostService } from '../../../designer-canvas/src/composition/types';
 import { tabHeaderItemDragula } from '../composition/tab-header-dragula';
 
 export default defineComponent({
diff --git a/packages/ui-vue/components/tabs/src/property-config/tab-page.property-config.ts b/packages/ui-vue/components/tabs/src/property-config/tab-page.property-config.ts
index ee66287df57..28d9f29d987 100644
--- a/packages/ui-vue/components/tabs/src/property-config/tab-page.property-config.ts
+++ b/packages/ui-vue/components/tabs/src/property-config/tab-page.property-config.ts
@@ -1,4 +1,4 @@
-import { BaseControlProperty } from '../../../property-panel/src/composition/entity/base-property';
+import { BaseControlProperty } from '@farris/ui-vue/components/property-panel';
 export class TabPageProperty extends BaseControlProperty {
     constructor(componentId: string, designerHostService: any) {
         super(componentId, designerHostService);
diff --git a/packages/ui-vue/components/tabs/src/property-config/tab-toolbar-item.property-config.ts b/packages/ui-vue/components/tabs/src/property-config/tab-toolbar-item.property-config.ts
index a169fb9d3e5..73fa73f8c2a 100644
--- a/packages/ui-vue/components/tabs/src/property-config/tab-toolbar-item.property-config.ts
+++ b/packages/ui-vue/components/tabs/src/property-config/tab-toolbar-item.property-config.ts
@@ -1,5 +1,4 @@
-import { PropertyChangeObject } from "../../../property-panel/src/composition/entity/property-entity";
-import { BaseControlProperty } from "../../../property-panel/src/composition/entity/base-property";
+import { BaseControlProperty } from "@farris/ui-vue/components/property-panel";
 
 export class TabToolbarItemProperty extends BaseControlProperty {
 
diff --git a/packages/ui-vue/components/tabs/src/property-config/tabs.property-config.ts b/packages/ui-vue/components/tabs/src/property-config/tabs.property-config.ts
index 260c553cfe8..f7f4894c3bb 100644
--- a/packages/ui-vue/components/tabs/src/property-config/tabs.property-config.ts
+++ b/packages/ui-vue/components/tabs/src/property-config/tabs.property-config.ts
@@ -1,4 +1,4 @@
-import { BaseControlProperty } from "../../../property-panel/src/composition/entity/base-property";
+import { BaseControlProperty } from "@farris/ui-vue/components/property-panel";
 
 export class TabsProperty extends BaseControlProperty {
     constructor(componentId: string, designerHostService: any) {
diff --git a/packages/ui-vue/components/tabs/src/schema/schema-mapper.ts b/packages/ui-vue/components/tabs/src/schema/schema-mapper.ts
index 97964aee23b..2ca33ca0806 100644
--- a/packages/ui-vue/components/tabs/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/tabs/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/tabs/src/schema/schema-resolver.ts b/packages/ui-vue/components/tabs/src/schema/schema-resolver.ts
index 8878b5c6554..60ea8956b53 100644
--- a/packages/ui-vue/components/tabs/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/tabs/src/schema/schema-resolver.ts
@@ -1,6 +1,5 @@
-import { DgControl } from "../../../designer-canvas/src/composition/dg-control";
-import { ComponentSchema, DesignerComponentInstance } from "../../../designer-canvas/src/types";
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DgControl, ComponentSchema, DesignerComponentInstance } from "@farris/ui-vue/components/designer-canvas";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 /**
  * 从工具箱拖拽创建标签页，自动创建container-section-tabs三层结构
diff --git a/packages/ui-vue/components/tabs/src/schema/tab-page-schema-mapper.ts b/packages/ui-vue/components/tabs/src/schema/tab-page-schema-mapper.ts
index 19c7cf48fb4..6b6084d0f40 100644
--- a/packages/ui-vue/components/tabs/src/schema/tab-page-schema-mapper.ts
+++ b/packages/ui-vue/components/tabs/src/schema/tab-page-schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 function resolveTabPageToolbar(key: string, value: any, resolvedSchema: any) {
 
diff --git a/packages/ui-vue/components/tabs/src/tabs.component.tsx b/packages/ui-vue/components/tabs/src/tabs.component.tsx
index c2bdf965f85..cde877f3533 100644
--- a/packages/ui-vue/components/tabs/src/tabs.component.tsx
+++ b/packages/ui-vue/components/tabs/src/tabs.component.tsx
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 import { computed, defineComponent, provide, SetupContext, onMounted, shallowRef, nextTick, ref, watch } from 'vue';
+import { JSX } from 'vue/jsx-runtime';
+import FResponseToolbar from '@farris/ui-vue/components/response-toolbar';
 import { TabsProps, tabsProps } from './tabs.props';
 import { useTabs } from './composition/use-tabs';
 import { TabPageContext, TabsContext } from './composition/types';
@@ -23,8 +25,6 @@ import getMoreButtonRender from './components/more-pages-button.component';
 import { useNav } from './composition/use-nav';
 import { useDropdown } from './composition/use-dropdown';
 import { useOnePage } from './composition/use-one-page';
-import FResponseToolbar from '@farris/ui-vue/components/response-toolbar';
-import { JSX } from 'vue/jsx-runtime';
 
 export default defineComponent({
     name: 'FTabs',
diff --git a/packages/ui-vue/components/tabs/src/tabs.props.ts b/packages/ui-vue/components/tabs/src/tabs.props.ts
index 31059385ede..5af81f516af 100644
--- a/packages/ui-vue/components/tabs/src/tabs.props.ts
+++ b/packages/ui-vue/components/tabs/src/tabs.props.ts
@@ -19,7 +19,7 @@ import { schemaMapper } from './schema/schema-mapper';
 import { schemaResolver } from './schema/schema-resolver';
 import tabsSchema from './schema/tabs.schema.json';
 import tabToolbarSchema from './schema/tab-toolbar.schema.json';
-import { ResponseToolbarProps, responseToolbarProps } from '../../response-toolbar/src/response-toolbar.props';
+import { ResponseToolbarProps, responseToolbarProps } from '@farris/ui-vue/components/response-toolbar/src/response-toolbar.props';
 import { schemaResolver as responseSchemaResolver } from '../../response-toolbar/src/schema/schema-resolver';
 
 export type TabType = 'fill' | 'pills' | 'default' | 'one-page';
-- 
Gitee


From f7bc7f6af746d19ad8e816df2998049600bc0684 Mon Sep 17 00:00:00 2001
From: hyygzds <m15966339253@163.com>
Date: Mon, 21 Jul 2025 09:32:30 +0800
Subject: [PATCH 41/62] fix: update component files

---
 eslint.config.mjs                             |   3 +-
 .../ui-vue/components/tabs/src/tabs.props.ts  |   2 +-
 pnpm-lock.yaml                                | 345 +++++++++---------
 3 files changed, 172 insertions(+), 178 deletions(-)

diff --git a/eslint.config.mjs b/eslint.config.mjs
index 3512846a8e7..80b62bf74c2 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -134,7 +134,8 @@ export default [
       'vue/require-default-prop': 'off',
       'vue/no-unused-components': 'off',
       'vue/multi-word-component-names': 'off',
-      'vue/return-in-computed-property': 'off'
+      'vue/return-in-computed-property': 'off',
+      'vue/no-ref-as-operand': 'off'
     }
   },
   // { plugins: { farrislint }, rules: { "prefer-object-spread": "off" } }
diff --git a/packages/ui-vue/components/tabs/src/tabs.props.ts b/packages/ui-vue/components/tabs/src/tabs.props.ts
index 5af81f516af..31059385ede 100644
--- a/packages/ui-vue/components/tabs/src/tabs.props.ts
+++ b/packages/ui-vue/components/tabs/src/tabs.props.ts
@@ -19,7 +19,7 @@ import { schemaMapper } from './schema/schema-mapper';
 import { schemaResolver } from './schema/schema-resolver';
 import tabsSchema from './schema/tabs.schema.json';
 import tabToolbarSchema from './schema/tab-toolbar.schema.json';
-import { ResponseToolbarProps, responseToolbarProps } from '@farris/ui-vue/components/response-toolbar/src/response-toolbar.props';
+import { ResponseToolbarProps, responseToolbarProps } from '../../response-toolbar/src/response-toolbar.props';
 import { schemaResolver as responseSchemaResolver } from '../../response-toolbar/src/schema/schema-resolver';
 
 export type TabType = 'fill' | 'pills' | 'default' | 'one-page';
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 5e6fbd3e48b..9978f2f03e8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -287,7 +287,7 @@ importers:
         version: 3.9.1(@types/node@18.19.57)(rollup@4.24.0)(typescript@5.6.3)(vite@5.4.9(@types/node@18.19.57)(sass-embedded@1.80.3)(sass@1.80.3)(terser@5.36.0))
       vite-plugin-md:
         specifier: ^0.21.5
-        version: 0.21.5(@vitejs/plugin-vue@5.1.4(vite@5.4.9(@types/node@18.19.57)(sass-embedded@1.80.3)(sass@1.80.3)(terser@5.36.0))(vue@3.5.12(typescript@5.6.3)))(happy-dom@14.12.3)(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)(vite@5.4.9(@types/node@18.19.57)(sass-embedded@1.80.3)(sass@1.80.3)(terser@5.36.0))
+        version: 0.21.5(happy-dom@14.12.3)(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)(vite@5.4.9(@types/node@18.19.57)(sass-embedded@1.80.3)(sass@1.80.3)(terser@5.36.0))
       vite-svg-loader:
         specifier: ^5.1.0
         version: 5.1.0(vue@3.5.12(typescript@5.6.3))
@@ -366,10 +366,10 @@ importers:
         version: 7.18.0(eslint@9.19.0(jiti@1.21.6))(typescript@4.9.5)
       '@vitejs/plugin-vue':
         specifier: ^4.0.0
-        version: 4.6.2(vite@4.5.5(@types/node@18.19.57)(sass@1.80.3)(terser@5.36.0))(vue@3.5.12(typescript@4.9.5))
+        version: 4.6.2(vite@4.5.5(@types/node@20.5.1)(sass@1.80.3)(terser@5.36.0))(vue@3.5.12(typescript@4.9.5))
       '@vitejs/plugin-vue-jsx':
         specifier: ^3.0.0
-        version: 3.1.0(vite@4.5.5(@types/node@18.19.57)(sass@1.80.3)(terser@5.36.0))(vue@3.5.12(typescript@4.9.5))
+        version: 3.1.0(vite@4.5.5(@types/node@20.5.1)(sass@1.80.3)(terser@5.36.0))(vue@3.5.12(typescript@4.9.5))
       '@vue/babel-plugin-jsx':
         specifier: ^1.1.1
         version: 1.2.5(@babel/core@7.25.8)
@@ -408,7 +408,7 @@ importers:
         version: 9.3.7
       jest:
         specifier: ^29.0.0
-        version: 29.7.0(@types/node@18.19.57)(ts-node@10.9.2(@types/node@18.19.57)(typescript@4.9.5))
+        version: 29.7.0(@types/node@20.5.1)(ts-node@10.9.2(@types/node@20.5.1)(typescript@4.9.5))
       lodash:
         specifier: ^4.17.21
         version: 4.17.21
@@ -444,19 +444,19 @@ importers:
         version: 4.9.5
       vite:
         specifier: ^4.1.4
-        version: 4.5.5(@types/node@18.19.57)(sass@1.80.3)(terser@5.36.0)
+        version: 4.5.5(@types/node@20.5.1)(sass@1.80.3)(terser@5.36.0)
       vite-plugin-dts:
         specifier: ^2.1.0
-        version: 2.3.0(@types/node@18.19.57)(rollup@4.24.0)(vite@4.5.5(@types/node@18.19.57)(sass@1.80.3)(terser@5.36.0))
+        version: 2.3.0(@types/node@20.5.1)(rollup@4.24.0)(vite@4.5.5(@types/node@20.5.1)(sass@1.80.3)(terser@5.36.0))
       vite-plugin-md:
         specifier: ^0.20.0
-        version: 0.20.6(@vitejs/plugin-vue@4.6.2(vite@4.5.5(@types/node@18.19.57)(sass@1.80.3)(terser@5.36.0))(vue@3.5.12(typescript@4.9.5)))(happy-dom@8.9.0)(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)(vite@4.5.5(@types/node@18.19.57)(sass@1.80.3)(terser@5.36.0))
+        version: 0.20.6(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)
       vite-svg-loader:
         specifier: ^4.0.0
         version: 4.0.0
       vitepress:
         specifier: 1.0.0-alpha.8
-        version: 1.0.0-alpha.8(@algolia/client-search@4.24.0)(@types/node@18.19.57)(react-dom@16.14.0(react@16.14.0))(react@16.14.0)(sass@1.80.3)(search-insights@2.17.2)(terser@5.36.0)(typescript@4.9.5)
+        version: 1.0.0-alpha.8(@algolia/client-search@4.24.0)(@types/node@20.5.1)(react-dom@16.14.0(react@16.14.0))(react@16.14.0)(sass@1.80.3)(search-insights@2.17.2)(terser@5.36.0)(typescript@4.9.5)
       vitepress-theme-demoblock:
         specifier: 1.4.2
         version: 1.4.2(react-dom@16.14.0(react@16.14.0))(react@16.14.0)(sass@1.80.3)(typescript@4.9.5)
@@ -668,7 +668,7 @@ importers:
         version: 3.9.1(@types/node@20.5.1)(rollup@4.24.0)(typescript@5.6.3)(vite@5.4.9(@types/node@20.5.1)(sass-embedded@1.80.3)(sass@1.80.3)(terser@5.36.0))
       vite-plugin-md:
         specifier: ^0.21.5
-        version: 0.21.5(@vitejs/plugin-vue@4.6.2(vite@5.4.9(@types/node@20.5.1)(sass-embedded@1.80.3)(sass@1.80.3)(terser@5.36.0))(vue@3.5.12(typescript@5.6.3)))(happy-dom@8.9.0)(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)(vite@5.4.9(@types/node@20.5.1)(sass-embedded@1.80.3)(sass@1.80.3)(terser@5.36.0))
+        version: 0.21.5(happy-dom@8.9.0)(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)(vite@5.4.9(@types/node@20.5.1)(sass-embedded@1.80.3)(sass@1.80.3)(terser@5.36.0))
       vite-svg-loader:
         specifier: ^5.1.0
         version: 5.1.0(vue@3.5.12(typescript@5.6.3))
@@ -805,7 +805,7 @@ importers:
         version: 7.25.7
       '@commitlint/cli':
         specifier: ^19.3.0
-        version: 19.5.0(@types/node@20.5.1)(typescript@4.9.5)
+        version: 19.5.0(@types/node@18.19.57)(typescript@4.9.5)
       '@commitlint/config-conventional':
         specifier: ^19.2.0
         version: 19.5.0
@@ -835,10 +835,10 @@ importers:
         version: 7.18.0(eslint@9.19.0(jiti@1.21.6))(typescript@4.9.5)
       '@vitejs/plugin-vue':
         specifier: ^4.2.3
-        version: 4.6.2(vite@4.5.5(@types/node@20.5.1)(sass@1.80.3)(terser@5.36.0))(vue@3.5.12(typescript@4.9.5))
+        version: 4.6.2(vite@4.5.5(@types/node@18.19.57)(sass@1.80.3)(terser@5.36.0))(vue@3.5.12(typescript@4.9.5))
       '@vitejs/plugin-vue-jsx':
         specifier: ^3.0.1
-        version: 3.1.0(vite@4.5.5(@types/node@20.5.1)(sass@1.80.3)(terser@5.36.0))(vue@3.5.12(typescript@4.9.5))
+        version: 3.1.0(vite@4.5.5(@types/node@18.19.57)(sass@1.80.3)(terser@5.36.0))(vue@3.5.12(typescript@4.9.5))
       '@vue/babel-plugin-jsx':
         specifier: ^1.1.1
         version: 1.2.5(@babel/core@7.25.8)
@@ -874,7 +874,7 @@ importers:
         version: 9.3.7
       jest:
         specifier: ^29.0.0
-        version: 29.7.0(@types/node@20.5.1)(ts-node@10.9.2(@types/node@20.5.1)(typescript@4.9.5))
+        version: 29.7.0(@types/node@18.19.57)(ts-node@10.9.2(@types/node@18.19.57)(typescript@4.9.5))
       ora:
         specifier: ^6.1.2
         version: 6.3.1
@@ -892,19 +892,19 @@ importers:
         version: 4.9.5
       vite:
         specifier: ^4.4.1
-        version: 4.5.5(@types/node@20.5.1)(sass@1.80.3)(terser@5.36.0)
+        version: 4.5.5(@types/node@18.19.57)(sass@1.80.3)(terser@5.36.0)
       vite-plugin-dts:
         specifier: ^2.1.0
-        version: 2.3.0(@types/node@20.5.1)(rollup@4.24.0)(vite@4.5.5(@types/node@20.5.1)(sass@1.80.3)(terser@5.36.0))
+        version: 2.3.0(@types/node@18.19.57)(rollup@4.24.0)(vite@4.5.5(@types/node@18.19.57)(sass@1.80.3)(terser@5.36.0))
       vite-plugin-md:
         specifier: ^0.20.0
-        version: 0.20.6(@vitejs/plugin-vue@4.6.2(vite@4.5.5(@types/node@20.5.1)(sass@1.80.3)(terser@5.36.0))(vue@3.5.12(typescript@4.9.5)))(happy-dom@8.9.0)(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)(vite@4.5.5(@types/node@20.5.1)(sass@1.80.3)(terser@5.36.0))
+        version: 0.20.6(@vitejs/plugin-vue@4.6.2(vite@4.5.5(@types/node@18.19.57)(sass@1.80.3)(terser@5.36.0))(vue@3.5.12(typescript@4.9.5)))(happy-dom@8.9.0)(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)(vite@4.5.5(@types/node@18.19.57)(sass@1.80.3)(terser@5.36.0))
       vite-svg-loader:
         specifier: ^4.0.0
         version: 4.0.0
       vitepress:
         specifier: 1.0.0-alpha.8
-        version: 1.0.0-alpha.8(@algolia/client-search@4.24.0)(@types/node@20.5.1)(react-dom@16.14.0(react@16.14.0))(react@16.14.0)(sass@1.80.3)(search-insights@2.17.2)(terser@5.36.0)(typescript@4.9.5)
+        version: 1.0.0-alpha.8(@algolia/client-search@4.24.0)(@types/node@18.19.57)(react-dom@16.14.0(react@16.14.0))(react@16.14.0)(sass@1.80.3)(search-insights@2.17.2)(terser@5.36.0)(typescript@4.9.5)
       vitepress-theme-demoblock:
         specifier: 1.4.2
         version: 1.4.2(react-dom@16.14.0(react@16.14.0))(react@16.14.0)(sass@1.80.3)(typescript@4.9.5)
@@ -992,10 +992,10 @@ importers:
         version: 7.18.0(eslint@9.19.0(jiti@1.21.6))(typescript@4.9.5)
       '@vitejs/plugin-vue':
         specifier: ^4.0.0
-        version: 4.6.2(vite@4.5.5(@types/node@20.5.1)(sass@1.80.3)(terser@5.36.0))(vue@3.5.12(typescript@4.9.5))
+        version: 4.6.2(vite@4.5.5(@types/node@18.19.57)(sass@1.80.3)(terser@5.36.0))(vue@3.5.12(typescript@4.9.5))
       '@vitejs/plugin-vue-jsx':
         specifier: ^3.0.0
-        version: 3.1.0(vite@4.5.5(@types/node@20.5.1)(sass@1.80.3)(terser@5.36.0))(vue@3.5.12(typescript@4.9.5))
+        version: 3.1.0(vite@4.5.5(@types/node@18.19.57)(sass@1.80.3)(terser@5.36.0))(vue@3.5.12(typescript@4.9.5))
       '@vue/babel-plugin-jsx':
         specifier: ^1.1.1
         version: 1.2.5(@babel/core@7.25.8)
@@ -1034,7 +1034,7 @@ importers:
         version: 9.3.7
       jest:
         specifier: ^29.0.0
-        version: 29.7.0(@types/node@20.5.1)(ts-node@10.9.2(@types/node@20.5.1)(typescript@4.9.5))
+        version: 29.7.0(@types/node@18.19.57)(ts-node@10.9.2(@types/node@18.19.57)(typescript@4.9.5))
       lodash:
         specifier: ^4.17.21
         version: 4.17.21
@@ -1070,19 +1070,19 @@ importers:
         version: 4.9.5
       vite:
         specifier: ^4.1.4
-        version: 4.5.5(@types/node@20.5.1)(sass@1.80.3)(terser@5.36.0)
+        version: 4.5.5(@types/node@18.19.57)(sass@1.80.3)(terser@5.36.0)
       vite-plugin-dts:
         specifier: ^2.1.0
-        version: 2.3.0(@types/node@20.5.1)(rollup@4.24.0)(vite@4.5.5(@types/node@20.5.1)(sass@1.80.3)(terser@5.36.0))
+        version: 2.3.0(@types/node@18.19.57)(rollup@4.24.0)(vite@4.5.5(@types/node@18.19.57)(sass@1.80.3)(terser@5.36.0))
       vite-plugin-md:
         specifier: ^0.20.0
-        version: 0.20.6(@vitejs/plugin-vue@4.6.2(vite@4.5.5(@types/node@20.5.1)(sass@1.80.3)(terser@5.36.0))(vue@3.5.12(typescript@4.9.5)))(happy-dom@8.9.0)(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)(vite@4.5.5(@types/node@20.5.1)(sass@1.80.3)(terser@5.36.0))
+        version: 0.20.6(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)
       vite-svg-loader:
         specifier: ^4.0.0
         version: 4.0.0
       vitepress:
         specifier: 1.0.0-alpha.8
-        version: 1.0.0-alpha.8(@algolia/client-search@4.24.0)(@types/node@20.5.1)(react-dom@16.14.0(react@16.14.0))(react@16.14.0)(sass@1.80.3)(search-insights@2.17.2)(terser@5.36.0)(typescript@4.9.5)
+        version: 1.0.0-alpha.8(@algolia/client-search@4.24.0)(@types/node@18.19.57)(react-dom@16.14.0(react@16.14.0))(react@16.14.0)(sass@1.80.3)(search-insights@2.17.2)(terser@5.36.0)(typescript@4.9.5)
       vitepress-theme-demoblock:
         specifier: 1.4.2
         version: 1.4.2(react-dom@16.14.0(react@16.14.0))(react@16.14.0)(sass@1.80.3)(typescript@4.9.5)
@@ -1306,7 +1306,7 @@ importers:
         version: 2.3.0(@types/node@20.5.1)(rollup@4.24.0)(vite@4.5.5(@types/node@20.5.1)(sass@1.80.3)(terser@5.36.0))
       vite-plugin-md:
         specifier: ^0.20.0
-        version: 0.20.6(@vitejs/plugin-vue@4.6.2(vite@4.5.5(@types/node@20.5.1)(sass@1.80.3)(terser@5.36.0))(vue@3.5.12(typescript@4.9.5)))(happy-dom@8.9.0)(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)(vite@4.5.5(@types/node@20.5.1)(sass@1.80.3)(terser@5.36.0))
+        version: 0.20.6(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)
       vite-svg-loader:
         specifier: ^4.0.0
         version: 4.0.0
@@ -1527,7 +1527,7 @@ importers:
         version: 2.3.0(@types/node@20.5.1)(rollup@4.24.0)(vite@4.5.5(@types/node@20.5.1)(sass@1.80.3)(terser@5.36.0))
       vite-plugin-md:
         specifier: ^0.20.0
-        version: 0.20.6(@vitejs/plugin-vue@4.6.2(vite@4.5.5(@types/node@20.5.1)(sass@1.80.3)(terser@5.36.0))(vue@3.5.12(typescript@4.9.5)))(happy-dom@8.9.0)(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)(vite@4.5.5(@types/node@20.5.1)(sass@1.80.3)(terser@5.36.0))
+        version: 0.20.6(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)
       vite-svg-loader:
         specifier: ^4.0.0
         version: 4.0.0
@@ -1687,7 +1687,7 @@ importers:
         version: 2.3.0(@types/node@20.5.1)(rollup@4.24.0)(vite@4.5.5(@types/node@20.5.1)(sass@1.80.3)(terser@5.36.0))
       vite-plugin-md:
         specifier: ^0.20.0
-        version: 0.20.6(@vitejs/plugin-vue@4.6.2(vite@4.5.5(@types/node@20.5.1)(sass@1.80.3)(terser@5.36.0))(vue@3.5.12(typescript@4.9.5)))(happy-dom@8.9.0)(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)(vite@4.5.5(@types/node@20.5.1)(sass@1.80.3)(terser@5.36.0))
+        version: 0.20.6(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)
       vite-svg-loader:
         specifier: ^4.0.0
         version: 4.0.0
@@ -1953,7 +1953,7 @@ importers:
         version: 2.3.0(@types/node@20.5.1)(rollup@4.24.0)(vite@4.5.5(@types/node@20.5.1)(sass@1.80.3)(terser@5.36.0))
       vite-plugin-md:
         specifier: ^0.20.0
-        version: 0.20.6(@vitejs/plugin-vue@4.6.2(vite@4.5.5(@types/node@20.5.1)(sass@1.80.3)(terser@5.36.0))(vue@3.5.12(typescript@4.9.5)))(happy-dom@8.9.0)(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)(vite@4.5.5(@types/node@20.5.1)(sass@1.80.3)(terser@5.36.0))
+        version: 0.20.6(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)
       vite-svg-loader:
         specifier: ^4.0.0
         version: 4.0.0
@@ -2057,6 +2057,9 @@ importers:
       '@docsearch/js':
         specifier: 3.6.0
         version: 3.6.0(@algolia/client-search@4.24.0)(react-dom@16.14.0(react@16.14.0))(react@16.14.0)(search-insights@2.17.2)
+      '@farris/designer-dragula':
+        specifier: 0.0.5
+        version: 0.0.5
       '@monaco-editor/loader':
         specifier: ^1.4.0
         version: 1.4.0(monaco-editor@0.52.2)
@@ -2121,9 +2124,6 @@ importers:
       '@farris/cli':
         specifier: workspace:*
         version: link:../cli
-      '@farris/designer-dragula':
-        specifier: 0.0.5
-        version: 0.0.5
       '@testing-library/vue':
         specifier: ^7.0.0
         version: 7.0.0(@vue/compiler-sfc@3.5.12)(vue@3.5.12(typescript@5.6.3))
@@ -2207,7 +2207,7 @@ importers:
         version: 0.8.0
       vite-plugin-md:
         specifier: ^0.21.5
-        version: 0.21.5(@vitejs/plugin-vue@4.6.2(vite@5.4.9(@types/node@20.5.1)(sass-embedded@1.80.3)(sass@1.80.3)(terser@5.36.0))(vue@3.5.12(typescript@5.6.3)))(happy-dom@8.9.0)(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)(vite@5.4.9(@types/node@20.5.1)(sass-embedded@1.80.3)(sass@1.80.3)(terser@5.36.0))
+        version: 0.21.5(happy-dom@8.9.0)(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)(vite@5.4.9(@types/node@20.5.1)(sass-embedded@1.80.3)(sass@1.80.3)(terser@5.36.0))
       vite-svg-loader:
         specifier: ^5.1.0
         version: 5.1.0(vue@3.5.12(typescript@5.6.3))
@@ -3903,6 +3903,7 @@ packages:
 
   '@ls-lint/ls-lint@2.2.3':
     resolution: {integrity: sha512-ekM12jNm/7O2I/hsRv9HvYkRdfrHpiV1epVuI2NP+eTIcEgdIdKkKCs9KgQydu/8R5YXTov9aHdOgplmCHLupw==}
+    cpu: [x64, arm64, s390x]
     os: [darwin, linux, win32]
     hasBin: true
 
@@ -12779,6 +12780,19 @@ snapshots:
       - '@swc/core'
       - '@swc/wasm'
 
+  '@commitlint/cli@19.5.0(@types/node@18.19.57)(typescript@4.9.5)':
+    dependencies:
+      '@commitlint/format': 19.5.0
+      '@commitlint/lint': 19.5.0
+      '@commitlint/load': 19.5.0(@types/node@18.19.57)(typescript@4.9.5)
+      '@commitlint/read': 19.5.0
+      '@commitlint/types': 19.5.0
+      tinyexec: 0.3.1
+      yargs: 17.7.2
+    transitivePeerDependencies:
+      - '@types/node'
+      - typescript
+
   '@commitlint/cli@19.5.0(@types/node@18.19.57)(typescript@5.6.3)':
     dependencies:
       '@commitlint/format': 19.5.0
@@ -12900,6 +12914,22 @@ snapshots:
       - '@swc/core'
       - '@swc/wasm'
 
+  '@commitlint/load@19.5.0(@types/node@18.19.57)(typescript@4.9.5)':
+    dependencies:
+      '@commitlint/config-validator': 19.5.0
+      '@commitlint/execute-rule': 19.5.0
+      '@commitlint/resolve-extends': 19.5.0
+      '@commitlint/types': 19.5.0
+      chalk: 5.3.0
+      cosmiconfig: 9.0.0(typescript@4.9.5)
+      cosmiconfig-typescript-loader: 5.1.0(@types/node@18.19.57)(cosmiconfig@9.0.0(typescript@4.9.5))(typescript@4.9.5)
+      lodash.isplainobject: 4.0.6
+      lodash.merge: 4.6.2
+      lodash.uniq: 4.5.0
+    transitivePeerDependencies:
+      - '@types/node'
+      - typescript
+
   '@commitlint/load@19.5.0(@types/node@18.19.57)(typescript@5.6.3)':
     dependencies:
       '@commitlint/config-validator': 19.5.0
@@ -13733,6 +13763,41 @@ snapshots:
       - supports-color
       - ts-node
 
+  '@jest/core@29.7.0(ts-node@10.9.2(@types/node@20.5.1)(typescript@5.6.3))':
+    dependencies:
+      '@jest/console': 29.7.0
+      '@jest/reporters': 29.7.0
+      '@jest/test-result': 29.7.0
+      '@jest/transform': 29.7.0
+      '@jest/types': 29.6.3
+      '@types/node': 18.19.57
+      ansi-escapes: 4.3.2
+      chalk: 4.1.2
+      ci-info: 3.9.0
+      exit: 0.1.2
+      graceful-fs: 4.2.11
+      jest-changed-files: 29.7.0
+      jest-config: 29.7.0(@types/node@18.19.57)(ts-node@10.9.2(@types/node@20.5.1)(typescript@5.6.3))
+      jest-haste-map: 29.7.0
+      jest-message-util: 29.7.0
+      jest-regex-util: 29.6.3
+      jest-resolve: 29.7.0
+      jest-resolve-dependencies: 29.7.0
+      jest-runner: 29.7.0
+      jest-runtime: 29.7.0
+      jest-snapshot: 29.7.0
+      jest-util: 29.7.0
+      jest-validate: 29.7.0
+      jest-watcher: 29.7.0
+      micromatch: 4.0.8
+      pretty-format: 29.7.0
+      slash: 3.0.0
+      strip-ansi: 6.0.1
+    transitivePeerDependencies:
+      - babel-plugin-macros
+      - supports-color
+      - ts-node
+
   '@jest/environment@29.7.0':
     dependencies:
       '@jest/fake-timers': 29.7.0
@@ -15478,71 +15543,19 @@ snapshots:
       - terser
       - vite
 
-  '@yankeeinlondon/builder-api@1.4.1(@vitejs/plugin-vue@4.6.2(vite@4.5.5(@types/node@20.5.1)(sass@1.80.3)(terser@5.36.0))(vue@3.5.12(typescript@4.9.5)))(happy-dom@8.9.0)(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)(vite@4.5.5(@types/node@20.5.1)(sass@1.80.3)(terser@5.36.0))':
-    dependencies:
-      '@types/markdown-it': 12.2.3
-      '@yankeeinlondon/happy-wrapper': 2.10.1(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)
-      fp-ts: 2.16.9
-      inferred-types: 0.37.6(happy-dom@8.9.0)(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)
-      markdown-it: 13.0.2
-      vite-plugin-md: 0.22.5(@vitejs/plugin-vue@4.6.2(vite@4.5.5(@types/node@20.5.1)(sass@1.80.3)(terser@5.36.0))(vue@3.5.12(typescript@4.9.5)))(happy-dom@8.9.0)(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)(vite@4.5.5(@types/node@20.5.1)(sass@1.80.3)(terser@5.36.0))
-    transitivePeerDependencies:
-      - '@edge-runtime/vm'
-      - '@vitejs/plugin-vue'
-      - '@vitest/browser'
-      - '@vitest/ui'
-      - encoding
-      - happy-dom
-      - jsdom
-      - less
-      - lightningcss
-      - sass
-      - stylus
-      - sugarss
-      - supports-color
-      - terser
-      - vite
-
-  '@yankeeinlondon/builder-api@1.4.1(@vitejs/plugin-vue@4.6.2(vite@5.4.9(@types/node@20.5.1)(sass-embedded@1.80.3)(sass@1.80.3)(terser@5.36.0))(vue@3.5.12(typescript@5.6.3)))(happy-dom@8.9.0)(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)(vite@5.4.9(@types/node@20.5.1)(sass-embedded@1.80.3)(sass@1.80.3)(terser@5.36.0))':
-    dependencies:
-      '@types/markdown-it': 12.2.3
-      '@yankeeinlondon/happy-wrapper': 2.10.1(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)
-      fp-ts: 2.16.9
-      inferred-types: 0.37.6(happy-dom@8.9.0)(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)
-      markdown-it: 13.0.2
-      vite-plugin-md: 0.22.5(@vitejs/plugin-vue@4.6.2(vite@5.4.9(@types/node@20.5.1)(sass-embedded@1.80.3)(sass@1.80.3)(terser@5.36.0))(vue@3.5.12(typescript@5.6.3)))(happy-dom@8.9.0)(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)(vite@5.4.9(@types/node@20.5.1)(sass-embedded@1.80.3)(sass@1.80.3)(terser@5.36.0))
-    transitivePeerDependencies:
-      - '@edge-runtime/vm'
-      - '@vitejs/plugin-vue'
-      - '@vitest/browser'
-      - '@vitest/ui'
-      - encoding
-      - happy-dom
-      - jsdom
-      - less
-      - lightningcss
-      - sass
-      - stylus
-      - sugarss
-      - supports-color
-      - terser
-      - vite
-
-  '@yankeeinlondon/builder-api@1.4.1(@vitejs/plugin-vue@5.1.4(vite@5.4.9(@types/node@18.19.57)(sass-embedded@1.80.3)(sass@1.80.3)(terser@5.36.0))(vue@3.5.12(typescript@5.6.3)))(happy-dom@14.12.3)(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)(vite@5.4.9(@types/node@18.19.57)(sass-embedded@1.80.3)(sass@1.80.3)(terser@5.36.0))':
+  '@yankeeinlondon/builder-api@1.4.1(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)':
     dependencies:
       '@types/markdown-it': 12.2.3
       '@yankeeinlondon/happy-wrapper': 2.10.1(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)
       fp-ts: 2.16.9
       inferred-types: 0.37.6(happy-dom@14.12.3)(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)
       markdown-it: 13.0.2
-      vite-plugin-md: 0.22.5(@vitejs/plugin-vue@5.1.4(vite@5.4.9(@types/node@18.19.57)(sass-embedded@1.80.3)(sass@1.80.3)(terser@5.36.0))(vue@3.5.12(typescript@5.6.3)))(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)(vite@5.4.9(@types/node@18.19.57)(sass-embedded@1.80.3)(sass@1.80.3)(terser@5.36.0))
+      vite-plugin-md: 0.22.5(@vitejs/plugin-vue@4.6.2(vite@4.5.5(@types/node@18.19.57)(sass@1.80.3)(terser@5.36.0))(vue@3.5.12(typescript@4.9.5)))(happy-dom@8.9.0)(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)(vite@4.5.5(@types/node@18.19.57)(sass@1.80.3)(terser@5.36.0))
     transitivePeerDependencies:
       - '@edge-runtime/vm'
-      - '@vitejs/plugin-vue'
       - '@vitest/browser'
       - '@vitest/ui'
       - encoding
-      - happy-dom
       - jsdom
       - less
       - lightningcss
@@ -15551,7 +15564,6 @@ snapshots:
       - sugarss
       - supports-color
       - terser
-      - vite
 
   '@yankeeinlondon/gray-matter@6.2.1(happy-dom@14.12.3)(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)':
     dependencies:
@@ -17056,6 +17068,13 @@ snapshots:
       ts-node: 10.9.2(@types/node@20.5.1)(typescript@5.6.3)
       typescript: 5.6.3
 
+  cosmiconfig-typescript-loader@5.1.0(@types/node@18.19.57)(cosmiconfig@9.0.0(typescript@4.9.5))(typescript@4.9.5):
+    dependencies:
+      '@types/node': 18.19.57
+      cosmiconfig: 9.0.0(typescript@4.9.5)
+      jiti: 1.21.6
+      typescript: 4.9.5
+
   cosmiconfig-typescript-loader@5.1.0(@types/node@18.19.57)(cosmiconfig@9.0.0(typescript@5.6.3))(typescript@5.6.3):
     dependencies:
       '@types/node': 18.19.57
@@ -19745,7 +19764,7 @@ snapshots:
 
   jest-cli@29.7.0(@types/node@20.5.1)(ts-node@10.9.2(@types/node@20.5.1)(typescript@5.6.3)):
     dependencies:
-      '@jest/core': 29.7.0(ts-node@10.9.2(@types/node@18.19.57)(typescript@4.9.5))
+      '@jest/core': 29.7.0(ts-node@10.9.2(@types/node@20.5.1)(typescript@5.6.3))
       '@jest/test-result': 29.7.0
       '@jest/types': 29.6.3
       chalk: 4.1.2
@@ -19788,7 +19807,7 @@ snapshots:
       strip-json-comments: 3.1.1
     optionalDependencies:
       '@types/node': 18.19.57
-      ts-node: 10.9.2(@types/node@20.5.1)(typescript@5.6.3)
+      ts-node: 10.9.2(@types/node@18.19.57)(typescript@4.9.5)
     transitivePeerDependencies:
       - babel-plugin-macros
       - supports-color
@@ -19855,6 +19874,37 @@ snapshots:
       - babel-plugin-macros
       - supports-color
 
+  jest-config@29.7.0(@types/node@18.19.57)(ts-node@10.9.2(@types/node@20.5.1)(typescript@5.6.3)):
+    dependencies:
+      '@babel/core': 7.25.8
+      '@jest/test-sequencer': 29.7.0
+      '@jest/types': 29.6.3
+      babel-jest: 29.7.0(@babel/core@7.25.8)
+      chalk: 4.1.2
+      ci-info: 3.9.0
+      deepmerge: 4.3.1
+      glob: 7.2.3
+      graceful-fs: 4.2.11
+      jest-circus: 29.7.0
+      jest-environment-node: 29.7.0
+      jest-get-type: 29.6.3
+      jest-regex-util: 29.6.3
+      jest-resolve: 29.7.0
+      jest-runner: 29.7.0
+      jest-util: 29.7.0
+      jest-validate: 29.7.0
+      micromatch: 4.0.8
+      parse-json: 5.2.0
+      pretty-format: 29.7.0
+      slash: 3.0.0
+      strip-json-comments: 3.1.1
+    optionalDependencies:
+      '@types/node': 18.19.57
+      ts-node: 10.9.2(@types/node@20.5.1)(typescript@5.6.3)
+    transitivePeerDependencies:
+      - babel-plugin-macros
+      - supports-color
+
   jest-config@29.7.0(@types/node@20.5.1)(ts-node@10.9.2(@types/node@20.5.1)(typescript@4.9.5)):
     dependencies:
       '@babel/core': 7.25.8
@@ -20194,7 +20244,7 @@ snapshots:
 
   jest@29.7.0(@types/node@20.5.1)(ts-node@10.9.2(@types/node@20.5.1)(typescript@5.6.3)):
     dependencies:
-      '@jest/core': 29.7.0(ts-node@10.9.2(@types/node@18.19.57)(typescript@4.9.5))
+      '@jest/core': 29.7.0(ts-node@10.9.2(@types/node@20.5.1)(typescript@5.6.3))
       '@jest/types': 29.6.3
       import-local: 3.2.0
       jest-cli: 29.7.0(@types/node@20.5.1)(ts-node@10.9.2(@types/node@20.5.1)(typescript@5.6.3))
@@ -22941,6 +22991,25 @@ snapshots:
       '@ts-morph/common': 0.19.0
       code-block-writer: 12.0.0
 
+  ts-node@10.9.2(@types/node@18.19.57)(typescript@4.9.5):
+    dependencies:
+      '@cspotcode/source-map-support': 0.8.1
+      '@tsconfig/node10': 1.0.11
+      '@tsconfig/node12': 1.0.11
+      '@tsconfig/node14': 1.0.3
+      '@tsconfig/node16': 1.0.4
+      '@types/node': 18.19.57
+      acorn: 8.13.0
+      acorn-walk: 8.3.4
+      arg: 4.1.3
+      create-require: 1.1.1
+      diff: 4.0.2
+      make-error: 1.3.6
+      typescript: 4.9.5
+      v8-compile-cache-lib: 3.0.1
+      yn: 3.1.1
+    optional: true
+
   ts-node@10.9.2(@types/node@18.19.57)(typescript@5.6.3):
     dependencies:
       '@cspotcode/source-map-support': 0.8.1
@@ -23490,20 +23559,18 @@ snapshots:
       - terser
       - vite
 
-  vite-plugin-md@0.20.6(@vitejs/plugin-vue@4.6.2(vite@4.5.5(@types/node@20.5.1)(sass@1.80.3)(terser@5.36.0))(vue@3.5.12(typescript@4.9.5)))(happy-dom@8.9.0)(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)(vite@4.5.5(@types/node@20.5.1)(sass@1.80.3)(terser@5.36.0)):
+  vite-plugin-md@0.20.6(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0):
     dependencies:
-      '@yankeeinlondon/builder-api': 1.4.1(@vitejs/plugin-vue@4.6.2(vite@4.5.5(@types/node@20.5.1)(sass@1.80.3)(terser@5.36.0))(vue@3.5.12(typescript@4.9.5)))(happy-dom@8.9.0)(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)(vite@4.5.5(@types/node@20.5.1)(sass@1.80.3)(terser@5.36.0))
+      '@yankeeinlondon/builder-api': 1.4.1(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)
       '@yankeeinlondon/happy-wrapper': 2.10.1(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)
       gray-matter: 4.0.3
       markdown-it: 13.0.2
       source-map-js: 1.2.1
     transitivePeerDependencies:
       - '@edge-runtime/vm'
-      - '@vitejs/plugin-vue'
       - '@vitest/browser'
       - '@vitest/ui'
       - encoding
-      - happy-dom
       - jsdom
       - less
       - lightningcss
@@ -23512,19 +23579,17 @@ snapshots:
       - sugarss
       - supports-color
       - terser
-      - vite
 
-  vite-plugin-md@0.21.5(@vitejs/plugin-vue@4.6.2(vite@5.4.9(@types/node@20.5.1)(sass-embedded@1.80.3)(sass@1.80.3)(terser@5.36.0))(vue@3.5.12(typescript@5.6.3)))(happy-dom@8.9.0)(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)(vite@5.4.9(@types/node@20.5.1)(sass-embedded@1.80.3)(sass@1.80.3)(terser@5.36.0)):
+  vite-plugin-md@0.21.5(happy-dom@14.12.3)(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)(vite@5.4.9(@types/node@18.19.57)(sass-embedded@1.80.3)(sass@1.80.3)(terser@5.36.0)):
     dependencies:
-      '@yankeeinlondon/builder-api': 1.4.1(@vitejs/plugin-vue@4.6.2(vite@5.4.9(@types/node@20.5.1)(sass-embedded@1.80.3)(sass@1.80.3)(terser@5.36.0))(vue@3.5.12(typescript@5.6.3)))(happy-dom@8.9.0)(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)(vite@5.4.9(@types/node@20.5.1)(sass-embedded@1.80.3)(sass@1.80.3)(terser@5.36.0))
-      '@yankeeinlondon/gray-matter': 6.2.1(happy-dom@8.9.0)(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)
+      '@yankeeinlondon/builder-api': 1.4.1(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)
+      '@yankeeinlondon/gray-matter': 6.2.1(happy-dom@14.12.3)(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)
       '@yankeeinlondon/happy-wrapper': 2.10.1(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)
       markdown-it: 13.0.2
       source-map-js: 1.2.1
-      vite: 5.4.9(@types/node@20.5.1)(sass-embedded@1.80.3)(sass@1.80.3)(terser@5.36.0)
+      vite: 5.4.9(@types/node@18.19.57)(sass-embedded@1.80.3)(sass@1.80.3)(terser@5.36.0)
     transitivePeerDependencies:
       - '@edge-runtime/vm'
-      - '@vitejs/plugin-vue'
       - '@vitest/browser'
       - '@vitest/ui'
       - encoding
@@ -23538,17 +23603,16 @@ snapshots:
       - supports-color
       - terser
 
-  vite-plugin-md@0.21.5(@vitejs/plugin-vue@5.1.4(vite@5.4.9(@types/node@18.19.57)(sass-embedded@1.80.3)(sass@1.80.3)(terser@5.36.0))(vue@3.5.12(typescript@5.6.3)))(happy-dom@14.12.3)(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)(vite@5.4.9(@types/node@18.19.57)(sass-embedded@1.80.3)(sass@1.80.3)(terser@5.36.0)):
+  vite-plugin-md@0.21.5(happy-dom@8.9.0)(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)(vite@5.4.9(@types/node@20.5.1)(sass-embedded@1.80.3)(sass@1.80.3)(terser@5.36.0)):
     dependencies:
-      '@yankeeinlondon/builder-api': 1.4.1(@vitejs/plugin-vue@5.1.4(vite@5.4.9(@types/node@18.19.57)(sass-embedded@1.80.3)(sass@1.80.3)(terser@5.36.0))(vue@3.5.12(typescript@5.6.3)))(happy-dom@14.12.3)(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)(vite@5.4.9(@types/node@18.19.57)(sass-embedded@1.80.3)(sass@1.80.3)(terser@5.36.0))
-      '@yankeeinlondon/gray-matter': 6.2.1(happy-dom@14.12.3)(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)
+      '@yankeeinlondon/builder-api': 1.4.1(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)
+      '@yankeeinlondon/gray-matter': 6.2.1(happy-dom@8.9.0)(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)
       '@yankeeinlondon/happy-wrapper': 2.10.1(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)
       markdown-it: 13.0.2
       source-map-js: 1.2.1
-      vite: 5.4.9(@types/node@18.19.57)(sass-embedded@1.80.3)(sass@1.80.3)(terser@5.36.0)
+      vite: 5.4.9(@types/node@20.5.1)(sass-embedded@1.80.3)(sass@1.80.3)(terser@5.36.0)
     transitivePeerDependencies:
       - '@edge-runtime/vm'
-      - '@vitejs/plugin-vue'
       - '@vitest/browser'
       - '@vitest/ui'
       - encoding
@@ -23586,77 +23650,6 @@ snapshots:
       - supports-color
       - terser
 
-  vite-plugin-md@0.22.5(@vitejs/plugin-vue@4.6.2(vite@4.5.5(@types/node@20.5.1)(sass@1.80.3)(terser@5.36.0))(vue@3.5.12(typescript@4.9.5)))(happy-dom@8.9.0)(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)(vite@4.5.5(@types/node@20.5.1)(sass@1.80.3)(terser@5.36.0)):
-    dependencies:
-      '@vitejs/plugin-vue': 4.6.2(vite@4.5.5(@types/node@20.5.1)(sass@1.80.3)(terser@5.36.0))(vue@3.5.12(typescript@4.9.5))
-      '@yankeeinlondon/builder-api': 1.4.1(@vitejs/plugin-vue@4.6.2(vite@4.5.5(@types/node@20.5.1)(sass@1.80.3)(terser@5.36.0))(vue@3.5.12(typescript@4.9.5)))(happy-dom@8.9.0)(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)(vite@4.5.5(@types/node@20.5.1)(sass@1.80.3)(terser@5.36.0))
-      '@yankeeinlondon/gray-matter': 6.2.1(happy-dom@8.9.0)(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)
-      '@yankeeinlondon/happy-wrapper': 2.10.1(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)
-      markdown-it: 13.0.2
-      source-map-js: 1.2.1
-      vite: 4.5.5(@types/node@20.5.1)(sass@1.80.3)(terser@5.36.0)
-    transitivePeerDependencies:
-      - '@edge-runtime/vm'
-      - '@vitest/browser'
-      - '@vitest/ui'
-      - encoding
-      - happy-dom
-      - jsdom
-      - less
-      - lightningcss
-      - sass
-      - stylus
-      - sugarss
-      - supports-color
-      - terser
-
-  vite-plugin-md@0.22.5(@vitejs/plugin-vue@4.6.2(vite@5.4.9(@types/node@20.5.1)(sass-embedded@1.80.3)(sass@1.80.3)(terser@5.36.0))(vue@3.5.12(typescript@5.6.3)))(happy-dom@8.9.0)(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)(vite@5.4.9(@types/node@20.5.1)(sass-embedded@1.80.3)(sass@1.80.3)(terser@5.36.0)):
-    dependencies:
-      '@vitejs/plugin-vue': 4.6.2(vite@5.4.9(@types/node@20.5.1)(sass-embedded@1.80.3)(sass@1.80.3)(terser@5.36.0))(vue@3.5.12(typescript@5.6.3))
-      '@yankeeinlondon/builder-api': 1.4.1(@vitejs/plugin-vue@4.6.2(vite@5.4.9(@types/node@20.5.1)(sass-embedded@1.80.3)(sass@1.80.3)(terser@5.36.0))(vue@3.5.12(typescript@5.6.3)))(happy-dom@8.9.0)(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)(vite@5.4.9(@types/node@20.5.1)(sass-embedded@1.80.3)(sass@1.80.3)(terser@5.36.0))
-      '@yankeeinlondon/gray-matter': 6.2.1(happy-dom@8.9.0)(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)
-      '@yankeeinlondon/happy-wrapper': 2.10.1(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)
-      markdown-it: 13.0.2
-      source-map-js: 1.2.1
-      vite: 5.4.9(@types/node@20.5.1)(sass-embedded@1.80.3)(sass@1.80.3)(terser@5.36.0)
-    transitivePeerDependencies:
-      - '@edge-runtime/vm'
-      - '@vitest/browser'
-      - '@vitest/ui'
-      - encoding
-      - happy-dom
-      - jsdom
-      - less
-      - lightningcss
-      - sass
-      - stylus
-      - sugarss
-      - supports-color
-      - terser
-
-  vite-plugin-md@0.22.5(@vitejs/plugin-vue@5.1.4(vite@5.4.9(@types/node@18.19.57)(sass-embedded@1.80.3)(sass@1.80.3)(terser@5.36.0))(vue@3.5.12(typescript@5.6.3)))(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)(vite@5.4.9(@types/node@18.19.57)(sass-embedded@1.80.3)(sass@1.80.3)(terser@5.36.0)):
-    dependencies:
-      '@vitejs/plugin-vue': 5.1.4(vite@5.4.9(@types/node@18.19.57)(sass-embedded@1.80.3)(sass@1.80.3)(terser@5.36.0))(vue@3.5.12(typescript@5.6.3))
-      '@yankeeinlondon/builder-api': 1.4.1(@vitejs/plugin-vue@5.1.4(vite@5.4.9(@types/node@18.19.57)(sass-embedded@1.80.3)(sass@1.80.3)(terser@5.36.0))(vue@3.5.12(typescript@5.6.3)))(happy-dom@14.12.3)(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)(vite@5.4.9(@types/node@18.19.57)(sass-embedded@1.80.3)(sass@1.80.3)(terser@5.36.0))
-      '@yankeeinlondon/gray-matter': 6.2.1(happy-dom@14.12.3)(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)
-      '@yankeeinlondon/happy-wrapper': 2.10.1(jsdom@20.0.3)(sass@1.80.3)(terser@5.36.0)
-      markdown-it: 13.0.2
-      source-map-js: 1.2.1
-      vite: 5.4.9(@types/node@18.19.57)(sass-embedded@1.80.3)(sass@1.80.3)(terser@5.36.0)
-    transitivePeerDependencies:
-      - '@edge-runtime/vm'
-      - '@vitest/browser'
-      - '@vitest/ui'
-      - encoding
-      - jsdom
-      - less
-      - lightningcss
-      - sass
-      - stylus
-      - sugarss
-      - supports-color
-      - terser
-
   vite-svg-loader@4.0.0:
     dependencies:
       '@vue/compiler-sfc': 3.5.12
-- 
Gitee


From 92b9bb35bf7c94043273fff90695ed38f3b80e4c Mon Sep 17 00:00:00 2001
From: hyygzds <m15966339253@163.com>
Date: Mon, 21 Jul 2025 10:56:07 +0800
Subject: [PATCH 42/62] build: publish @farris/ui-vue@1.5.6

---
 .../components/selected-list/lookup-selected-list.props.ts    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/ui-vue/components/lookup/src/components/selected-list/lookup-selected-list.props.ts b/packages/ui-vue/components/lookup/src/components/selected-list/lookup-selected-list.props.ts
index 9bb65765092..fe2168581fa 100644
--- a/packages/ui-vue/components/lookup/src/components/selected-list/lookup-selected-list.props.ts
+++ b/packages/ui-vue/components/lookup/src/components/selected-list/lookup-selected-list.props.ts
@@ -1,8 +1,8 @@
-import { ExtractPropTypes } from "vue";
+import { ExtractPropTypes, PropType } from "vue";
 
 export const lookupSelectedListProps = {
     idField: { type: String, default: 'id' },
-    parentRef: {type: HTMLElement, default: null},
+    parentRef: {type: Object as PropType<HTMLElement>, default: null},
     popoverOffsetX: { type: Number, default: 0}
 };
 export type LookupSelectedListProps = ExtractPropTypes<typeof lookupSelectedListProps>;
-- 
Gitee


From aaee30784ffea2fe08809edbb6302d427afbfecf Mon Sep 17 00:00:00 2001
From: hyygzds <m15966339253@163.com>
Date: Mon, 21 Jul 2025 14:41:22 +0800
Subject: [PATCH 43/62] fix: export the component lookup

---
 packages/ui-vue/components/components.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/ui-vue/components/components.ts b/packages/ui-vue/components/components.ts
index e430b491872..6911912fcf2 100644
--- a/packages/ui-vue/components/components.ts
+++ b/packages/ui-vue/components/components.ts
@@ -36,7 +36,7 @@ export * from './data-view';
 export type { DataColumn, VisualData, VisualDataCell, RowOptions } from './data-view';
 export { default as FDrawer } from './drawer';
 export type { DrawerProps } from './drawer';
-export { FResponseForm, FResponseForm  as FDynamicForm, FDynamicFormGroup, FDynamicFormInput } from './dynamic-form';
+export { FResponseForm, FResponseForm as FDynamicForm, FDynamicFormGroup, FDynamicFormInput } from './dynamic-form';
 export type { EditorConfig } from './dynamic-form';
 export { default as FFilterBar } from './filter-bar';
 export type { FilterBarProps } from './filter-bar';
@@ -108,3 +108,4 @@ export { default as FSearchBox } from './search-box';
 export type { SearchBoxProps } from './search-box';
 export { default as FVerifyDetail, FVerifyDetailService } from './verify-detail';
 export type { VerifyDetailProps } from './verify-detail';
+export { default as FLookup } from './lookup';
-- 
Gitee


From 5723fd46b3f88fdc5ec5fa83dceb9002b76852a7 Mon Sep 17 00:00:00 2001
From: hyygzds <m15966339253@163.com>
Date: Mon, 21 Jul 2025 15:14:19 +0800
Subject: [PATCH 44/62] chore: publish 1.5.7

---
 packages/ui-vue/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/ui-vue/package.json b/packages/ui-vue/package.json
index 9838dd43ea2..b8ec230214f 100644
--- a/packages/ui-vue/package.json
+++ b/packages/ui-vue/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@farris/ui-vue",
-    "version": "1.1.7",
+    "version": "1.5.7",
     "license": "Apache-2.0",
     "description": "Farris Vue, a Farris Design based Vue3 component library.",
     "keywords": [
-- 
Gitee


From 5f750db0c38ba32f989aeac8ab4ab95a91d33447 Mon Sep 17 00:00:00 2001
From: hyygzds <m15966339253@163.com>
Date: Fri, 25 Jul 2025 09:46:05 +0800
Subject: [PATCH 45/62] build: build components and designer components at the
 same time

---
 packages/ui-vue/package.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/ui-vue/package.json b/packages/ui-vue/package.json
index b8ec230214f..89417d8c04a 100644
--- a/packages/ui-vue/package.json
+++ b/packages/ui-vue/package.json
@@ -23,7 +23,7 @@
         "dev": "vite",
         "check": "vue-tsc --noEmit",
         "build": "vue-tsc --noEmit && vite build",
-        "build:lib": "node --max-old-space-size=8192 ./scripts/index.js build",
+        "build:lib": "node --max-old-space-size=8192 ./scripts/index.js build && node --max-old-space-size=8192 ./scripts/designer-index.js build",
         "build:designerlib": "node --max-old-space-size=8192 ./scripts/designer-index.js build",
         "preview": "vite preview",
         "test": "jest --config jest.config.js",
@@ -32,7 +32,8 @@
         "docs:dev": "vitepress dev docs --host 0.0.0.0",
         "docs:build": "vitepress build docs && cp -r ./docs/components/list-view/assets ./docs/.vitepress/dist/components/list-view/ && cp ./docs/assets/farris*.png ./docs/.vitepress/dist/assets",
         "docs:serve": "vitepress serve docs",
-        "build:system": "farris-cli build-lib -ep"
+        "build:system": "farris-cli build-lib -ep",
+        "build:all": "npm run build:lib && npm run build:designerlib"
     },
     "dependencies": {
         "@docsearch/js": "3.6.0",
-- 
Gitee


From b9b50e3f1eefca573b1139c49cd7fc09fddceffb Mon Sep 17 00:00:00 2001
From: hyygzds <m15966339253@163.com>
Date: Fri, 25 Jul 2025 16:47:13 +0800
Subject: [PATCH 46/62] build: optimize tab and toolbar

---
 .../designer-canvas/src/components/maps.ts    |  4 +-
 .../src/designer/drawer.design.component.tsx  |  2 +-
 .../dynamic-view/src/components/maps.ts       |  4 +-
 .../designer/page-header.design.component.tsx |  2 +-
 .../components/response-toolbar/designer.ts   | 21 ++++++++
 .../components/response-toolbar/index.ts      | 30 +++---------
 .../button/toolbar-button.component.tsx       |  2 +-
 .../toolbar-dropdown-menu.component.tsx       |  2 +-
 .../dropdown/toolbar-dropdown.component.tsx   |  2 +-
 .../src/composition/toolbar-item-dragula.ts   |  6 +--
 .../response-toolbar/src/composition/types.ts |  2 +-
 .../src/composition/use-icon.ts               |  2 +-
 ...response-toolbar-item.design.component.tsx | 48 +++++++++----------
 .../response-toolbar.design.component.tsx     | 17 +++----
 .../designer/response-toolbar.design.props.ts | 43 +++++++++++++++++
 ...toolbar-dropdown-menu.design.component.tsx |  2 +-
 .../src/designer/use-designer-item-rules.ts   | 15 +++---
 .../src/designer/use-designer-rules.ts        |  5 +-
 .../response-toolbar-item.property-config.ts  |  2 +-
 .../response-toolbar.property-config.ts       |  2 +-
 .../src/response-toolbar.component.tsx        |  2 +-
 .../src/response-toolbar.props.ts             | 44 -----------------
 .../src/schema/schema-mapper.ts               |  2 +-
 .../src/schema/schema-resolver.ts             |  2 +-
 packages/ui-vue/components/tabs/designer.ts   | 28 +++++++++++
 packages/ui-vue/components/tabs/index.ts      | 25 +---------
 .../tabs/src/components/tab-page.props.ts     |  5 --
 .../designer/tab-page.design.component.tsx    |  2 +-
 .../src/designer/tab-page.design.props.ts     |  6 +++
 .../src/designer/tabs.design.component.tsx    |  2 +-
 .../tabs/src/designer/tabs.design.props.ts    | 19 ++++++++
 .../ui-vue/components/tabs/src/tabs.props.ts  | 19 +-------
 32 files changed, 185 insertions(+), 184 deletions(-)
 create mode 100644 packages/ui-vue/components/response-toolbar/designer.ts
 create mode 100644 packages/ui-vue/components/response-toolbar/src/designer/response-toolbar.design.props.ts
 create mode 100644 packages/ui-vue/components/tabs/designer.ts
 create mode 100644 packages/ui-vue/components/tabs/src/designer/tab-page.design.props.ts
 create mode 100644 packages/ui-vue/components/tabs/src/designer/tabs.design.props.ts

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 2e2a2651561..6d31c8351bd 100644
--- a/packages/ui-vue/components/designer-canvas/src/components/maps.ts
+++ b/packages/ui-vue/components/designer-canvas/src/components/maps.ts
@@ -32,7 +32,7 @@ import FProgress from '@farris/ui-vue/components/progress';
 import FQuerySolution from '@farris/ui-vue/components/query-solution';
 import FRadioGroup from '@farris/ui-vue/components/radio-group/designer';
 import FRate from '@farris/ui-vue/components/rate';
-import FResponseToolbar from '@farris/ui-vue/components/response-toolbar';
+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 FSearchBox from '@farris/ui-vue/components/search-box';
@@ -41,7 +41,7 @@ import FSmokeDetector from '@farris/ui-vue/components/smoke-detector';
 import FSplitter from '@farris/ui-vue/components/splitter';
 import FStep from '@farris/ui-vue/components/step';
 import FSwitch from '@farris/ui-vue/components/switch';
-import FTab from '@farris/ui-vue/components/tabs';
+import FTab from '@farris/ui-vue/components/tabs/designer';
 import FTags from '@farris/ui-vue/components/tags';
 import FText from '@farris/ui-vue/components/text';
 import FTimePicker from '@farris/ui-vue/components/time-picker';
diff --git a/packages/ui-vue/components/drawer/src/designer/drawer.design.component.tsx b/packages/ui-vue/components/drawer/src/designer/drawer.design.component.tsx
index 98206a4427e..31b0cc8cf68 100644
--- a/packages/ui-vue/components/drawer/src/designer/drawer.design.component.tsx
+++ b/packages/ui-vue/components/drawer/src/designer/drawer.design.component.tsx
@@ -17,7 +17,7 @@
 
 import { defineComponent, ref, inject, onMounted, Teleport, Transition, withModifiers, computed, watch, CSSProperties } from 'vue';
 import { DesignerItemContext, DesignerHostService, useDesignerComponent, FDesignerInnerItem } from '@farris/ui-vue/components/designer-canvas';
-import FResponseToolbarDesignComponent, { responseToolbarResolver } from '@farris/ui-vue/components/response-toolbar';
+import FResponseToolbarDesignComponent, { responseToolbarResolver } from '@farris/ui-vue/components/response-toolbar/designer';
 import { useDesignerRules } from './use-designer-rules';
 import { drawerPropsDesignerProps } from './drawer.design.props';
 
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 b8d63b0139a..67145695aee 100644
--- a/packages/ui-vue/components/dynamic-view/src/components/maps.ts
+++ b/packages/ui-vue/components/dynamic-view/src/components/maps.ts
@@ -37,7 +37,7 @@ import FProgress from '@farris/ui-vue/components/progress';
 import FQuerySolution from '@farris/ui-vue/components/query-solution';
 import FRadioGroup from '@farris/ui-vue/components/radio-group/designer';
 import FRate from '@farris/ui-vue/components/rate';
-import FResponseToolbar from '@farris/ui-vue/components/response-toolbar';
+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 FSearchBox from '@farris/ui-vue/components/search-box';
@@ -46,7 +46,7 @@ import FSmokeDetector from '@farris/ui-vue/components/smoke-detector';
 import FSplitter from '@farris/ui-vue/components/splitter';
 import FStep from '@farris/ui-vue/components/step';
 import FSwitch from '@farris/ui-vue/components/switch';
-import FTabs from '@farris/ui-vue/components/tabs';
+import FTabs from '@farris/ui-vue/components/tabs/designer';
 import FTags from '@farris/ui-vue/components/tags';
 import FText from '@farris/ui-vue/components/text';
 import FTimePicker from '@farris/ui-vue/components/time-picker';
diff --git a/packages/ui-vue/components/page-header/src/designer/page-header.design.component.tsx b/packages/ui-vue/components/page-header/src/designer/page-header.design.component.tsx
index e1a3acda361..4fadf36de71 100644
--- a/packages/ui-vue/components/page-header/src/designer/page-header.design.component.tsx
+++ b/packages/ui-vue/components/page-header/src/designer/page-header.design.component.tsx
@@ -1,9 +1,9 @@
 import { computed, defineComponent, inject, onMounted, ref, watch } from 'vue';
+import { responseToolbarResolver } from '@farris/ui-vue/components/response-toolbar/designer';
 import { PageHeaderDesignerProps, pageHeaderDesignerProps } from '../page-header.props';
 import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
 import { DesignerItemContext } from '../../../designer-canvas/src/types';
 import { useDesignerRules } from './use-designer-rules';
-import { responseToolbarResolver } from '../../../response-toolbar';
 import FResponseToolbarDesignComponent from '../../../response-toolbar/src/designer/response-toolbar.design.component';
 import FDesignerInnerItem from '../../../designer-canvas/src/components/designer-inner-item.component';
 
diff --git a/packages/ui-vue/components/response-toolbar/designer.ts b/packages/ui-vue/components/response-toolbar/designer.ts
new file mode 100644
index 00000000000..ae46adbdb27
--- /dev/null
+++ b/packages/ui-vue/components/response-toolbar/designer.ts
@@ -0,0 +1,21 @@
+import { withInstall } from '@farris/ui-vue/components/common';
+import { eventHandlerResolver, itemPropsResolver, propsResolver } from './src/designer/response-toolbar.design.props';
+import FResponseToolbar from './src/response-toolbar.component';
+import FResponseToolbarDesign from './src/designer/response-toolbar.design.component';
+import FResponseToolbarItemDesign from './src/designer/response-toolbar-item.design.component';
+export * from './src/schema/schema-resolver';
+const responseToolbarResolver = propsResolver;
+
+FResponseToolbarDesign.register = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>, resolverMap: Record<string, any>) => {
+    componentMap['response-toolbar'] = FResponseToolbar;
+    propsResolverMap['response-toolbar'] = propsResolver;
+    resolverMap['response-toolbar'] = { eventHandlerResolver };
+};
+FResponseToolbarDesign.registerDesigner = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>) => {
+    componentMap['response-toolbar'] = FResponseToolbarDesign;
+    propsResolverMap['response-toolbar'] = propsResolver;
+    componentMap['response-toolbar-item'] = FResponseToolbarItemDesign;
+    propsResolverMap['response-toolbar-item'] = itemPropsResolver;
+};
+export { responseToolbarResolver, FResponseToolbarDesign, FResponseToolbarItemDesign };
+export default withInstall(FResponseToolbarDesign);
diff --git a/packages/ui-vue/components/response-toolbar/index.ts b/packages/ui-vue/components/response-toolbar/index.ts
index e4e515aa148..923703c34da 100644
--- a/packages/ui-vue/components/response-toolbar/index.ts
+++ b/packages/ui-vue/components/response-toolbar/index.ts
@@ -1,25 +1,9 @@
-import type { App } from 'vue';
-import { ResponseToolbarDropDownItem } from './src/types/response-toolbar-dropdwon-item';
-import { ResponseToolbarGroup } from './src/types/response-toolbar-group';
-import { ResponseToolbarItem } from './src/types/response-toolbar-item';
-import { eventHandlerResolver, itemPropsResolver, propsResolver } from './src/response-toolbar.props';
-import FResponseToolbar from './src/response-toolbar.component';
-import FResponseToolbarDesign from './src/designer/response-toolbar.design.component';
-import FResponseToolbarItemDesign from './src/designer/response-toolbar-item.design.component';
 import { withInstall } from '@farris/ui-vue/components/common';
-
-const responseToolbarResolver = propsResolver;
-
-FResponseToolbar.register = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>, resolverMap: Record<string, any>) => {
-    componentMap['response-toolbar'] = FResponseToolbar;
-    propsResolverMap['response-toolbar'] = propsResolver;
-    resolverMap['response-toolbar'] = { eventHandlerResolver };
-};
-FResponseToolbar.registerDesigner = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>) => {
-    componentMap['response-toolbar'] = FResponseToolbarDesign;
-    propsResolverMap['response-toolbar'] = propsResolver;
-    componentMap['response-toolbar-item'] = FResponseToolbarItemDesign;
-    propsResolverMap['response-toolbar-item'] = itemPropsResolver;
-};
-export { FResponseToolbar, ResponseToolbarDropDownItem, ResponseToolbarGroup, ResponseToolbarItem, responseToolbarResolver };
+import FResponseToolbar from './src/response-toolbar.component';
+export { FResponseToolbar };
+export * from './src/types/response-toolbar-dropdwon-item';
+export * from './src/types/response-toolbar-group';
+export * from './src/types/response-toolbar-item';
+export * from './src/response-toolbar.props';
+export * from './src/types/response-toolbar-item';
 export default withInstall(FResponseToolbar);
diff --git a/packages/ui-vue/components/response-toolbar/src/components/button/toolbar-button.component.tsx b/packages/ui-vue/components/response-toolbar/src/components/button/toolbar-button.component.tsx
index 368016bfbf4..bdc18a1d635 100644
--- a/packages/ui-vue/components/response-toolbar/src/components/button/toolbar-button.component.tsx
+++ b/packages/ui-vue/components/response-toolbar/src/components/button/toolbar-button.component.tsx
@@ -1,8 +1,8 @@
 import { ref } from 'vue';
+import { getCustomClass } from '@farris/ui-vue/components/common';
 import { UseIcon } from '../../composition/types';
 import { ResponseToolbarProps } from '../../response-toolbar.props';
 import { ResponseToolbarItem } from '../../types/response-toolbar-item';
-import { getCustomClass } from '../../../../common';
 
 export default function (props: ResponseToolbarProps, useIconComposition: UseIcon) {
     const alignment = ref(props.alignment);
diff --git a/packages/ui-vue/components/response-toolbar/src/components/dropdown/toolbar-dropdown-menu.component.tsx b/packages/ui-vue/components/response-toolbar/src/components/dropdown/toolbar-dropdown-menu.component.tsx
index d9d2c20691b..d40c1f8a3c0 100644
--- a/packages/ui-vue/components/response-toolbar/src/components/dropdown/toolbar-dropdown-menu.component.tsx
+++ b/packages/ui-vue/components/response-toolbar/src/components/dropdown/toolbar-dropdown-menu.component.tsx
@@ -1,7 +1,7 @@
 import { getCurrentInstance, reactive } from 'vue';
+import { getCustomClass } from '@farris/ui-vue/components/common';
 import { ResponseToolbarDropDownItem } from '../../types/response-toolbar-dropdwon-item';
 import { UseIcon } from '../../composition/types';
-import { getCustomClass } from '../../../../common';
 
 export default function (context, useIconComposition: UseIcon) {
     function dropdownMenuClass(item: ResponseToolbarDropDownItem) {
diff --git a/packages/ui-vue/components/response-toolbar/src/components/dropdown/toolbar-dropdown.component.tsx b/packages/ui-vue/components/response-toolbar/src/components/dropdown/toolbar-dropdown.component.tsx
index 0ea700d624e..cab29a76678 100644
--- a/packages/ui-vue/components/response-toolbar/src/components/dropdown/toolbar-dropdown.component.tsx
+++ b/packages/ui-vue/components/response-toolbar/src/components/dropdown/toolbar-dropdown.component.tsx
@@ -1,9 +1,9 @@
 import { reactive, ref } from 'vue';
+import { getCustomClass } from '@farris/ui-vue/components/common';
 import { UseIcon } from '../../composition/types';
 import { ResponseToolbarProps } from '../../response-toolbar.props';
 import { ResponseToolbarDropDownItem } from '../../types/response-toolbar-dropdwon-item';
 import getDropdownMenu from './toolbar-dropdown-menu.component';
-import { getCustomClass } from '../../../../common';
 
 export default function (props: ResponseToolbarProps, context, useIconComposition: UseIcon) {
     const alignment = ref(props.alignment);
diff --git a/packages/ui-vue/components/response-toolbar/src/composition/toolbar-item-dragula.ts b/packages/ui-vue/components/response-toolbar/src/composition/toolbar-item-dragula.ts
index 64aec8845bc..dfaf19a6b2a 100644
--- a/packages/ui-vue/components/response-toolbar/src/composition/toolbar-item-dragula.ts
+++ b/packages/ui-vue/components/response-toolbar/src/composition/toolbar-item-dragula.ts
@@ -1,8 +1,6 @@
-import { DesignerHTMLElement } from '../../../designer-canvas/src/composition/types';
-import dragula from '@farris/designer-dragula';
-import { DesignerItemContext } from '../../../designer-canvas';
 import { nextTick } from 'vue';
-import { canvasChanged } from '../../../designer-canvas/src/composition/designer-canvas-changed';
+import dragula from '@farris/designer-dragula';
+import { DesignerHTMLElement, DesignerItemContext, canvasChanged } from '@farris/ui-vue/components/designer-canvas';
 
 export function responseToolbarItemDragula(designItemContext: DesignerItemContext) {
 
diff --git a/packages/ui-vue/components/response-toolbar/src/composition/types.ts b/packages/ui-vue/components/response-toolbar/src/composition/types.ts
index ea3074fa09b..c702c0d90c4 100644
--- a/packages/ui-vue/components/response-toolbar/src/composition/types.ts
+++ b/packages/ui-vue/components/response-toolbar/src/composition/types.ts
@@ -1,7 +1,7 @@
 import { Ref } from 'vue';
 import { ResponseToolbarDropDownItem } from '../types/response-toolbar-dropdwon-item';
 import { ResponseToolbarItem } from '../types/response-toolbar-item';
-import { ResponseToolbarItemDesignProps } from '../response-toolbar.props';
+import { ResponseToolbarItemDesignProps } from '../designer/response-toolbar.design.props';
 
 export interface UseIcon {
     iconClass: (item: ResponseToolbarItem | ResponseToolbarDropDownItem | ResponseToolbarItemDesignProps) => Record<string, boolean>;
diff --git a/packages/ui-vue/components/response-toolbar/src/composition/use-icon.ts b/packages/ui-vue/components/response-toolbar/src/composition/use-icon.ts
index b3be6848731..920474d9f99 100644
--- a/packages/ui-vue/components/response-toolbar/src/composition/use-icon.ts
+++ b/packages/ui-vue/components/response-toolbar/src/composition/use-icon.ts
@@ -1,4 +1,4 @@
-import { ResponseToolbarItemDesignProps } from '../response-toolbar.props';
+import { ResponseToolbarItemDesignProps } from '../designer/response-toolbar.design.props';
 import { ResponseToolbarDropDownItem } from '../types/response-toolbar-dropdwon-item';
 import { ResponseToolbarItem } from '../types/response-toolbar-item';
 import { UseIcon } from './types';
diff --git a/packages/ui-vue/components/response-toolbar/src/designer/response-toolbar-item.design.component.tsx b/packages/ui-vue/components/response-toolbar/src/designer/response-toolbar-item.design.component.tsx
index 39a1411f176..3be493d0015 100644
--- a/packages/ui-vue/components/response-toolbar/src/designer/response-toolbar-item.design.component.tsx
+++ b/packages/ui-vue/components/response-toolbar/src/designer/response-toolbar-item.design.component.tsx
@@ -1,12 +1,10 @@
 
-import { computed, defineComponent, ref, SetupContext, onMounted, onUnmounted, nextTick, inject } from 'vue';
-import { ResponseToolbarItemDesignProps, responseToolbarItemDesignProps } from '../response-toolbar.props';
+import { computed, defineComponent, ref, onMounted, inject } from 'vue';
+import { getCustomClass } from '@farris/ui-vue/components/common';
+import { useDesignerInnerComponent, DesignerItemContext } from '@farris/ui-vue/components/designer-canvas';
+import { ResponseToolbarItemDesignProps, responseToolbarItemDesignProps } from './response-toolbar.design.props';
 import { useIcon } from '../composition/use-icon';
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
 import { useDesignerItemRules } from './use-designer-item-rules';
-import { useDesignerInnerComponent } from '@farris/ui-vue/components/designer-canvas';
-import { getCustomClass } from '@farris/ui-vue/components/common';
-import { DesignResponseToolbarItem } from '../types/common';
 
 export default defineComponent({
     name: 'FResponseToolbarItemDesign',
@@ -50,32 +48,32 @@ export default defineComponent({
                 'btn-icontext': !!(props.icon && props.icon.trim()),
                 'disabled': props.disabled === true,
                 'no-drag': true,
-                'text-truncate':true
+                'text-truncate': true
                 // 'f-rt-toggle':props.isDP&&!props.split
             } as Record<string, boolean>;
             return getCustomClass(classObject, props.class);
         });
-        
-        const buttonStyle=computed(()=>{
-            return props.split? {
-                "display":"flex",
-                "align-items":"center"
-            }:{
-                "display":"flex",
-                "align-items":"center",
-                "border-radius":"6px",
-                "padding-right":"0.1rem",
-                "border-top-right-radius":"6px",
-                "border-bottom-right-radius":"6px"
+
+        const buttonStyle = computed(() => {
+            return props.split ? {
+                "display": "flex",
+                "align-items": "center"
+            } : {
+                "display": "flex",
+                "align-items": "center",
+                "border-radius": "6px",
+                "padding-right": "0.1rem",
+                "border-top-right-radius": "6px",
+                "border-bottom-right-radius": "6px"
             };
         });
 
-        const splitDropdownButton=computed(() => {
+        const splitDropdownButton = computed(() => {
             const classObject = {
                 'btn': true,
                 'dropdown-toggle': true,
                 'f-btn-mr': alignment.value === 'left',
-                'dropdown-toggle-split':true,
+                'dropdown-toggle-split': true,
                 'no-drag': true
             } as Record<string, boolean>;
             return getCustomClass(classObject, props.class);
@@ -128,12 +126,12 @@ export default defineComponent({
                 <div class={dropdownClass()} id={props.id} >
                     <div class={buttonClass.value} style={buttonStyle.value} onClick={() => buttonClickHander('clearAll')}>
                         {useIconComposition.shouldShowIcon(props) && <i class={useIconComposition.iconClass(props)}></i>}
-                        <span>{props.text}</span>                        
-                        {!props.split&&<span class="f-icon f-icon-arrow-chevron-down"
-                                style="margin:0 0.5rem 0 0.25rem;" onClick={(event) => buttonClickHander('dropdown', event)}>
+                        <span>{props.text}</span>
+                        {!props.split && <span class="f-icon f-icon-arrow-chevron-down"
+                            style="margin:0 0.5rem 0 0.25rem;" onClick={(event) => buttonClickHander('dropdown', event)}>
                         </span>}
                     </div>
-                    {props.split&&<button class={splitDropdownButton.value} style="border-radius:0 6px 6px 0;" onClick={(event) => buttonClickHander('dropdown', event)} ></button>}
+                    {props.split && <button class={splitDropdownButton.value} style="border-radius:0 6px 6px 0;" onClick={(event) => buttonClickHander('dropdown', event)} ></button>}
                     {actionHandlers.renderDropdownMenu(props.item, props.item)}
                 </div>
             </div>;
diff --git a/packages/ui-vue/components/response-toolbar/src/designer/response-toolbar.design.component.tsx b/packages/ui-vue/components/response-toolbar/src/designer/response-toolbar.design.component.tsx
index d4eaddd3cd2..c1a0f259389 100644
--- a/packages/ui-vue/components/response-toolbar/src/designer/response-toolbar.design.component.tsx
+++ b/packages/ui-vue/components/response-toolbar/src/designer/response-toolbar.design.component.tsx
@@ -1,18 +1,15 @@
 import { computed, defineComponent, ref, onMounted, onUnmounted, watch, inject, provide, nextTick } from 'vue';
-import { useDesignerInnerComponent, useDesignerComponent } from '@farris/ui-vue/components/designer-canvas';
-import { ResponseToolbarDesignProps, responseToolbarDesignProps } from '../response-toolbar.props';
-import { ComponentSchema, DesignerItemContext } from '../../../designer-canvas/src/types';
-import { useDesignerRules } from './use-designer-rules';
 import { getCustomClass } from '@farris/ui-vue/components/common';
-import { DesignerHostService } from '../../../designer-canvas/src/composition/types';
+import { getSchemaByType } from "@farris/ui-vue/components/dynamic-resolver";
+import { useDesignerComponent, ComponentSchema, DesignerItemContext, DesignerHostService, setPositionForSelectedElement } from '@farris/ui-vue/components/designer-canvas';
+import { ResponseToolbarDesignProps, responseToolbarDesignProps } from './response-toolbar.design.props';
+import { useDesignerRules } from './use-designer-rules';
 import { responseToolbarItemDragula } from '../composition/toolbar-item-dragula';
-import { getSchemaByType } from "../../../dynamic-resolver";
 import getDropdownMenu from './toolbar-dropdown-menu.design.component';
 import { useIcon } from '../composition/use-icon';
 import { buildDesignResponseToolbarItems, useToolbarItemDesign } from '../composition/use-toolbar-item-design';
 import { ResponseToolbarItemActionHandler } from '../types/common';
 import { getMenuItemById, isDropdownItem, isExpandedDropdownButton } from '../composition/dropdown-item-utils';
-import { setPositionForSelectedElement } from '../../../designer-canvas/src/composition/designer-canvas-changed';
 
 export default defineComponent({
     name: 'FResponseToolbarDesign',
@@ -136,7 +133,7 @@ export default defineComponent({
             const simpleButtons = resizedContent.value.querySelectorAll('.farris-component>.f-rt-btn');
             if (simpleButtons) {
                 simpleButtons.forEach((simpleBtn) => {
-                    simpleBtn.style.maxWidth = maxWidth-simpleGutter + 'px';
+                    simpleBtn.style.maxWidth = maxWidth - simpleGutter + 'px';
                 });
             }
             const dropDownButtons = resizedContent.value.querySelectorAll('.farris-component>.f-rt-dropdown');
@@ -144,9 +141,9 @@ export default defineComponent({
                 // 下拉有两种，是否有分离按钮
                 dropDownButtons.forEach((dropdownBtn) => {
                     if (dropdownBtn.querySelector('.dropdown-toggle-split')) {
-                        dropdownBtn.querySelector('.f-rt-btn').style.maxWidth = maxWidth-splitGutter + 'px';
+                        dropdownBtn.querySelector('.f-rt-btn').style.maxWidth = maxWidth - splitGutter + 'px';
                     } else {
-                        dropdownBtn.style.maxWidth = maxWidth-simpleGutter + 'px';
+                        dropdownBtn.style.maxWidth = maxWidth - simpleGutter + 'px';
                     }
                 });
             }
diff --git a/packages/ui-vue/components/response-toolbar/src/designer/response-toolbar.design.props.ts b/packages/ui-vue/components/response-toolbar/src/designer/response-toolbar.design.props.ts
new file mode 100644
index 00000000000..385af76ba4b
--- /dev/null
+++ b/packages/ui-vue/components/response-toolbar/src/designer/response-toolbar.design.props.ts
@@ -0,0 +1,43 @@
+import { ExtractPropTypes, PropType } from 'vue';
+import { createPropsResolver, createResponseToolbarEventHandlerResolver } from '@farris/ui-vue/components/dynamic-resolver';
+import { ResponseToolbarProps,ResponseToolbarItem, responseToolbarProps, ButtonAlignment } from '@farris/ui-vue/components/response-toolbar';
+import { schemaMapper } from '../schema/schema-mapper';
+import { schemaResolver } from '../schema/schema-resolver';
+import responseToolbarSchema from '../schema/response-toolbar.schema.json';
+import responseToolbarItemSchema from '../schema/response-toolbar-item.schema.json';
+
+export const responseToolbarDesignProps = Object.assign({}, responseToolbarProps, {
+    componentId: { type: String, default: '' }
+});
+export type ResponseToolbarDesignProps = ExtractPropTypes<typeof responseToolbarDesignProps>;
+
+export const propsResolver = createPropsResolver<ResponseToolbarProps>(
+    responseToolbarProps, responseToolbarSchema, schemaMapper, schemaResolver
+);
+
+export const responseToolbarItemDesignProps = {
+    id: { type: String, default: '' },
+    item:{type: Object as PropType<ResponseToolbarItem>, default: {} },
+    items: { type: Object as PropType<ResponseToolbarItem>, default: {} },
+    class: { type: String, default: 'btn-secondary' },
+    text: { type: String, default: '' },
+    disabled: {type: Boolean, default: false},
+    icon: { type: String, default: '' },
+    componentId: { type: String, default: '' },
+    // 是否展开子级
+    expanded: { type: Boolean, default: false },
+    alignment: { Type: String as PropType<ButtonAlignment>, default: 'right' },
+    // 下拉按钮分离
+    split: { type: Boolean, default: false },
+     // 是否下拉
+     isDP: { type: Boolean, default: false },
+     // 是否下拉项
+     isDPItem: { type: Boolean, default: false }
+} as Record<string, any>;
+
+export type ResponseToolbarItemDesignProps = ExtractPropTypes<typeof responseToolbarItemDesignProps>;
+export const itemPropsResolver = createPropsResolver<ResponseToolbarItemDesignProps>(
+    responseToolbarItemDesignProps, responseToolbarItemSchema, undefined, schemaResolver
+);
+
+export const eventHandlerResolver = createResponseToolbarEventHandlerResolver();
diff --git a/packages/ui-vue/components/response-toolbar/src/designer/toolbar-dropdown-menu.design.component.tsx b/packages/ui-vue/components/response-toolbar/src/designer/toolbar-dropdown-menu.design.component.tsx
index a3f03afc32b..14275b4b9a7 100644
--- a/packages/ui-vue/components/response-toolbar/src/designer/toolbar-dropdown-menu.design.component.tsx
+++ b/packages/ui-vue/components/response-toolbar/src/designer/toolbar-dropdown-menu.design.component.tsx
@@ -1,5 +1,5 @@
 
-import { Ref, getCurrentInstance, inject } from 'vue';
+import { Ref } from 'vue';
 import { UseIcon } from '../composition/types';
 import { DesignResponseToolbarItem } from '../types/common';
 
diff --git a/packages/ui-vue/components/response-toolbar/src/designer/use-designer-item-rules.ts b/packages/ui-vue/components/response-toolbar/src/designer/use-designer-item-rules.ts
index c3e6f9f9961..1ed3a3014e2 100644
--- a/packages/ui-vue/components/response-toolbar/src/designer/use-designer-item-rules.ts
+++ b/packages/ui-vue/components/response-toolbar/src/designer/use-designer-item-rules.ts
@@ -1,14 +1,11 @@
-import { DraggingResolveContext, UseDesignerRules } from "../../../designer-canvas/src/composition/types";
-import { ComponentSchema, DesignerItemContext } from "../../../designer-canvas/src/types";
-import { TabToolbarItemProperty } from "../../../tabs/src/property-config/tab-toolbar-item.property-config";
+import { nextTick } from "vue";
+import { cloneDeep } from "lodash-es";
+import { DraggingResolveContext, UseDesignerRules, ComponentSchema, DesignerItemContext, canvasChanged } from "@farris/ui-vue/components/designer-canvas";
+import { TabToolbarItemProperty } from "@farris/ui-vue/components/tabs";
+import { getSchemaByType } from '@farris/ui-vue/components/dynamic-resolver';
 import { ResponseToolbarItemProperty } from "../property-config/response-toolbar-item.property-config";
-import { getSchemaByType } from '../../../dynamic-resolver/src/schema-resolver';
 import { ResponseToolbarItemActionHandler } from "../types/common";
-import { cloneDeep } from "lodash-es";
-import { getMenuIndexItemById, getMenuItemById, isDropdownItem } from "../composition/dropdown-item-utils";
-import { canvasChanged } from "../../../designer-canvas/src/composition/designer-canvas-changed";
-import { nextTick } from "vue";
-// import { canvasChanged } from "@/components/designer-canvas/src/composition/designer-canvas-changed";
+import { getMenuIndexItemById, isDropdownItem } from "../composition/dropdown-item-utils";
 
 export function useDesignerItemRules(designerItemContext: DesignerItemContext, designerHostService, actionHandlers: ResponseToolbarItemActionHandler): UseDesignerRules {
     let componentIdRecord = '';
diff --git a/packages/ui-vue/components/response-toolbar/src/designer/use-designer-rules.ts b/packages/ui-vue/components/response-toolbar/src/designer/use-designer-rules.ts
index 70ff42e8dd3..eee7503b968 100644
--- a/packages/ui-vue/components/response-toolbar/src/designer/use-designer-rules.ts
+++ b/packages/ui-vue/components/response-toolbar/src/designer/use-designer-rules.ts
@@ -1,6 +1,5 @@
-import { getSchemaByType } from "../../../dynamic-resolver";
-import { DraggingResolveContext, UseDesignerRules } from "../../../designer-canvas/src/composition/types";
-import { ComponentSchema, DesignerItemContext } from "../../../designer-canvas/src/types";
+import { getSchemaByType } from "@farris/ui-vue/components/dynamic-resolver";
+import { DraggingResolveContext, UseDesignerRules, ComponentSchema, DesignerItemContext } from "@farris/ui-vue/components/designer-canvas";
 import { ResponseToolbarProperty } from "../property-config/response-toolbar.property-config";
 import { ResponseToolbarItemActionHandler } from "../types/common";
 
diff --git a/packages/ui-vue/components/response-toolbar/src/property-config/response-toolbar-item.property-config.ts b/packages/ui-vue/components/response-toolbar/src/property-config/response-toolbar-item.property-config.ts
index ce6a779f5da..39486bcf135 100644
--- a/packages/ui-vue/components/response-toolbar/src/property-config/response-toolbar-item.property-config.ts
+++ b/packages/ui-vue/components/response-toolbar/src/property-config/response-toolbar-item.property-config.ts
@@ -1,4 +1,4 @@
-import { BaseControlProperty } from "../../../property-panel/src/composition/entity/base-property";
+import { BaseControlProperty } from "@farris/ui-vue/components/property-panel";
 
 export class ResponseToolbarItemProperty extends BaseControlProperty {
     toolbarType = 'response-toolbar-item';
diff --git a/packages/ui-vue/components/response-toolbar/src/property-config/response-toolbar.property-config.ts b/packages/ui-vue/components/response-toolbar/src/property-config/response-toolbar.property-config.ts
index e236a124559..2d9ac2c56b0 100644
--- a/packages/ui-vue/components/response-toolbar/src/property-config/response-toolbar.property-config.ts
+++ b/packages/ui-vue/components/response-toolbar/src/property-config/response-toolbar.property-config.ts
@@ -1,4 +1,4 @@
-import { BaseControlProperty } from "../../../property-panel/src/composition/entity/base-property";
+import { BaseControlProperty } from "@farris/ui-vue/components/property-panel";
 
 export class ResponseToolbarProperty extends BaseControlProperty {
     // 有三类值 response-toolbar、section-toolbar、tab-toolbar
diff --git a/packages/ui-vue/components/response-toolbar/src/response-toolbar.component.tsx b/packages/ui-vue/components/response-toolbar/src/response-toolbar.component.tsx
index 17da8b4f045..a1be826213f 100644
--- a/packages/ui-vue/components/response-toolbar/src/response-toolbar.component.tsx
+++ b/packages/ui-vue/components/response-toolbar/src/response-toolbar.component.tsx
@@ -1,11 +1,11 @@
 import { computed, defineComponent, ref, onMounted, onUnmounted, watch, nextTick, reactive } from 'vue';
+import { getCustomClass } from '@farris/ui-vue/components/common';
 import { ResponseToolbarProps, responseToolbarProps } from './response-toolbar.props';
 import { ResponseToolbarDropDownItem } from './types/response-toolbar-dropdwon-item';
 import { ResponseToolbarItem } from './types/response-toolbar-item';
 import { useIcon } from './composition/use-icon';
 import { useToolbarItem } from './composition/use-toolbar-item';
 import getDropdown from './components/dropdown/toolbar-dropdown.component';
-import { getCustomClass } from '@farris/ui-vue/components/common';
 
 const { buildResponseToolbarItems } = useToolbarItem();
 export default defineComponent({
diff --git a/packages/ui-vue/components/response-toolbar/src/response-toolbar.props.ts b/packages/ui-vue/components/response-toolbar/src/response-toolbar.props.ts
index fd95610e4d1..fd09fd6893e 100644
--- a/packages/ui-vue/components/response-toolbar/src/response-toolbar.props.ts
+++ b/packages/ui-vue/components/response-toolbar/src/response-toolbar.props.ts
@@ -1,10 +1,4 @@
 import { ExtractPropTypes, PropType } from 'vue';
-import { createPropsResolver, createResponseToolbarEventHandlerResolver } from '../../dynamic-resolver';
-import { schemaMapper } from './schema/schema-mapper';
-import { schemaResolver } from './schema/schema-resolver';
-import responseToolbarSchema from './schema/response-toolbar.schema.json';
-import responseToolbarItemSchema from './schema/response-toolbar-item.schema.json';
-// import responseToolbarItemPropertyConfig from './property-config/response-toolbar-item.property-config.json';
 import { ResponseToolbarItem } from './types/response-toolbar-item';
 
 export type ButtonAlignment = 'right' | 'left' | 'center';
@@ -22,42 +16,4 @@ export const responseToolbarProps = {
     visible: { type: Boolean, default: true }
 } as Record<string, any>;
 
-// schemaMap[responseToolbarItemSchema.title] = responseToolbarItemSchema;
-// propertyConfigSchemaMap[responseToolbarItemPropertyConfig.title] = responseToolbarItemPropertyConfig;
-
 export type ResponseToolbarProps = ExtractPropTypes<typeof responseToolbarProps>;
-export const responseToolbarDesignProps = Object.assign({}, responseToolbarProps, {
-    componentId: { type: String, default: '' }
-});
-export type ResponseToolbarDesignProps = ExtractPropTypes<typeof responseToolbarDesignProps>;
-
-export const propsResolver = createPropsResolver<ResponseToolbarProps>(
-    responseToolbarProps, responseToolbarSchema, schemaMapper, schemaResolver
-);
-
-export const responseToolbarItemDesignProps = {
-    id: { type: String, default: '' },
-    item:{type: Object as PropType<ResponseToolbarItem>, default: {} },
-    items: { type: Object as PropType<ResponseToolbarItem>, default: {} },
-    class: { type: String, default: 'btn-secondary' },
-    text: { type: String, default: '' },
-    disabled: {type: Boolean, default: false},
-    icon: { type: String, default: '' },
-    componentId: { type: String, default: '' },
-    // 是否展开子级
-    expanded: { type: Boolean, default: false },
-    alignment: { Type: String as PropType<ButtonAlignment>, default: 'right' },
-    // 下拉按钮分离
-    split: { type: Boolean, default: false },
-     // 是否下拉
-     isDP: { type: Boolean, default: false },
-     // 是否下拉项
-     isDPItem: { type: Boolean, default: false }
-} as Record<string, any>;
-
-export type ResponseToolbarItemDesignProps = ExtractPropTypes<typeof responseToolbarItemDesignProps>;
-export const itemPropsResolver = createPropsResolver<ResponseToolbarItemDesignProps>(
-    responseToolbarItemDesignProps, responseToolbarItemSchema, undefined, schemaResolver
-);
-
-export const eventHandlerResolver = createResponseToolbarEventHandlerResolver();
diff --git a/packages/ui-vue/components/response-toolbar/src/schema/schema-mapper.ts b/packages/ui-vue/components/response-toolbar/src/schema/schema-mapper.ts
index 2dbe1393447..322a4f548f6 100644
--- a/packages/ui-vue/components/response-toolbar/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/response-toolbar/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['buttons', 'items'],
diff --git a/packages/ui-vue/components/response-toolbar/src/schema/schema-resolver.ts b/packages/ui-vue/components/response-toolbar/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/response-toolbar/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/response-toolbar/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
diff --git a/packages/ui-vue/components/tabs/designer.ts b/packages/ui-vue/components/tabs/designer.ts
new file mode 100644
index 00000000000..07881e5eef4
--- /dev/null
+++ b/packages/ui-vue/components/tabs/designer.ts
@@ -0,0 +1,28 @@
+import { withInstall } from '@farris/ui-vue/components/common';
+import FTabs, { FTabPage } from '@farris/ui-vue/components/tabs';
+import FResponseToolbarDesign from '@farris/ui-vue/components/response-toolbar/designer';
+import FTabsDesign from './src/designer/tabs.design.component';
+import FTabPageDesign from './src/designer/tab-page.design.component';
+import { tabsPropsResolver, tabsDesignPropsResolver, eventHandlerResolver, tabToolbarPropsResolver } from './src/designer/tabs.design.props';
+import { tabPagePropsResolver } from './src/designer/tab-page.design.props';
+import { tabToolbarItemResolver } from './src/designer/tab-toolbar-item.props';
+
+export { FTabsDesign };
+FTabsDesign.register = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>, resolverMap: Record<string, any>) => {
+    componentMap.tabs = FTabs;
+    componentMap['tab-page'] = FTabPage;
+    propsResolverMap.tabs = tabsPropsResolver;
+    propsResolverMap['tab-page'] = tabPagePropsResolver;
+    resolverMap.tabs = { eventHandlerResolver };
+};
+FTabsDesign.registerDesigner = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>) => {
+    componentMap.tabs = FTabsDesign;
+    componentMap['tab-page'] = FTabPageDesign;
+    propsResolverMap.tabs = tabsDesignPropsResolver;
+    propsResolverMap['tab-page'] = tabPagePropsResolver;
+    propsResolverMap['tab-toolbar-item'] = tabToolbarItemResolver;
+    componentMap['tab-toolbar'] = FResponseToolbarDesign;
+    propsResolverMap['tab-toolbar'] = tabToolbarPropsResolver;
+};
+
+export default withInstall(FTabsDesign);
diff --git a/packages/ui-vue/components/tabs/index.ts b/packages/ui-vue/components/tabs/index.ts
index e831eb5f662..3408dd07dcd 100644
--- a/packages/ui-vue/components/tabs/index.ts
+++ b/packages/ui-vue/components/tabs/index.ts
@@ -17,37 +17,14 @@
 import type { App, Plugin } from 'vue';
 import FTabs from './src/tabs.component';
 import FTabPage from './src/components/tab-page.component';
-import FTabsDesign from './src/designer/tabs.design.component';
-import FTabPageDesign from './src/designer/tab-page.design.component';
-import { tabsPropsResolver, tabsDesignPropsResolver, eventHandlerResolver, tabToolbarPropsResolver } from './src/tabs.props';
-import { tabPagePropsResolver } from './src/components/tab-page.props';
-import { tabToolbarItemResolver } from './src/designer/tab-toolbar-item.props';
-import FResponseToolbarDesign from '../response-toolbar/src/designer/response-toolbar.design.component';
-
 export * from './src/tabs.props';
 export * from './src/components/tab-page.props';
-
+export * from './src/property-config/tab-toolbar-item.property-config';
 export { FTabs, FTabPage };
 
 FTabs.install = (app: App) => {
     app.component(FTabs.name as string, FTabs);
     app.component(FTabPage.name as string, FTabPage);
 };
-FTabs.register = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>, resolverMap: Record<string, any>) => {
-    componentMap.tabs = FTabs;
-    componentMap['tab-page'] = FTabPage;
-    propsResolverMap.tabs = tabsPropsResolver;
-    propsResolverMap['tab-page'] = tabPagePropsResolver;
-    resolverMap.tabs = { eventHandlerResolver };
-};
-FTabs.registerDesigner = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>) => {
-    componentMap.tabs = FTabsDesign;
-    componentMap['tab-page'] = FTabPageDesign;
-    propsResolverMap.tabs = tabsDesignPropsResolver;
-    propsResolverMap['tab-page'] = tabPagePropsResolver;
-    propsResolverMap['tab-toolbar-item'] = tabToolbarItemResolver;    
-    componentMap['tab-toolbar'] = FResponseToolbarDesign;
-    propsResolverMap['tab-toolbar'] = tabToolbarPropsResolver;
-};
 
 export default FTabs as typeof FTabs & Plugin;
diff --git a/packages/ui-vue/components/tabs/src/components/tab-page.props.ts b/packages/ui-vue/components/tabs/src/components/tab-page.props.ts
index 02bb213f43d..40f4575d416 100644
--- a/packages/ui-vue/components/tabs/src/components/tab-page.props.ts
+++ b/packages/ui-vue/components/tabs/src/components/tab-page.props.ts
@@ -15,10 +15,7 @@
  * limitations under the License.
  */
 import { ExtractPropTypes, PropType } from 'vue';
-import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
 import { ToolbarPosition, ToolbarContentsConf } from '../composition/types';
-import { schemaMapper } from '../schema/tab-page-schema-mapper';
-import tabPageSchema from '../schema/tab-page.schema.json';
 
 export const tabPageProps = {
     tabWidth: { type: Number},
@@ -37,5 +34,3 @@ export const tabPageProps = {
 } as Record<string, any>;
 
 export type TabPageProps = ExtractPropTypes<typeof tabPageProps>;
-
-export const tabPagePropsResolver = createPropsResolver<TabPageProps>(tabPageProps, tabPageSchema, schemaMapper);
diff --git a/packages/ui-vue/components/tabs/src/designer/tab-page.design.component.tsx b/packages/ui-vue/components/tabs/src/designer/tab-page.design.component.tsx
index efde345c2a2..2f9ec9602c3 100644
--- a/packages/ui-vue/components/tabs/src/designer/tab-page.design.component.tsx
+++ b/packages/ui-vue/components/tabs/src/designer/tab-page.design.component.tsx
@@ -16,9 +16,9 @@
 import { defineComponent, inject, onMounted, SetupContext, watch, ref, onUnmounted, computed } from 'vue';
 import { JSX } from 'vue/jsx-runtime';
 import FSection from '@farris/ui-vue/components/section';
+import { TabPageProps, tabPageProps } from '@farris/ui-vue/components/tabs';
 import { DesignerItemContext, useDesignerComponent, DesignerHostService } from '@farris/ui-vue/components/designer-canvas';
 import { TabPageContext, TabsContext } from '../composition/types';
-import { TabPageProps, tabPageProps } from '../components/tab-page.props';
 import { useDesignerRules } from './tab-page-use-designer-rules';
 
 export default defineComponent({
diff --git a/packages/ui-vue/components/tabs/src/designer/tab-page.design.props.ts b/packages/ui-vue/components/tabs/src/designer/tab-page.design.props.ts
new file mode 100644
index 00000000000..64672f1bac3
--- /dev/null
+++ b/packages/ui-vue/components/tabs/src/designer/tab-page.design.props.ts
@@ -0,0 +1,6 @@
+
+import { tabPageProps, TabPageProps } from '@farris/ui-vue/components/tabs';
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
+import { schemaMapper } from '../schema/tab-page-schema-mapper';
+import tabPageSchema from '../schema/tab-page.schema.json';
+export const tabPagePropsResolver = createPropsResolver<TabPageProps>(tabPageProps, tabPageSchema, schemaMapper);
diff --git a/packages/ui-vue/components/tabs/src/designer/tabs.design.component.tsx b/packages/ui-vue/components/tabs/src/designer/tabs.design.component.tsx
index f7cba8d6c4d..04932467219 100644
--- a/packages/ui-vue/components/tabs/src/designer/tabs.design.component.tsx
+++ b/packages/ui-vue/components/tabs/src/designer/tabs.design.component.tsx
@@ -17,7 +17,7 @@
 import { computed, defineComponent, provide, SetupContext, onMounted, shallowRef, nextTick, ref, inject, onUnmounted } from 'vue';
 import { JSX } from 'vue/jsx-runtime';
 import { ComponentSchema, DesignerItemContext, useDesignerComponent, DesignerHostService } from '@farris/ui-vue/components/designer-canvas';
-import { TabsDesignProps, tabsDesignProps } from '../tabs.props';
+import { TabsDesignProps, tabsDesignProps } from './tabs.design.props';
 import { TabPageContext, TabsContext, ToolbarItemService } from '../composition/types';
 import getTabHeaderRender from './tab-header.design.component';
 import getTabHeaderCapsuleRender from '../components/tab-header-capsule.component';
diff --git a/packages/ui-vue/components/tabs/src/designer/tabs.design.props.ts b/packages/ui-vue/components/tabs/src/designer/tabs.design.props.ts
new file mode 100644
index 00000000000..321a9f7922f
--- /dev/null
+++ b/packages/ui-vue/components/tabs/src/designer/tabs.design.props.ts
@@ -0,0 +1,19 @@
+import { ExtractPropTypes } from 'vue';
+import { tabsProps, TabsProps } from '@farris/ui-vue/components/tabs';
+import { createPropsResolver, createTabsEventHandlerResolver } from '@farris/ui-vue/components/dynamic-resolver';
+import { ResponseToolbarProps, responseToolbarProps } from '@farris/ui-vue/components/response-toolbar';
+import { schemaResolver as responseSchemaResolver } from '@farris/ui-vue/components/response-toolbar/designer';
+import { schemaMapper } from '../schema/schema-mapper';
+import { schemaResolver } from '../schema/schema-resolver';
+import tabsSchema from '../schema/tabs.schema.json';
+import tabToolbarSchema from '../schema/tab-toolbar.schema.json';
+export const tabsPropsResolver = createPropsResolver<TabsProps>(tabsProps, tabsSchema, schemaMapper, schemaResolver);
+export const tabsDesignProps = Object.assign({}, tabsProps, {
+    componentId: { type: String, default: '' }
+});
+export type TabsDesignProps = ExtractPropTypes<typeof tabsDesignProps>;
+export const tabsDesignPropsResolver = createPropsResolver<TabsDesignProps>(tabsDesignProps, tabsSchema, schemaMapper, schemaResolver);
+export const eventHandlerResolver = createTabsEventHandlerResolver();
+export const tabToolbarPropsResolver = createPropsResolver<ResponseToolbarProps>(
+    responseToolbarProps, tabToolbarSchema, schemaMapper, responseSchemaResolver
+);
diff --git a/packages/ui-vue/components/tabs/src/tabs.props.ts b/packages/ui-vue/components/tabs/src/tabs.props.ts
index 31059385ede..c84de7ec07e 100644
--- a/packages/ui-vue/components/tabs/src/tabs.props.ts
+++ b/packages/ui-vue/components/tabs/src/tabs.props.ts
@@ -14,13 +14,6 @@
  * limitations under the License.
  */
 import { ExtractPropTypes, PropType } from 'vue';
-import { createPropsResolver, createTabsEventHandlerResolver } from '../../dynamic-resolver';
-import { schemaMapper } from './schema/schema-mapper';
-import { schemaResolver } from './schema/schema-resolver';
-import tabsSchema from './schema/tabs.schema.json';
-import tabToolbarSchema from './schema/tab-toolbar.schema.json';
-import { ResponseToolbarProps, responseToolbarProps } from '../../response-toolbar/src/response-toolbar.props';
-import { schemaResolver as responseSchemaResolver } from '../../response-toolbar/src/schema/schema-resolver';
 
 export type TabType = 'fill' | 'pills' | 'default' | 'one-page';
 export type TabPosition = 'left' | 'right' | 'top' | 'bottom';
@@ -51,14 +44,4 @@ export const tabsProps = {
 } as Record<string, any>;
 
 export type TabsProps = ExtractPropTypes<typeof tabsProps>;
-// !!!!!!!!!!!!!!
-export const tabsPropsResolver = createPropsResolver<TabsProps>(tabsProps, tabsSchema, schemaMapper, schemaResolver);
-export const tabsDesignProps = Object.assign({}, tabsProps, {
-    componentId: { type: String, default: '' }
-});
-export type TabsDesignProps = ExtractPropTypes<typeof tabsDesignProps>;
-export const tabsDesignPropsResolver = createPropsResolver<TabsDesignProps>(tabsDesignProps, tabsSchema, schemaMapper, schemaResolver);
-export const eventHandlerResolver = createTabsEventHandlerResolver();
-export const tabToolbarPropsResolver = createPropsResolver<ResponseToolbarProps>(
-    responseToolbarProps, tabToolbarSchema, schemaMapper, responseSchemaResolver
-);
+
-- 
Gitee


From 6ec258c06b009abd7973bc91c526aa745d89ef8d Mon Sep 17 00:00:00 2001
From: hyygzds <m15966339253@163.com>
Date: Sat, 26 Jul 2025 14:52:09 +0800
Subject: [PATCH 47/62] build: update import path of textarea and datepicker

---
 .../ui-vue/components/date-picker/designer.ts | 22 +++++++++++++++++++
 .../ui-vue/components/date-picker/index.ts    | 18 +--------------
 .../date-picker/src/date-picker.props.ts      | 14 +-----------
 .../designer/date-picker.design.component.tsx |  7 +++---
 .../src/designer/date-picker.design.props.ts  | 18 +++++++++++++++
 .../designer-canvas/src/components/maps.ts    |  4 ++--
 .../dynamic-view/src/components/maps.ts       |  4 ++--
 .../ui-vue/components/textarea/designer.ts    | 17 ++++++++++++++
 packages/ui-vue/components/textarea/index.ts  | 13 +----------
 .../designer/textarea.design.component.tsx    |  5 ++---
 .../src/designer/textarea.design.props.ts     | 13 +++++++++++
 .../textarea/src/designer/use-design-rules.ts |  4 +---
 .../textarea.property-config.ts               |  2 +-
 .../textarea/src/schema/schema-mapper.ts      |  2 +-
 .../textarea/src/schema/schema-resolver.ts    |  2 +-
 .../textarea/src/textarea.component.tsx       |  2 +-
 .../components/textarea/src/textarea.props.ts | 13 -----------
 17 files changed, 87 insertions(+), 73 deletions(-)
 create mode 100644 packages/ui-vue/components/date-picker/designer.ts
 create mode 100644 packages/ui-vue/components/date-picker/src/designer/date-picker.design.props.ts
 create mode 100644 packages/ui-vue/components/textarea/designer.ts
 create mode 100644 packages/ui-vue/components/textarea/src/designer/textarea.design.props.ts

diff --git a/packages/ui-vue/components/date-picker/designer.ts b/packages/ui-vue/components/date-picker/designer.ts
new file mode 100644
index 00000000000..35097040c33
--- /dev/null
+++ b/packages/ui-vue/components/date-picker/designer.ts
@@ -0,0 +1,22 @@
+import { withInstall } from '@farris/ui-vue/components/common';
+import { DatePickerContainer, DatePicker, } from '@farris/ui-vue/components/date-picker';
+import FDatePickerDesign from './src/designer/date-picker.design.component';
+import FDateViewDesign from './src/designer/date-view.design.component';
+import { datePickerPropsResolver } from './src/designer/date-picker.design.props';
+import { dateViewPropsResolver } from './src/components/date-picker-container/date-picker-container.props';
+
+FDatePickerDesign.register = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>, resolverMap: Record<string, any>) => {
+    componentMap['date-picker'] = DatePicker;
+    componentMap['date-view'] = DatePickerContainer;
+    propsResolverMap['date-picker'] = datePickerPropsResolver;
+    propsResolverMap['date-view'] = dateViewPropsResolver;
+};
+FDatePickerDesign.registerDesigner = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>) => {
+    componentMap['date-picker'] = FDatePickerDesign;
+    componentMap['date-view'] = FDateViewDesign;
+    propsResolverMap['date-picker'] = datePickerPropsResolver;
+    propsResolverMap['date-view'] = dateViewPropsResolver;
+};
+export * from './src/designer/date-picker.design.props';
+export { FDatePickerDesign };
+export default withInstall(FDatePickerDesign);
diff --git a/packages/ui-vue/components/date-picker/index.ts b/packages/ui-vue/components/date-picker/index.ts
index 8c1b6b739a5..02a8633b078 100644
--- a/packages/ui-vue/components/date-picker/index.ts
+++ b/packages/ui-vue/components/date-picker/index.ts
@@ -21,10 +21,6 @@ import DatePickerContainer from './src/components/date-picker-container/date-pic
 import DatePickerMonthView from './src/components/month/month.component';
 import DatePickerYearView from './src/components/year/year.component';
 import DatePicker from './src/date-picker.component';
-import FDatePickerDesign from './src/designer/date-picker.design.component';
-import FDateViewDesign from './src/designer/date-view.design.component';
-import { datePickerPropsResolver } from './src/date-picker.props';
-import { dateViewPropsResolver } from './src/components/date-picker-container/date-picker-container.props';
 
 export * from './src/components/calendar/calendar.props';
 export * from './src/date-picker.props';
@@ -44,18 +40,6 @@ DatePicker.install = (app: App) =>  {
         .component(DatePickerYearView.name as string, DatePickerYearView)
         .component(DatePicker.name as string, DatePicker);
 };
-DatePicker.register = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>, resolverMap: Record<string, any>) => {
-    componentMap['date-picker'] = DatePicker;
-    componentMap['date-view'] = DatePickerContainer;
-    propsResolverMap['date-picker'] = datePickerPropsResolver;
-    propsResolverMap['date-view'] = dateViewPropsResolver;
-};
-DatePicker.registerDesigner = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>) => {
-    componentMap['date-picker'] = FDatePickerDesign;
-    componentMap['date-view'] = FDateViewDesign;
-    propsResolverMap['date-picker'] = datePickerPropsResolver;
-    propsResolverMap['date-view'] = dateViewPropsResolver;
-};
 
-export { DatePicker, DatePickerCalendar };
+export { DatePicker, DatePickerCalendar, DatePickerContainer };
 export default DatePicker as typeof DatePicker & Plugin;
diff --git a/packages/ui-vue/components/date-picker/src/date-picker.props.ts b/packages/ui-vue/components/date-picker/src/date-picker.props.ts
index 82c5ae6d51b..6fa3b0d6d2d 100644
--- a/packages/ui-vue/components/date-picker/src/date-picker.props.ts
+++ b/packages/ui-vue/components/date-picker/src/date-picker.props.ts
@@ -14,13 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ExtractPropTypes, PropType } from 'vue';
+import { ExtractPropTypes } from 'vue';
 import { DateObject, Period } from './types/common';
 import { defaultNameOfMonths } from './types/month';
-import { schemaResolver } from './schema/schema-resolver';
-import { createPropsResolver } from '../../dynamic-resolver';
-import { schemaMapper } from './schema/schema-mapper';
-import datePickerSchema from './schema/date-picker.schema.json';
 
 export const MAX_DATE = { year: 9999, month: 12, day: 31, hour: 23, minute: 59, second: 59 };
 export const MIN_DATE = { year: 1900, month: 1, day: 1, hour: 0, minute: 0, second: 0 };
@@ -102,11 +98,3 @@ export const datePickerProps = {
 } as Record<string, any>;
 
 export type DatePickerProps = ExtractPropTypes<typeof datePickerProps>;
-
-export const datePickerDesignProps = Object.assign({}, datePickerProps, {
-    readonly: {}
-});
-
-export type DatePickerDesignProps = ExtractPropTypes<typeof datePickerDesignProps>;
-
-export const datePickerPropsResolver = createPropsResolver<DatePickerProps>(datePickerProps, datePickerSchema, schemaMapper, schemaResolver);
diff --git a/packages/ui-vue/components/date-picker/src/designer/date-picker.design.component.tsx b/packages/ui-vue/components/date-picker/src/designer/date-picker.design.component.tsx
index 42e51a9ff95..e15f2937533 100644
--- a/packages/ui-vue/components/date-picker/src/designer/date-picker.design.component.tsx
+++ b/packages/ui-vue/components/date-picker/src/designer/date-picker.design.component.tsx
@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 import { defineComponent, inject, onMounted, ref, SetupContext } from 'vue';
-import FButtonEditDesign from '@farris/ui-vue/components/button-edit';
-import { DesignerItemContext } from '@farris/ui-vue/components/designer-canvas';
-import { useDesignerComponent } from '@farris/ui-vue/components/designer-canvas';
-import { DatePickerDesignProps, datePickerDesignProps } from '../date-picker.props';
+import FButtonEditDesign from '@farris/ui-vue/components/button-edit/designer';
+import { useDesignerComponent, DesignerItemContext } from '@farris/ui-vue/components/designer-canvas';
+import { DatePickerDesignProps, datePickerDesignProps } from './date-picker.design.props';
 import { useDatePickerDesignerRules } from './use-rules';
 
 export default defineComponent({
diff --git a/packages/ui-vue/components/date-picker/src/designer/date-picker.design.props.ts b/packages/ui-vue/components/date-picker/src/designer/date-picker.design.props.ts
new file mode 100644
index 00000000000..792737f1d60
--- /dev/null
+++ b/packages/ui-vue/components/date-picker/src/designer/date-picker.design.props.ts
@@ -0,0 +1,18 @@
+
+import { ExtractPropTypes } from 'vue';
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
+import { datePickerProps, DatePickerProps } from '@farris/ui-vue/components/date-picker';
+import { schemaResolver } from '../schema/schema-resolver';
+import { schemaMapper } from '../schema/schema-mapper';
+import datePickerSchema from '../schema/date-picker.schema.json';
+
+export const MAX_DATE = { year: 9999, month: 12, day: 31, hour: 23, minute: 59, second: 59 };
+export const MIN_DATE = { year: 1900, month: 1, day: 1, hour: 0, minute: 0, second: 0 };
+
+export const datePickerDesignProps = Object.assign({}, datePickerProps, {
+    readonly: {}
+});
+
+export type DatePickerDesignProps = ExtractPropTypes<typeof datePickerDesignProps>;
+
+export const datePickerPropsResolver = createPropsResolver<DatePickerProps>(datePickerProps, datePickerSchema, schemaMapper, schemaResolver);
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 6d31c8351bd..dfdb8753ffb 100644
--- a/packages/ui-vue/components/designer-canvas/src/components/maps.ts
+++ b/packages/ui-vue/components/designer-canvas/src/components/maps.ts
@@ -10,7 +10,7 @@ import FColorPicker from '@farris/ui-vue/components/color-picker';
 import FComboList from '@farris/ui-vue/components/combo-list';
 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';
+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 FExternalContainer from '@farris/ui-vue/components/external-container';
@@ -51,7 +51,7 @@ import FUploader from '@farris/ui-vue/components/uploader';
 import FVerifyDetail from '@farris/ui-vue/components/verify-detail';
 import FComponent from '@farris/ui-vue/components/component';
 import FVideo from '@farris/ui-vue/components/video';
-import FTextArea from '@farris/ui-vue/components/textarea';
+import FTextArea from '@farris/ui-vue/components/textarea/designer';
 import FTreeGrid from '@farris/ui-vue/components/tree-grid/designer';
 import FFieldset from '@farris/ui-vue/components/fieldset';
 import FDrawer from '@farris/ui-vue/components/drawer/designer';
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 67145695aee..d170551550b 100644
--- a/packages/ui-vue/components/dynamic-view/src/components/maps.ts
+++ b/packages/ui-vue/components/dynamic-view/src/components/maps.ts
@@ -11,7 +11,7 @@ import FComboTree from '@farris/ui-vue/components/combo-tree';
 import FComponent from '@farris/ui-vue/components/component';
 import FColorPicker from '@farris/ui-vue/components/color-picker';
 import FContentContainer from '@farris/ui-vue/components/content-container';
-import FDatePicker from '@farris/ui-vue/components/date-picker';
+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';
@@ -55,7 +55,7 @@ import FTreeview from '@farris/ui-vue/components/tree-view';
 import FUploader from '@farris/ui-vue/components/uploader';
 import FVerifyDetail from '@farris/ui-vue/components/verify-detail';
 import FVideo from '@farris/ui-vue/components/video';
-import FTextArea from '@farris/ui-vue/components/textarea';
+import FTextArea from '@farris/ui-vue/components/textarea/designer';
 import FSchemaSelector from '@farris/ui-vue/components/schema-selector';
 import FTreeGrid from '@farris/ui-vue/components/tree-grid/designer';
 import FEventParameter from '@farris/ui-vue/components/event-parameter';
diff --git a/packages/ui-vue/components/textarea/designer.ts b/packages/ui-vue/components/textarea/designer.ts
new file mode 100644
index 00000000000..8ae7a1c48af
--- /dev/null
+++ b/packages/ui-vue/components/textarea/designer.ts
@@ -0,0 +1,17 @@
+
+import { withInstall } from '@farris/ui-vue/components/common';
+import FTextarea from '@farris/ui-vue/components/textarea';
+import FTextareaDesign from './src/designer/textarea.design.component';
+import { propsResolver } from './src/designer/textarea.design.props';
+
+FTextareaDesign.register = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>, resolverMap: Record<string, any>) => {
+    componentMap['textarea'] = FTextarea;
+    propsResolverMap['textarea'] = propsResolver;
+};
+FTextareaDesign.registerDesigner = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>) => {
+    componentMap['textarea'] = FTextareaDesign;
+    propsResolverMap['textarea'] = propsResolver;
+};
+
+export { FTextareaDesign };
+export default withInstall(FTextareaDesign);
diff --git a/packages/ui-vue/components/textarea/index.ts b/packages/ui-vue/components/textarea/index.ts
index a314948b2aa..dd713b5ba68 100644
--- a/packages/ui-vue/components/textarea/index.ts
+++ b/packages/ui-vue/components/textarea/index.ts
@@ -14,21 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import FTextarea from './src/textarea.component';
-import FTextareaDesign from './src/designer/textarea.design.component';
-import { propsResolver } from './src/textarea.props';
 import { withInstall } from '@farris/ui-vue/components/common';
+import FTextarea from './src/textarea.component';
 
 export * from './src/textarea.props';
 
-FTextarea.register = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>, resolverMap: Record<string, any>) => {
-    componentMap['textarea'] = FTextarea;
-    propsResolverMap['textarea'] = propsResolver;
-};
-FTextarea.registerDesigner = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>) => {
-    componentMap['textarea'] = FTextareaDesign;
-    propsResolverMap['textarea'] = propsResolver;
-};
-
 export { FTextarea };
 export default withInstall(FTextarea);
diff --git a/packages/ui-vue/components/textarea/src/designer/textarea.design.component.tsx b/packages/ui-vue/components/textarea/src/designer/textarea.design.component.tsx
index 05f4e8f9d23..ecee18ed1d2 100644
--- a/packages/ui-vue/components/textarea/src/designer/textarea.design.component.tsx
+++ b/packages/ui-vue/components/textarea/src/designer/textarea.design.component.tsx
@@ -15,9 +15,8 @@
  * limitations under the License.
  */
 import { computed, defineComponent, inject, onMounted, ref, SetupContext, toRefs } from 'vue';
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
-import { textAreaDesignProps, TextAreaDesignProps } from '../textarea.props';
+import { DesignerItemContext, useDesignerComponent } from '@farris/ui-vue/components/designer-canvas';
+import { textAreaDesignProps, TextAreaDesignProps } from './textarea.design.props';
 import { useTextareaDesignerRules } from './use-design-rules';
 
 export default defineComponent({
diff --git a/packages/ui-vue/components/textarea/src/designer/textarea.design.props.ts b/packages/ui-vue/components/textarea/src/designer/textarea.design.props.ts
new file mode 100644
index 00000000000..482df957430
--- /dev/null
+++ b/packages/ui-vue/components/textarea/src/designer/textarea.design.props.ts
@@ -0,0 +1,13 @@
+import { ExtractPropTypes } from 'vue';
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
+import { TextAreaProps, textAreaProps } from '@farris/ui-vue/components/textarea';
+import { schemaMapper } from '../schema/schema-mapper';
+import textareaSchema from '../schema/textarea.schema.json';
+import { schemaResolver } from '../schema/schema-resolver';
+export const textAreaDesignProps = Object.assign({}, textAreaProps, {
+    readonly: {}
+});
+
+export type TextAreaDesignProps = ExtractPropTypes<typeof textAreaDesignProps>;
+
+export const propsResolver = createPropsResolver<TextAreaProps>(textAreaProps, textareaSchema, schemaMapper, schemaResolver);
diff --git a/packages/ui-vue/components/textarea/src/designer/use-design-rules.ts b/packages/ui-vue/components/textarea/src/designer/use-design-rules.ts
index 374600daaff..8b7e55d7b53 100644
--- a/packages/ui-vue/components/textarea/src/designer/use-design-rules.ts
+++ b/packages/ui-vue/components/textarea/src/designer/use-design-rules.ts
@@ -1,11 +1,9 @@
  
  
-import { ComponentSchema, DesignerComponentInstance, DesignerItemContext } from "../../../designer-canvas/src/types";
-import { UseDesignerRules } from "../../../designer-canvas/src/composition/types";
+import { UseDesignerRules, ComponentSchema, DesignerComponentInstance, DesignerItemContext } from "@farris/ui-vue/components/designer-canvas";
 import { TextareaProperty } from "../property-config/textarea.property-config";
 export function useTextareaDesignerRules(designItemContext: DesignerItemContext, designerHostService): UseDesignerRules {
     const schema = designItemContext.schema as ComponentSchema;
-
     // 构造属性配置方法
     function getPropsConfig(componentId: string, componentInstance: DesignerComponentInstance) {
         const inputGroupProps = new TextareaProperty(componentId, designerHostService);
diff --git a/packages/ui-vue/components/textarea/src/property-config/textarea.property-config.ts b/packages/ui-vue/components/textarea/src/property-config/textarea.property-config.ts
index 14bff0f4d3f..33e20f024a8 100644
--- a/packages/ui-vue/components/textarea/src/property-config/textarea.property-config.ts
+++ b/packages/ui-vue/components/textarea/src/property-config/textarea.property-config.ts
@@ -1,4 +1,4 @@
-import { InputBaseProperty } from "../../../property-panel/src/composition/entity/input-base-property";
+import { InputBaseProperty } from "@farris/ui-vue/components/property-panel";
 
 export class TextareaProperty extends InputBaseProperty {
 
diff --git a/packages/ui-vue/components/textarea/src/schema/schema-mapper.ts b/packages/ui-vue/components/textarea/src/schema/schema-mapper.ts
index 97964aee23b..2ca33ca0806 100644
--- a/packages/ui-vue/components/textarea/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/textarea/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/textarea/src/schema/schema-resolver.ts b/packages/ui-vue/components/textarea/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/textarea/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/textarea/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
diff --git a/packages/ui-vue/components/textarea/src/textarea.component.tsx b/packages/ui-vue/components/textarea/src/textarea.component.tsx
index 49eeace9a20..ceabea9838c 100644
--- a/packages/ui-vue/components/textarea/src/textarea.component.tsx
+++ b/packages/ui-vue/components/textarea/src/textarea.component.tsx
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 import { computed, defineComponent, nextTick, onMounted, Ref, ref, SetupContext, watch } from 'vue';
-import { TextAreaProps, textAreaProps } from './textarea.props';
 import { TextBoxProps, useClear, useTextBox, useCommonUtils } from '@farris/ui-vue/components/common';
+import { TextAreaProps, textAreaProps } from './textarea.props';
 
 export default defineComponent({
     name: 'FTextarea',
diff --git a/packages/ui-vue/components/textarea/src/textarea.props.ts b/packages/ui-vue/components/textarea/src/textarea.props.ts
index f4d350ddd6e..30c2c0997ca 100644
--- a/packages/ui-vue/components/textarea/src/textarea.props.ts
+++ b/packages/ui-vue/components/textarea/src/textarea.props.ts
@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 import { ExtractPropTypes } from 'vue';
-import { createPropsResolver } from '../../dynamic-resolver';
-import { schemaMapper } from './schema/schema-mapper';
-import textareaSchema from './schema/textarea.schema.json';
-import { schemaResolver } from './schema/schema-resolver';
 
 export const textAreaProps = {
     /** 是否撑开高度 */
@@ -73,12 +69,3 @@ export const textAreaProps = {
 } as Record<string, any>;
 
 export type TextAreaProps = ExtractPropTypes<typeof textAreaProps>;
-
-export const textAreaDesignProps = Object.assign({}, textAreaProps, {
-    readonly: {}
-});
-
-export type TextAreaDesignProps = ExtractPropTypes<typeof textAreaDesignProps>;
-
-export const propsResolver = createPropsResolver<TextAreaProps>(textAreaProps, textareaSchema, schemaMapper, schemaResolver);
-
-- 
Gitee


From 60a4ce10786d47042af39c86cc4c734c7e043998 Mon Sep 17 00:00:00 2001
From: hyygzds <m15966339253@163.com>
Date: Wed, 30 Jul 2025 14:03:32 +0800
Subject: [PATCH 48/62] fix: remove dependencies of section

---
 .../components/designer-canvas/index.ts       |  3 +-
 .../designer-canvas/src/components/maps.ts    |  2 +-
 .../dynamic-view/src/components/maps.ts       |  2 +-
 .../designer/page-header.design.component.tsx |  3 +-
 .../ui-vue/components/section/designer.ts     | 36 +++++++++++++++++++
 packages/ui-vue/components/section/index.ts   | 18 +---------
 .../src/components/toolbar.component.tsx      |  2 +-
 .../section-header.design.component.tsx       |  7 ++--
 .../section-toolbar-item.design.props.ts      | 21 +++++++++++
 .../designer/section-toolbar-item.props.ts    |  3 --
 .../section-toolbar.design.component.tsx      |  7 ++--
 .../src/designer/section.design.component.tsx | 11 +++---
 .../src/designer/section.design.props.ts      | 18 ++++++++++
 .../src/designer/use-designer-rules.ts        | 17 +++++----
 .../section.property-config.ts                |  4 +--
 .../section/src/schema/schema-mapper.ts       |  2 +-
 .../section/src/schema/schema-resolver.ts     |  5 ++-
 .../section/src/section.component.tsx         |  2 +-
 .../components/section/src/section.props.ts   | 16 ---------
 19 files changed, 109 insertions(+), 70 deletions(-)
 create mode 100644 packages/ui-vue/components/section/designer.ts
 create mode 100644 packages/ui-vue/components/section/src/designer/section-toolbar-item.design.props.ts
 create mode 100644 packages/ui-vue/components/section/src/designer/section.design.props.ts

diff --git a/packages/ui-vue/components/designer-canvas/index.ts b/packages/ui-vue/components/designer-canvas/index.ts
index 59918465f6e..f4ecd9e79d8 100644
--- a/packages/ui-vue/components/designer-canvas/index.ts
+++ b/packages/ui-vue/components/designer-canvas/index.ts
@@ -3,7 +3,7 @@ import FDesignerItem from './src/components/designer-item.component';
 import FDesignerInnerItem from './src/components/designer-inner-item.component';
 import { DgControl } from './src/composition/dg-control';
 import type { DesignerHostService, UseDesignerRules, DesignerHTMLElement, DraggingResolveContext } from './src/composition/types';
-import { canvasChanged, setPositionForSelectedElement, setPositionOfButtonGroup } from './src/composition/designer-canvas-changed';
+import { canvasChanged, setPositionForSelectedElement, setPositionOfButtonGroup, setPositionOfSelectedComponentBtnGroup } from './src/composition/designer-canvas-changed';
 
 export * from './src/composition/props/designer-canvas.props';
 export * from './src/composition/function/use-designer-component';
@@ -18,6 +18,7 @@ export {
     canvasChanged,
     setPositionForSelectedElement,
     setPositionOfButtonGroup,
+    setPositionOfSelectedComponentBtnGroup,
     FDesignerItem,
     DgControl, 
     UseDesignerRules, 
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 dfdb8753ffb..5e58ac5cd4a 100644
--- a/packages/ui-vue/components/designer-canvas/src/components/maps.ts
+++ b/packages/ui-vue/components/designer-canvas/src/components/maps.ts
@@ -36,7 +36,7 @@ import FResponseToolbar from '@farris/ui-vue/components/response-toolbar/designe
 import FResponseLayout from '@farris/ui-vue/components/response-layout';
 import FResponseLayoutEditorSetting from '@farris/ui-vue/components/response-layout-editor';
 import FSearchBox from '@farris/ui-vue/components/search-box';
-import FSection from '@farris/ui-vue/components/section';
+import FSection from '@farris/ui-vue/components/section/designer';
 import FSmokeDetector from '@farris/ui-vue/components/smoke-detector';
 import FSplitter from '@farris/ui-vue/components/splitter';
 import FStep from '@farris/ui-vue/components/step';
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 d170551550b..953b7229989 100644
--- a/packages/ui-vue/components/dynamic-view/src/components/maps.ts
+++ b/packages/ui-vue/components/dynamic-view/src/components/maps.ts
@@ -41,7 +41,7 @@ import FResponseToolbar from '@farris/ui-vue/components/response-toolbar/designe
 import FResponseLayout from '@farris/ui-vue/components/response-layout';
 import FResponseLayoutEditorSetting from '@farris/ui-vue/components/response-layout-editor';
 import FSearchBox from '@farris/ui-vue/components/search-box';
-import FSection from '@farris/ui-vue/components/section';
+import FSection from '@farris/ui-vue/components/section/designer';
 import FSmokeDetector from '@farris/ui-vue/components/smoke-detector';
 import FSplitter from '@farris/ui-vue/components/splitter';
 import FStep from '@farris/ui-vue/components/step';
diff --git a/packages/ui-vue/components/page-header/src/designer/page-header.design.component.tsx b/packages/ui-vue/components/page-header/src/designer/page-header.design.component.tsx
index 4fadf36de71..8a7f37ed735 100644
--- a/packages/ui-vue/components/page-header/src/designer/page-header.design.component.tsx
+++ b/packages/ui-vue/components/page-header/src/designer/page-header.design.component.tsx
@@ -1,10 +1,9 @@
 import { computed, defineComponent, inject, onMounted, ref, watch } from 'vue';
-import { responseToolbarResolver } from '@farris/ui-vue/components/response-toolbar/designer';
+import FResponseToolbarDesignComponent, { responseToolbarResolver } from '@farris/ui-vue/components/response-toolbar/designer';
 import { PageHeaderDesignerProps, pageHeaderDesignerProps } from '../page-header.props';
 import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
 import { DesignerItemContext } from '../../../designer-canvas/src/types';
 import { useDesignerRules } from './use-designer-rules';
-import FResponseToolbarDesignComponent from '../../../response-toolbar/src/designer/response-toolbar.design.component';
 import FDesignerInnerItem from '../../../designer-canvas/src/components/designer-inner-item.component';
 
 export default defineComponent({
diff --git a/packages/ui-vue/components/section/designer.ts b/packages/ui-vue/components/section/designer.ts
new file mode 100644
index 00000000000..adecb4e5a1b
--- /dev/null
+++ b/packages/ui-vue/components/section/designer.ts
@@ -0,0 +1,36 @@
+ 
+/**
+ * Copyright (c) 2020 - present, Inspur Genersoft Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import Section from '@farris/ui-vue/components/section';
+import { withInstall } from '@farris/ui-vue/components/common';
+import { FResponseToolbarDesign } from '@farris/ui-vue/components/response-toolbar/designer';
+import { sectionToolbarItemResolver } from './src/designer/section-toolbar-item.design.props';
+import { eventHandlerResolver, propsResolver,sectionToolbarPropsResolver } from './src/designer/section.design.props';
+import SectionDesign from './src/designer/section.design.component';
+
+SectionDesign.register = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>, resolverMap: Record<string, any>) => {
+    componentMap.section = Section;
+    propsResolverMap.section = propsResolver;
+    resolverMap.section = { eventHandlerResolver };
+};
+SectionDesign.registerDesigner = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>) => {    
+    componentMap.section = SectionDesign;
+    propsResolverMap.section = propsResolver;
+    propsResolverMap['section-toolbar-item'] = sectionToolbarItemResolver;
+    componentMap['section-toolbar'] = FResponseToolbarDesign;
+    propsResolverMap['section-toolbar'] = sectionToolbarPropsResolver;
+};
+export default withInstall(SectionDesign);
diff --git a/packages/ui-vue/components/section/index.ts b/packages/ui-vue/components/section/index.ts
index b03320432bf..0a8210041b2 100644
--- a/packages/ui-vue/components/section/index.ts
+++ b/packages/ui-vue/components/section/index.ts
@@ -15,25 +15,9 @@
  * limitations under the License.
  */
 import Section from './src/section.component';
-import SestionDesign from './src/designer/section.design.component';
-import { eventHandlerResolver, propsResolver,sectionToolbarPropsResolver } from './src/section.props';
 import { withInstall } from '@farris/ui-vue/components/common';
-import { sectionToolbarItemResolver} from './src/designer/section-toolbar-item.props';
-import FResponseToolbarDesign from '../response-toolbar/src/designer/response-toolbar.design.component';
 
 export * from './src/section.props';
-
-Section.register = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>, resolverMap: Record<string, any>) => {
-    componentMap.section = Section;
-    propsResolverMap.section = propsResolver;
-    resolverMap.section = { eventHandlerResolver };
-};
-Section.registerDesigner = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>) => {    
-    componentMap.section = SestionDesign;
-    propsResolverMap.section = propsResolver;
-    propsResolverMap['section-toolbar-item'] = sectionToolbarItemResolver;
-    componentMap['section-toolbar'] = FResponseToolbarDesign;
-    propsResolverMap['section-toolbar'] = sectionToolbarPropsResolver;
-};
+export * from './src/designer/section-toolbar-item.props';
 export { Section };
 export default withInstall(Section);
diff --git a/packages/ui-vue/components/section/src/components/toolbar.component.tsx b/packages/ui-vue/components/section/src/components/toolbar.component.tsx
index 5e615e64836..ae276b3885d 100644
--- a/packages/ui-vue/components/section/src/components/toolbar.component.tsx
+++ b/packages/ui-vue/components/section/src/components/toolbar.component.tsx
@@ -1,6 +1,6 @@
+import FResponseToolbar from '@farris/ui-vue/components/response-toolbar';
 import { SetupContext, computed, ref, Ref } from 'vue';
 import { SectionProps } from '../section.props';
-import FResponseToolbar from '@farris/ui-vue/components/response-toolbar';
 
 export default function (props: SectionProps, context: SetupContext) {
 
diff --git a/packages/ui-vue/components/section/src/designer/section-header.design.component.tsx b/packages/ui-vue/components/section/src/designer/section-header.design.component.tsx
index cf9a9d5672d..972332bac97 100644
--- a/packages/ui-vue/components/section/src/designer/section-header.design.component.tsx
+++ b/packages/ui-vue/components/section/src/designer/section-header.design.component.tsx
@@ -1,9 +1,8 @@
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
-import { SetupContext, computed, Ref, nextTick, watch } from 'vue';
+import { SetupContext, computed, Ref, nextTick } from 'vue';
+import { DesignerItemContext, setPositionOfSelectedComponentBtnGroup } from '@farris/ui-vue/components/designer-canvas';
 import { useSectionMaxMin } from '../composition/use-max-min';
-import { SectionDesignProps } from '../section.props';
+import { SectionDesignProps } from './section.design.props';
 import renderDesignSectionToolbar from './section-toolbar.design.component';
-import { setPositionOfSelectedComponentBtnGroup } from '../../../designer-canvas/src/composition/designer-canvas-changed';
 
 export default function (
     props: SectionDesignProps,
diff --git a/packages/ui-vue/components/section/src/designer/section-toolbar-item.design.props.ts b/packages/ui-vue/components/section/src/designer/section-toolbar-item.design.props.ts
new file mode 100644
index 00000000000..d37d8391870
--- /dev/null
+++ b/packages/ui-vue/components/section/src/designer/section-toolbar-item.design.props.ts
@@ -0,0 +1,21 @@
+
+/**
+ * Copyright (c) 2020 - present, Inspur Genersoft Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { SectionToolbarItemProps, sectionToolbarItemProps } from '@farris/ui-vue/components/section';
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
+import sectionToolbarItemSchema from '../schema/section-toolbar-item.schema.json';
+export const sectionToolbarItemResolver = createPropsResolver<SectionToolbarItemProps>(sectionToolbarItemProps, sectionToolbarItemSchema);
diff --git a/packages/ui-vue/components/section/src/designer/section-toolbar-item.props.ts b/packages/ui-vue/components/section/src/designer/section-toolbar-item.props.ts
index b694bcd7cae..05ca428053d 100644
--- a/packages/ui-vue/components/section/src/designer/section-toolbar-item.props.ts
+++ b/packages/ui-vue/components/section/src/designer/section-toolbar-item.props.ts
@@ -16,8 +16,6 @@
  */
 
 import { ExtractPropTypes } from 'vue';
-import { createPropsResolver } from '../../../dynamic-resolver';
-import sectionToolbarItemSchema from '../schema/section-toolbar-item.schema.json';
 
 export const sectionToolbarItemProps = {
     id: { type: String, default: '' },
@@ -38,4 +36,3 @@ export const sectionToolbarItemProps = {
 } as Record<string, any>;
 
 export type SectionToolbarItemProps = ExtractPropTypes<typeof sectionToolbarItemProps>;
-export const sectionToolbarItemResolver = createPropsResolver<SectionToolbarItemProps>(sectionToolbarItemProps, sectionToolbarItemSchema);
diff --git a/packages/ui-vue/components/section/src/designer/section-toolbar.design.component.tsx b/packages/ui-vue/components/section/src/designer/section-toolbar.design.component.tsx
index 0e010f979fd..b9b4eb23ecf 100644
--- a/packages/ui-vue/components/section/src/designer/section-toolbar.design.component.tsx
+++ b/packages/ui-vue/components/section/src/designer/section-toolbar.design.component.tsx
@@ -1,9 +1,8 @@
 
 import { computed, ref } from 'vue';
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
-import FResponseToolbarDesign from '../../../response-toolbar/src/designer/response-toolbar.design.component';
-import FDesignerInnerItem from '../../../designer-canvas/src/components/designer-inner-item.component';
-import { SectionDesignProps } from '../section.props';
+import { DesignerItemContext, FDesignerInnerItem } from '@farris/ui-vue/components/designer-canvas';
+import FResponseToolbarDesign from '@farris/ui-vue/components/response-toolbar';
+import { SectionDesignProps } from './section.design.props';
 
 export default function (
     props: SectionDesignProps,
diff --git a/packages/ui-vue/components/section/src/designer/section.design.component.tsx b/packages/ui-vue/components/section/src/designer/section.design.component.tsx
index d3577e064fa..0200f2dd6a3 100644
--- a/packages/ui-vue/components/section/src/designer/section.design.component.tsx
+++ b/packages/ui-vue/components/section/src/designer/section.design.component.tsx
@@ -13,16 +13,13 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-import { computed, defineComponent, inject, onMounted, ref, SetupContext, watch } from 'vue';
-import { SectionDesignProps, sectionDesignProps } from '../section.props';
-
+import { computed, defineComponent, inject, onMounted, ref, SetupContext } from 'vue';
+import { getCustomClass } from '@farris/ui-vue/components/common';
+import { DesignerItemContext, useDesignerComponent, DesignerHostService } from '@farris/ui-vue/components/designer-canvas';
+import { SectionDesignProps, sectionDesignProps } from './section.design.props';
 import { useDesignerRules } from './use-designer-rules';
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
 import getSectionHeaderRenderDesign from './section-header.design.component';
 import renderSectionToolbarDesign from './section-toolbar.design.component';
-import { getCustomClass } from '@farris/ui-vue/components/common';
-import { DesignerHostService } from '../../../designer-canvas/src/composition/types';
 
 export default defineComponent({
     name: 'FSectionDesign',
diff --git a/packages/ui-vue/components/section/src/designer/section.design.props.ts b/packages/ui-vue/components/section/src/designer/section.design.props.ts
new file mode 100644
index 00000000000..2c3fbb88d95
--- /dev/null
+++ b/packages/ui-vue/components/section/src/designer/section.design.props.ts
@@ -0,0 +1,18 @@
+import { ExtractPropTypes } from 'vue';
+import { createPropsResolver, createSectionEventHandlerResolver } from '@farris/ui-vue/components/dynamic-resolver';
+import { ResponseToolbarProps, responseToolbarProps } from '@farris/ui-vue/components/response-toolbar';
+import { schemaResolver as responseSchemaResolver } from '@farris/ui-vue/components/response-toolbar/designer';
+import { SectionProps, sectionProps } from '@farris/ui-vue/components/section';
+import { schemaMapper } from '../schema/schema-mapper';
+import { schemaResolver } from '../schema/schema-resolver';
+import sectionSchema from '../schema/section.schema.json';
+import sectionToolbarSchema from '../schema/section-toolbar.schema.json';
+
+export const propsResolver = createPropsResolver<SectionProps>(sectionProps, sectionSchema, schemaMapper, schemaResolver);
+export const eventHandlerResolver = createSectionEventHandlerResolver();
+export const sectionDesignProps = Object.assign({}, sectionProps, { componentId: { type: String, default: '' } });
+export type SectionDesignProps = ExtractPropTypes<typeof sectionDesignProps>;
+export const sectionToolbarPropsResolver = createPropsResolver<ResponseToolbarProps>(
+    responseToolbarProps, sectionToolbarSchema, schemaMapper, responseSchemaResolver
+);
+
diff --git a/packages/ui-vue/components/section/src/designer/use-designer-rules.ts b/packages/ui-vue/components/section/src/designer/use-designer-rules.ts
index 74693c949bb..1873365ce3b 100644
--- a/packages/ui-vue/components/section/src/designer/use-designer-rules.ts
+++ b/packages/ui-vue/components/section/src/designer/use-designer-rules.ts
@@ -1,10 +1,15 @@
-import { DesignerHostService, DraggingResolveContext, UseDesignerRules } from "../../../designer-canvas/src/composition/types";
-import { useDragulaCommonRule } from "../../../designer-canvas/src/composition/rule/use-dragula-common-rule";
-import { ComponentSchema, DesignerItemContext } from "../../../designer-canvas/src/types";
+import { 
+    DesignerHostService, 
+    DraggingResolveContext, 
+    UseDesignerRules, 
+    useDragulaCommonRule, 
+    ComponentSchema, 
+    DesignerItemContext,
+    UseTemplateDragAndDropRules,
+    DgControl 
+} from "@farris/ui-vue/components/designer-canvas";
+import { getSchemaByType } from "@farris/ui-vue/components/dynamic-resolver";
 import { SectionProperty } from "../property-config/section.property-config";
-import { UseTemplateDragAndDropRules } from "../../../designer-canvas/src/composition/rule/use-template-rule";
-import { DgControl } from "../../../designer-canvas";
-import { getSchemaByType } from "../../../dynamic-resolver";
 
 export function useDesignerRules(designItemContext: DesignerItemContext, designerHostService?: DesignerHostService): UseDesignerRules {
 
diff --git a/packages/ui-vue/components/section/src/property-config/section.property-config.ts b/packages/ui-vue/components/section/src/property-config/section.property-config.ts
index 962660c78f3..27df4977465 100644
--- a/packages/ui-vue/components/section/src/property-config/section.property-config.ts
+++ b/packages/ui-vue/components/section/src/property-config/section.property-config.ts
@@ -1,5 +1,5 @@
-import { canvasChanged } from "../../../designer-canvas/src/composition/designer-canvas-changed";
-import { BaseControlProperty } from "../../../property-panel/src/composition/entity/base-property";
+import { canvasChanged } from "@farris/ui-vue/components/designer-canvas";
+import { BaseControlProperty } from "@farris/ui-vue/components/property-panel";
 
 export class SectionProperty extends BaseControlProperty {
     constructor(componentId: string, designerHostService: any) {
diff --git a/packages/ui-vue/components/section/src/schema/schema-mapper.ts b/packages/ui-vue/components/section/src/schema/schema-mapper.ts
index bbde3b70220..d7613a6b96d 100644
--- a/packages/ui-vue/components/section/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/section/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { resolveAppearance, MapperFunction } from '../../../dynamic-resolver';
+import { resolveAppearance, MapperFunction } from '@farris/ui-vue/components/dynamic-resolver';
 import { resolveSectionAccordion } from './accordion-resolver';
 import { resolveSectionToolbar } from './toolbar-resolver';
 
diff --git a/packages/ui-vue/components/section/src/schema/schema-resolver.ts b/packages/ui-vue/components/section/src/schema/schema-resolver.ts
index ab718b1661b..d0e96cd7d41 100644
--- a/packages/ui-vue/components/section/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/section/src/schema/schema-resolver.ts
@@ -1,6 +1,5 @@
-import { ComponentSchema, DesignerComponentInstance } from "../../../designer-canvas";
-import { DgControl } from "../../../designer-canvas/src/composition/dg-control";
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { ComponentSchema, DesignerComponentInstance, DgControl } from "@farris/ui-vue/components/designer-canvas";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 /**
  * 从工具箱拖拽创建分组面板，自动创建container-section两层结构
diff --git a/packages/ui-vue/components/section/src/section.component.tsx b/packages/ui-vue/components/section/src/section.component.tsx
index ffee4475bb4..e3416197b56 100644
--- a/packages/ui-vue/components/section/src/section.component.tsx
+++ b/packages/ui-vue/components/section/src/section.component.tsx
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 import { computed, defineComponent, onMounted, ref, SetupContext, watch } from 'vue';
+import { getCustomClass } from '@farris/ui-vue/components/common';
 import { SectionProps, sectionProps } from './section.props';
 import getSectionHeaderRender from './components/header.component';
 import getSectionToolbar from './components/toolbar.component';
-import { getCustomClass } from '@farris/ui-vue/components/common';
 
 export default defineComponent({
     name: 'FSection',
diff --git a/packages/ui-vue/components/section/src/section.props.ts b/packages/ui-vue/components/section/src/section.props.ts
index 1fba53772e1..f0d9c373f16 100644
--- a/packages/ui-vue/components/section/src/section.props.ts
+++ b/packages/ui-vue/components/section/src/section.props.ts
@@ -14,14 +14,6 @@
  * limitations under the License.
  */
 import { ExtractPropTypes, PropType } from 'vue';
-import { createPropsResolver, createSectionEventHandlerResolver } from '../../dynamic-resolver';
-import { schemaMapper } from './schema/schema-mapper';
-import { schemaResolver } from './schema/schema-resolver';
-import sectionSchema from './schema/section.schema.json';
-import sectionToolbarSchema from './schema/section-toolbar.schema.json';
-import { ResponseToolbarProps, responseToolbarProps } from '../../response-toolbar/src/response-toolbar.props';
-import { schemaResolver as responseSchemaResolver } from '../../response-toolbar/src/schema/schema-resolver';
-
 export interface ButtonAppearance {
     class: string;
 }
@@ -102,11 +94,3 @@ export const sectionProps = {
 
 export type SectionProps = ExtractPropTypes<typeof sectionProps>;
 
-export const propsResolver = createPropsResolver<SectionProps>(sectionProps, sectionSchema, schemaMapper, schemaResolver);
-export const eventHandlerResolver = createSectionEventHandlerResolver();
-export const sectionDesignProps = Object.assign({}, sectionProps, { componentId: { type: String, default: '' } });
-export type SectionDesignProps = ExtractPropTypes<typeof sectionDesignProps>;
-export const sectionToolbarPropsResolver = createPropsResolver<ResponseToolbarProps>(
-    responseToolbarProps, sectionToolbarSchema, schemaMapper, responseSchemaResolver
-);
-
-- 
Gitee


From 2073242510c7cc3c8b3a2f137f88a7886b1f9c56 Mon Sep 17 00:00:00 2001
From: hyygzds <m15966339253@163.com>
Date: Thu, 31 Jul 2025 19:00:45 +0800
Subject: [PATCH 49/62] fix: remove redundant export

---
 packages/ui-vue/components/designer.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/ui-vue/components/designer.ts b/packages/ui-vue/components/designer.ts
index b8aabcb5d13..455221c4f51 100644
--- a/packages/ui-vue/components/designer.ts
+++ b/packages/ui-vue/components/designer.ts
@@ -8,6 +8,6 @@ export { FPropertyPanel, SchemaDOMMapping, type FormPropertyChangeObject } from
 export { FEventParameter } from './event-parameter';
 export * from './schema-selector';
 export * from './dynamic-resolver';
-export * from './field-selector';
+// export * from './field-selector';
 export { resolverMap } from './dynamic-view';
 
-- 
Gitee


From 74c06416c4b1447af4eec610f4d97480c294ea77 Mon Sep 17 00:00:00 2001
From: hyygzds <m15966339253@163.com>
Date: Sat, 2 Aug 2025 15:40:00 +0800
Subject: [PATCH 50/62] build: optimize build lib

---
 .../components/button-edit/src/button-edit.props.ts       | 2 +-
 .../components/button-edit/src/schema/schema-resolver.ts  | 2 +-
 packages/ui-vue/components/component/index.ts             | 3 ++-
 .../src/component/response-layout-item.props.ts           | 2 +-
 .../src/designer/response-layout-designer-rules.ts        | 3 +--
 .../src/designer/response-layout-item-designer-rules.ts   | 8 +++-----
 .../designer/response-layout-item.design.component.tsx    | 3 +--
 .../src/designer/response-layout.design.component.tsx     | 3 +--
 .../response-layout-item.property-config.ts               | 2 +-
 .../composition/use-response-layout.ts                    | 6 +++---
 .../response-layout-splitter.props.ts                     | 2 +-
 .../property-config/response-layout.property-config.ts    | 4 ++--
 .../response-layout/src/response-layout.props.ts          | 2 +-
 .../response-layout/src/schema/schema-mapper.ts           | 2 +-
 .../response-layout/src/schema/schema-resolver.ts         | 4 ++--
 .../video/src/designer/video.design.component.tsx         | 6 ++----
 .../ui-vue/components/video/src/schema/schema-mapper.ts   | 2 +-
 .../ui-vue/components/video/src/schema/schema-resolver.ts | 2 +-
 packages/ui-vue/components/video/src/video.component.tsx  | 1 -
 packages/ui-vue/components/video/src/video.props.ts       | 2 +-
 .../weather/src/designer/weather.design.component.tsx     | 5 ++---
 .../ui-vue/components/weather/src/schema/schema-mapper.ts | 2 +-
 .../components/weather/src/schema/schema-resolver.ts      | 2 +-
 .../ui-vue/components/weather/src/weather.component.tsx   | 2 +-
 packages/ui-vue/components/weather/src/weather.props.ts   | 2 +-
 packages/ui-vue/scripts/commands/build.js                 | 2 +-
 26 files changed, 34 insertions(+), 42 deletions(-)

diff --git a/packages/ui-vue/components/button-edit/src/button-edit.props.ts b/packages/ui-vue/components/button-edit/src/button-edit.props.ts
index 5c63aabe534..4b32ff2a3a9 100644
--- a/packages/ui-vue/components/button-edit/src/button-edit.props.ts
+++ b/packages/ui-vue/components/button-edit/src/button-edit.props.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 import { ExtractPropTypes, PropType } from 'vue';
-import { ModalOptions } from '../../modal/src/composition/type';
+import { ModalOptions } from '@farris/ui-vue/components/modal';
 
 type TextAlignment = 'left' | 'center' | 'right';
 
diff --git a/packages/ui-vue/components/button-edit/src/schema/schema-resolver.ts b/packages/ui-vue/components/button-edit/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/button-edit/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/button-edit/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
diff --git a/packages/ui-vue/components/component/index.ts b/packages/ui-vue/components/component/index.ts
index b36866466dc..aebc674a635 100644
--- a/packages/ui-vue/components/component/index.ts
+++ b/packages/ui-vue/components/component/index.ts
@@ -20,8 +20,9 @@ import ComponentDesign from './src/designer/component.design.component';
 import { propsResolver } from './src/component.props';
 import { componentPropsResolver } from './src/component-ref.props';
 import { ComponentBuildInfo } from './src/composition/inner-component-build-info';
+import { useDesignerRules } from './src/designer/use-designer-rules';
 export * from './src/component.props';
-export { Component, ComponentDesign, type ComponentBuildInfo };
+export { Component, ComponentDesign,useDesignerRules, type ComponentBuildInfo };
 
 export default {
     install(app: App): void {
diff --git a/packages/ui-vue/components/response-layout/src/component/response-layout-item.props.ts b/packages/ui-vue/components/response-layout/src/component/response-layout-item.props.ts
index 05f2ebb7e8c..80db6d33f4b 100644
--- a/packages/ui-vue/components/response-layout/src/component/response-layout-item.props.ts
+++ b/packages/ui-vue/components/response-layout/src/component/response-layout-item.props.ts
@@ -1,6 +1,6 @@
  
 import { ExtractPropTypes } from "vue";
-import { createPropsResolver } from "../../../dynamic-resolver";
+import { createPropsResolver } from "@farris/ui-vue/components/dynamic-resolver";
 import { schemaMapper } from "../schema/schema-mapper";
 import responseLayoutItemSchema from '../schema/response-layout-item.schema.json';
 
diff --git a/packages/ui-vue/components/response-layout/src/designer/response-layout-designer-rules.ts b/packages/ui-vue/components/response-layout/src/designer/response-layout-designer-rules.ts
index d2766854cf8..4183d9501de 100644
--- a/packages/ui-vue/components/response-layout/src/designer/response-layout-designer-rules.ts
+++ b/packages/ui-vue/components/response-layout/src/designer/response-layout-designer-rules.ts
@@ -1,5 +1,4 @@
-import { DraggingResolveContext, UseDesignerRules } from "../../../designer-canvas/src/composition/types";
-import { ComponentSchema, DesignerItemContext } from "../../../designer-canvas/src/types";
+import { DraggingResolveContext, UseDesignerRules, ComponentSchema, DesignerItemContext } from "@farris/ui-vue/components/designer-canvas";
 import { ResponseLayoutProperty } from "../property-config/response-layout.property-config";
 
 export function useDesignerRules(designItemContext: DesignerItemContext, designerHostService): UseDesignerRules {
diff --git a/packages/ui-vue/components/response-layout/src/designer/response-layout-item-designer-rules.ts b/packages/ui-vue/components/response-layout/src/designer/response-layout-item-designer-rules.ts
index 30cb0a12c44..423e3ab887d 100644
--- a/packages/ui-vue/components/response-layout/src/designer/response-layout-item-designer-rules.ts
+++ b/packages/ui-vue/components/response-layout/src/designer/response-layout-item-designer-rules.ts
@@ -1,9 +1,7 @@
-import { getSchemaByType } from "../../../dynamic-resolver";
-import { DgControl } from "../../../designer-canvas";
-import { DesignerHTMLElement, DraggingResolveContext, UseDesignerRules } from "../../../designer-canvas/src/composition/types";
-import { ComponentSchema, DesignerItemContext } from "../../../designer-canvas/src/types";
+import { getSchemaByType } from "@farris/ui-vue/components/dynamic-resolver";
+import { DesignerHTMLElement, DraggingResolveContext, UseDesignerRules, DgControl, ComponentSchema, DesignerItemContext } from "@farris/ui-vue/components/designer-canvas";
+import { useDesignerRules as formUseDesignerRules } from "@farris/ui-vue/components/dynamic-form";
 import { ResponseLayoutItemProperty } from "../property-config/response-layout-item.property-config";
-import { useDesignerRules as formUseDesignerRules } from "../../../dynamic-form/src/designer/response-form-use-designer-rules";
 
 export function useDesignerRules(designItemContext: DesignerItemContext, designerHostService): UseDesignerRules {
     const schema = designItemContext.schema as ComponentSchema;
diff --git a/packages/ui-vue/components/response-layout/src/designer/response-layout-item.design.component.tsx b/packages/ui-vue/components/response-layout/src/designer/response-layout-item.design.component.tsx
index 3aef10433c9..4964a067991 100644
--- a/packages/ui-vue/components/response-layout/src/designer/response-layout-item.design.component.tsx
+++ b/packages/ui-vue/components/response-layout/src/designer/response-layout-item.design.component.tsx
@@ -1,6 +1,5 @@
 import { computed, defineComponent, inject, onMounted, ref } from 'vue';
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
+import { DesignerItemContext, useDesignerComponent } from '@farris/ui-vue/components/designer-canvas';
 import { ResponseLayoutItemPropsType, responseLayoutItemProps } from '../component/response-layout-item.props';
 import { useDesignerRules } from './response-layout-item-designer-rules';
 
diff --git a/packages/ui-vue/components/response-layout/src/designer/response-layout.design.component.tsx b/packages/ui-vue/components/response-layout/src/designer/response-layout.design.component.tsx
index 15be6d9c1b0..7c1508cade1 100644
--- a/packages/ui-vue/components/response-layout/src/designer/response-layout.design.component.tsx
+++ b/packages/ui-vue/components/response-layout/src/designer/response-layout.design.component.tsx
@@ -1,6 +1,5 @@
 import { computed, defineComponent, inject, onMounted, ref } from 'vue';
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
+import { DesignerItemContext, useDesignerComponent } from '@farris/ui-vue/components/designer-canvas';
 import { ResponseLayoutPropsType, responseLayoutProps } from '../response-layout.props';
 import { useDesignerRules } from './response-layout-designer-rules';
 
diff --git a/packages/ui-vue/components/response-layout/src/property-config/response-layout-item.property-config.ts b/packages/ui-vue/components/response-layout/src/property-config/response-layout-item.property-config.ts
index b69e0bb2c5b..f0608bf1f75 100644
--- a/packages/ui-vue/components/response-layout/src/property-config/response-layout-item.property-config.ts
+++ b/packages/ui-vue/components/response-layout/src/property-config/response-layout-item.property-config.ts
@@ -1,4 +1,4 @@
-import { BaseControlProperty } from "../../../property-panel/src/composition/entity/base-property";
+import { BaseControlProperty } from "@farris/ui-vue/components/property-panel";
 
 export class ResponseLayoutItemProperty extends BaseControlProperty {
     constructor(componentId: string, designerHostService: any) {
diff --git a/packages/ui-vue/components/response-layout/src/property-config/response-layout-splitter/composition/use-response-layout.ts b/packages/ui-vue/components/response-layout/src/property-config/response-layout-splitter/composition/use-response-layout.ts
index 23db017eefc..0caf0923af0 100644
--- a/packages/ui-vue/components/response-layout/src/property-config/response-layout-splitter/composition/use-response-layout.ts
+++ b/packages/ui-vue/components/response-layout/src/property-config/response-layout-splitter/composition/use-response-layout.ts
@@ -1,8 +1,8 @@
-import { ComponentSchema } from "../../../../../designer-canvas";
-import { getSchemaByType } from "../../../../../dynamic-resolver";
 import { inject, Ref, ref, SetupContext } from "vue";
+import { ComponentSchema } from "@farris/ui-vue/components/designer-canvas";
+import { getSchemaByType } from "@farris/ui-vue/components/dynamic-resolver";
+import { FMessageBoxService } from "@farris/ui-vue/components/message-box";
 import { ResponseLayoutSplitterProps } from "../response-layout-splitter.props";
-import { FMessageBoxService } from "@/components/message-box";
 
 export function useResponseLayoutSplitter(props: ResponseLayoutSplitterProps, context: SetupContext) {
 
diff --git a/packages/ui-vue/components/response-layout/src/property-config/response-layout-splitter/response-layout-splitter.props.ts b/packages/ui-vue/components/response-layout/src/property-config/response-layout-splitter/response-layout-splitter.props.ts
index 9786886ba40..d9711933827 100644
--- a/packages/ui-vue/components/response-layout/src/property-config/response-layout-splitter/response-layout-splitter.props.ts
+++ b/packages/ui-vue/components/response-layout/src/property-config/response-layout-splitter/response-layout-splitter.props.ts
@@ -1,5 +1,5 @@
 
-import { createPropsResolver } from "../../../../dynamic-resolver";
+import { createPropsResolver } from "@farris/ui-vue/components/dynamic-resolver";
 import { ExtractPropTypes } from "vue";
 import responseLayoutSplitterSchema from './schema/response-layout-splitter.schema.json';
 
diff --git a/packages/ui-vue/components/response-layout/src/property-config/response-layout.property-config.ts b/packages/ui-vue/components/response-layout/src/property-config/response-layout.property-config.ts
index 1d8e890089e..0cd24d818c1 100644
--- a/packages/ui-vue/components/response-layout/src/property-config/response-layout.property-config.ts
+++ b/packages/ui-vue/components/response-layout/src/property-config/response-layout.property-config.ts
@@ -1,5 +1,5 @@
-import { canvasChanged } from "../../../designer-canvas/src/composition/designer-canvas-changed";
-import { BaseControlProperty } from "../../../property-panel/src/composition/entity/base-property";
+import { canvasChanged } from "@farris/ui-vue/components/designer-canvas";
+import { BaseControlProperty } from "@farris/ui-vue/components/property-panel";
 
 export class ResponseLayoutProperty extends BaseControlProperty {
     constructor(componentId: string, designerHostService: any) {
diff --git a/packages/ui-vue/components/response-layout/src/response-layout.props.ts b/packages/ui-vue/components/response-layout/src/response-layout.props.ts
index 8dc8d0f6524..bfac4b34d0c 100644
--- a/packages/ui-vue/components/response-layout/src/response-layout.props.ts
+++ b/packages/ui-vue/components/response-layout/src/response-layout.props.ts
@@ -1,6 +1,6 @@
  
 import { ExtractPropTypes } from "vue";
-import { createPropsResolver } from "../../dynamic-resolver";
+import { createPropsResolver } from "@farris/ui-vue/components/dynamic-resolver";
 import { schemaMapper } from "./schema/schema-mapper";
 import { schemaResolver } from "./schema/schema-resolver";
 import responseLayoutSchema from './schema/response-layout.schema.json';
diff --git a/packages/ui-vue/components/response-layout/src/schema/schema-mapper.ts b/packages/ui-vue/components/response-layout/src/schema/schema-mapper.ts
index bc768d5bab9..bbc05c95ac2 100644
--- a/packages/ui-vue/components/response-layout/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/response-layout/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { resolveAppearance, MapperFunction } from '../../../dynamic-resolver';
+import { resolveAppearance, MapperFunction } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/response-layout/src/schema/schema-resolver.ts b/packages/ui-vue/components/response-layout/src/schema/schema-resolver.ts
index 9ab2ef5358f..133fd8851ce 100644
--- a/packages/ui-vue/components/response-layout/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/response-layout/src/schema/schema-resolver.ts
@@ -1,5 +1,5 @@
-import { ComponentSchema } from "../../../designer-canvas/src/types";
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { ComponentSchema } from "@farris/ui-vue/components/designer-canvas";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     if (context.componentFeature) {
diff --git a/packages/ui-vue/components/video/src/designer/video.design.component.tsx b/packages/ui-vue/components/video/src/designer/video.design.component.tsx
index 10d226150db..d3282ded30b 100644
--- a/packages/ui-vue/components/video/src/designer/video.design.component.tsx
+++ b/packages/ui-vue/components/video/src/designer/video.design.component.tsx
@@ -15,12 +15,10 @@
  * defination
  */
 import { defineComponent, inject, onMounted, onUnmounted, ref, SetupContext } from 'vue';
+import { useDesignerComponent, DesignerItemContext, DesignerHostService } from '@farris/ui-vue/components/designer-canvas';
+import { useDesignerRules } from '@farris/ui-vue/components/component';
 import { VideoProps, videoProps } from '../video.props';
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
-import { useDesignerRules } from '../../../component/src/designer/use-designer-rules';
 import { useViewport } from '../composition/use-viewport';
-import { DesignerHostService } from '../../../designer-canvas/src/composition/types';
 
 export default defineComponent({
     name: 'FVideoDesign',
diff --git a/packages/ui-vue/components/video/src/schema/schema-mapper.ts b/packages/ui-vue/components/video/src/schema/schema-mapper.ts
index 97964aee23b..2ca33ca0806 100644
--- a/packages/ui-vue/components/video/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/video/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/video/src/schema/schema-resolver.ts b/packages/ui-vue/components/video/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/video/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/video/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
diff --git a/packages/ui-vue/components/video/src/video.component.tsx b/packages/ui-vue/components/video/src/video.component.tsx
index 665bd14fad3..ad9c267f217 100644
--- a/packages/ui-vue/components/video/src/video.component.tsx
+++ b/packages/ui-vue/components/video/src/video.component.tsx
@@ -16,7 +16,6 @@
  */
 import { computed, defineComponent, onUnmounted, ref, SetupContext } from 'vue';
 import { VideoProps, videoProps } from './video.props';
-import { useViewport } from './composition/use-viewport';
 import { useVideo } from './composition/use-video';
 
 export default defineComponent({
diff --git a/packages/ui-vue/components/video/src/video.props.ts b/packages/ui-vue/components/video/src/video.props.ts
index 799a9984a6e..2aed1a98536 100644
--- a/packages/ui-vue/components/video/src/video.props.ts
+++ b/packages/ui-vue/components/video/src/video.props.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { ExtractPropTypes, ref } from 'vue';
-import { createPropsResolver } from '../../dynamic-resolver';
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
 import videoSchema from './schema/video.schema.json';
 import { schemaMapper } from './schema/schema-mapper';
 import { schemaResolver } from './schema/schema-resolver';
diff --git a/packages/ui-vue/components/weather/src/designer/weather.design.component.tsx b/packages/ui-vue/components/weather/src/designer/weather.design.component.tsx
index b4357ed9f16..ea04a725c30 100644
--- a/packages/ui-vue/components/weather/src/designer/weather.design.component.tsx
+++ b/packages/ui-vue/components/weather/src/designer/weather.design.component.tsx
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 import { defineComponent, SetupContext, ref, onMounted, inject } from 'vue';
+import FProgress from '@farris/ui-vue/components/progress';
+import { DesignerItemContext, useDesignerComponent } from '@farris/ui-vue/components/designer-canvas';
 import { WeatherProps, weatherProps } from '../weather.props';
 import FWeather from '../weather.component';
-import FProgress from '../../../progress/src/progress.component';
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
 
 export default defineComponent({
     name: 'FWeatherDesign',
diff --git a/packages/ui-vue/components/weather/src/schema/schema-mapper.ts b/packages/ui-vue/components/weather/src/schema/schema-mapper.ts
index da282c239f2..c04275b18a6 100644
--- a/packages/ui-vue/components/weather/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/weather/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/weather/src/schema/schema-resolver.ts b/packages/ui-vue/components/weather/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/weather/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/weather/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
diff --git a/packages/ui-vue/components/weather/src/weather.component.tsx b/packages/ui-vue/components/weather/src/weather.component.tsx
index 08701eb8ee7..0d2829badac 100644
--- a/packages/ui-vue/components/weather/src/weather.component.tsx
+++ b/packages/ui-vue/components/weather/src/weather.component.tsx
@@ -16,13 +16,13 @@
  */
 import { computed, defineComponent, SetupContext, ref, onMounted } from 'vue';
 import { useResizeObserver } from '@vueuse/core';
+import FProgress from '@farris/ui-vue/components/progress';
 import { WeatherProps, weatherProps } from './weather.props';
 import getWeatherHome from './components/weather-home.component';
 import { useWeatherColor } from './composition/use-weather-color';
 import { useWeatherCharts } from './composition/use-weather-charts';
 import { useWeatherData } from './composition/use-weather-data';
 import './weather.css';
-import FProgress from '@farris/ui-vue/components/progress';
 
 export default defineComponent({
     name: 'FWeather',
diff --git a/packages/ui-vue/components/weather/src/weather.props.ts b/packages/ui-vue/components/weather/src/weather.props.ts
index 3f8bff53272..63a6c2dc70d 100644
--- a/packages/ui-vue/components/weather/src/weather.props.ts
+++ b/packages/ui-vue/components/weather/src/weather.props.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { ExtractPropTypes } from 'vue';
-import { createPropsResolver } from '../../dynamic-resolver';
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
 import { schemaMapper } from './schema/schema-mapper';
 import { schemaResolver } from './schema/schema-resolver';
 import weatherSchema from './schema/weather.schema.json';
diff --git a/packages/ui-vue/scripts/commands/build.js b/packages/ui-vue/scripts/commands/build.js
index 759fb039a45..04be13e06e4 100644
--- a/packages/ui-vue/scripts/commands/build.js
+++ b/packages/ui-vue/scripts/commands/build.js
@@ -87,7 +87,7 @@ function compileTsFile(componentName) {
 }
 
 const externals = ['vue', '@vueuse/core', '@vue/shared', 'bignumber.js',
-    'lodash', 'lodash-es', 'echarts', '@farris/ui-vue/components'];
+    'lodash', 'lodash-es', 'echarts','jsonp','crypto-js', '@farris/ui-vue/components'];
 
 async function buildSeperately(componentName) {
     const tsEntry = `./components/${componentName}/index.ts`;
-- 
Gitee


From eeb833877e469dce329ad11e003cd8750626ab9b Mon Sep 17 00:00:00 2001
From: hyygzds <m15966339253@163.com>
Date: Mon, 4 Aug 2025 14:07:19 +0800
Subject: [PATCH 51/62] fix: split dependency dynamic-resolver

---
 packages/ui-vue/components/avatar/src/avatar.props.ts       | 2 +-
 .../components/color-picker/src/color-picker.props.ts       | 2 +-
 .../component/src/composition/use-split-component.tsx       | 2 +-
 .../ui-vue/components/component/src/schema/schema-mapper.ts | 2 +-
 .../content-container/src/schema/schema-mapper.ts           | 2 +-
 .../src/composition/data-grid-component-creator.service.ts  | 2 +-
 .../src/composition/function/use-designer-component.ts      | 2 +-
 .../composition/function/use-designer-inner-component.ts    | 2 +-
 .../src/designer/form-group.design.component.tsx            | 2 +-
 .../dynamic-resolver/src/converter/appearance.converter.ts  | 2 +-
 .../dynamic-resolver/src/converter/buttons.converter.ts     | 2 +-
 .../src/converter/change-editor.converter.ts                | 2 +-
 .../src/converter/grid-selection.converter.ts               | 2 +-
 .../dynamic-resolver/src/converter/items-count.converter.ts | 2 +-
 .../dynamic-resolver/src/converter/pagination.converter.ts  | 2 +-
 .../src/converter/property-editor.converter.ts              | 2 +-
 .../dynamic-resolver/src/converter/row-number.converter.ts  | 2 +-
 .../dynamic-resolver/src/converter/type.converter.ts        | 3 +--
 .../dynamic-resolver/src/property-config-resolver.ts        | 6 +++---
 .../components/dynamic-resolver/src/props-resolver.ts       | 2 +-
 .../components/dynamic-resolver/src/schema-resolver.ts      | 2 +-
 packages/ui-vue/components/dynamic-resolver/src/types.ts    | 2 +-
 .../ui-vue/components/fieldset/src/schema/schema-mapper.ts  | 2 +-
 .../designer/filter-bar-config/filter-bar-config.props.ts   | 2 +-
 .../src/designer/filter-bar-config/schema/schema-mapper.ts  | 2 +-
 .../designer/filter-bar-config/schema/schema-resolver.ts    | 2 +-
 .../src/property-config/converter/input.converter.ts        | 2 +-
 .../components/number-spinner/src/number-spinner.props.ts   | 2 +-
 .../components/number-spinner/src/schema/schema-mapper.ts   | 2 +-
 .../components/number-spinner/src/schema/schema-resolver.ts | 2 +-
 .../components/page-header/src/schema/schema-mapper.ts      | 2 +-
 .../query-solution-config/query-solution-config.props.ts    | 2 +-
 .../designer/query-solution-config/schema/schema-mapper.ts  | 2 +-
 .../query-solution-config/schema/schema-resolver.ts         | 2 +-
 .../props/response-layout-editor-setting.props.ts           | 2 +-
 35 files changed, 37 insertions(+), 38 deletions(-)

diff --git a/packages/ui-vue/components/avatar/src/avatar.props.ts b/packages/ui-vue/components/avatar/src/avatar.props.ts
index 95f2ced7b8c..edddcc443ea 100644
--- a/packages/ui-vue/components/avatar/src/avatar.props.ts
+++ b/packages/ui-vue/components/avatar/src/avatar.props.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 import { ExtractPropTypes, PropType } from 'vue';
-import { createPropsResolver } from '../../dynamic-resolver/src/props-resolver';
+import { createPropsResolver } from '../../dynamic-resolver';
 import { schemaResolver } from './schema/schema-resolver';
 import { schemaMapper } from './schema/schema-mapper';
 import avatarSchema from './schema/avatar.schema.json';
diff --git a/packages/ui-vue/components/color-picker/src/color-picker.props.ts b/packages/ui-vue/components/color-picker/src/color-picker.props.ts
index 2f714ffd430..a72bc06e12e 100644
--- a/packages/ui-vue/components/color-picker/src/color-picker.props.ts
+++ b/packages/ui-vue/components/color-picker/src/color-picker.props.ts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 import { ExtractPropTypes } from 'vue';
-import { createPropsResolver } from '../../dynamic-resolver/src/props-resolver';
+import { createPropsResolver } from '../../dynamic-resolver';
 import colorPickerSchema from './schema/color-picker.schema.json';
 import { schemaResolver } from './schema/schema-resolver';
 import { schemaMapper } from './schema/schema-mapper';
diff --git a/packages/ui-vue/components/component/src/composition/use-split-component.tsx b/packages/ui-vue/components/component/src/composition/use-split-component.tsx
index 9061df62466..ea85eb2d70b 100644
--- a/packages/ui-vue/components/component/src/composition/use-split-component.tsx
+++ b/packages/ui-vue/components/component/src/composition/use-split-component.tsx
@@ -3,7 +3,7 @@ import { DesignerHostService } from "../../../designer-canvas/src/composition/ty
 import { ComponentSchema, DesignerItemContext, DgControl } from "@farris/ui-vue/components/designer-canvas";
 import { ModalFunctions } from "../../../modal/src/composition/type";
 import SplitterFormComponent from '../components/split-form-component.component';
-import { getSchemaByType, schemaMap } from "../../../dynamic-resolver";
+import { getSchemaByType, schemaMap } from "@farris/ui-vue/components/dynamic-resolver";
 import { useGuid } from "../../../common";
 import { canvasChanged } from "../../../designer-canvas/src/composition/designer-canvas-changed";
 import { refreshCanvas } from "../../../designer-canvas/src/composition/update-cancas";
diff --git a/packages/ui-vue/components/component/src/schema/schema-mapper.ts b/packages/ui-vue/components/component/src/schema/schema-mapper.ts
index bc768d5bab9..bbc05c95ac2 100644
--- a/packages/ui-vue/components/component/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/component/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { resolveAppearance, MapperFunction } from '../../../dynamic-resolver';
+import { resolveAppearance, MapperFunction } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/content-container/src/schema/schema-mapper.ts b/packages/ui-vue/components/content-container/src/schema/schema-mapper.ts
index bc768d5bab9..bbc05c95ac2 100644
--- a/packages/ui-vue/components/content-container/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/content-container/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { resolveAppearance, MapperFunction } from '../../../dynamic-resolver';
+import { resolveAppearance, MapperFunction } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/data-grid/src/composition/data-grid-component-creator.service.ts b/packages/ui-vue/components/data-grid/src/composition/data-grid-component-creator.service.ts
index 8d9a142f464..0bacebc8977 100644
--- a/packages/ui-vue/components/data-grid/src/composition/data-grid-component-creator.service.ts
+++ b/packages/ui-vue/components/data-grid/src/composition/data-grid-component-creator.service.ts
@@ -1,5 +1,5 @@
 import { DesignerHostService } from '../../../designer-canvas/src/composition/types';
-import { DynamicResolver } from '../../../../components/dynamic-resolver';
+import { DynamicResolver } from '@farris/ui-vue/components/dynamic-resolver';
 import { ComponentBuildInfo } from '../../../component/src/composition/inner-component-build-info';
 import { ComponentSchema } from '../../../../components/designer-canvas';
 import { FormSchemaEntityField$Type, FormSchemaEntityFieldTypeName } from '@farris/ui-vue/components/common';
diff --git a/packages/ui-vue/components/designer-canvas/src/composition/function/use-designer-component.ts b/packages/ui-vue/components/designer-canvas/src/composition/function/use-designer-component.ts
index e64ade5f6bc..a9a9fddb936 100644
--- a/packages/ui-vue/components/designer-canvas/src/composition/function/use-designer-component.ts
+++ b/packages/ui-vue/components/designer-canvas/src/composition/function/use-designer-component.ts
@@ -1,7 +1,7 @@
 import { Ref, ref } from "vue";
 import { DesignerHostService, DesignerHTMLElement, DraggingResolveContext, UseDesignerRules } from "../types";
 import { ComponentSchema, DesignerComponentInstance, DesignerItemContext } from "../../types";
-import { getSchemaByType } from '../../../../dynamic-resolver/src/schema-resolver';
+import { getSchemaByType } from '@farris/ui-vue/components/dynamic-resolver';
 
 export function useDesignerComponent(
     elementRef: Ref<HTMLElement>,
diff --git a/packages/ui-vue/components/designer-canvas/src/composition/function/use-designer-inner-component.ts b/packages/ui-vue/components/designer-canvas/src/composition/function/use-designer-inner-component.ts
index 07336537dc9..f7c9e1e5421 100644
--- a/packages/ui-vue/components/designer-canvas/src/composition/function/use-designer-inner-component.ts
+++ b/packages/ui-vue/components/designer-canvas/src/composition/function/use-designer-inner-component.ts
@@ -1,7 +1,7 @@
 import { inject, Ref, ref } from "vue";
 import { DesignerHostService, DesignerHTMLElement, DraggingResolveContext, UseDesignerRules } from "../types";
 import { ComponentSchema, DesignerComponentInstance, DesignerItemContext } from "../../types";
-import { getSchemaByType } from '../../../../dynamic-resolver/src/schema-resolver';
+import { getSchemaByType } from '@farris/ui-vue/components/dynamic-resolver';
 
 export function useDesignerInnerComponent(
     elementRef: Ref<HTMLElement>,
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 e793a606f28..ae1efe3667b 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
@@ -4,7 +4,7 @@ import { DynamicFormGroupPropsType, dynamicFormGroupProps } from '../component/d
 import { DesignerItemContext } from '../../../designer-canvas/src/types';
 import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
 import FDynamicFormGroupDesign from '../component/dynamic-form-group/dynamic-form-group.design.component';
-import { propertyConfigSchemaMap } from '../../../../components/dynamic-resolver/src/property-config-resolver';
+import { propertyConfigSchemaMap } from '@farris/ui-vue/components/dynamic-resolver';
 import { DesignerHostService } from '../../../../components/designer-canvas/src/composition/types';
 import { useDesignerRulesForFormGroup } from './form-group-use-designer-rules';
 
diff --git a/packages/ui-vue/components/dynamic-resolver/src/converter/appearance.converter.ts b/packages/ui-vue/components/dynamic-resolver/src/converter/appearance.converter.ts
index b6ca97b8dff..7a2bb1b8459 100644
--- a/packages/ui-vue/components/dynamic-resolver/src/converter/appearance.converter.ts
+++ b/packages/ui-vue/components/dynamic-resolver/src/converter/appearance.converter.ts
@@ -1,4 +1,4 @@
-import { ComponentSchema } from "../../../designer-canvas/src/types";
+import { ComponentSchema } from "@farris/ui-vue/components/designer-canvas";
 import { PropertyConverter, SchemaService } from "../types";
 
 export default {
diff --git a/packages/ui-vue/components/dynamic-resolver/src/converter/buttons.converter.ts b/packages/ui-vue/components/dynamic-resolver/src/converter/buttons.converter.ts
index abfb60a4d29..826258494c6 100644
--- a/packages/ui-vue/components/dynamic-resolver/src/converter/buttons.converter.ts
+++ b/packages/ui-vue/components/dynamic-resolver/src/converter/buttons.converter.ts
@@ -1,4 +1,4 @@
-import { ComponentSchema } from "../../../designer-canvas/src/types";
+import { ComponentSchema } from "@farris/ui-vue/components/designer-canvas";
 import { PropertyConverter, SchemaService } from "../types";
 
 export default {
diff --git a/packages/ui-vue/components/dynamic-resolver/src/converter/change-editor.converter.ts b/packages/ui-vue/components/dynamic-resolver/src/converter/change-editor.converter.ts
index 61e5ef06b48..dc92f1c6002 100644
--- a/packages/ui-vue/components/dynamic-resolver/src/converter/change-editor.converter.ts
+++ b/packages/ui-vue/components/dynamic-resolver/src/converter/change-editor.converter.ts
@@ -1,4 +1,4 @@
-import { ComponentSchema } from "../../../designer-canvas/src/types";
+import { ComponentSchema } from "@farris/ui-vue/components/designer-canvas";
 import { PropertyConverter, SchemaService } from "../types";
 
 export default {
diff --git a/packages/ui-vue/components/dynamic-resolver/src/converter/grid-selection.converter.ts b/packages/ui-vue/components/dynamic-resolver/src/converter/grid-selection.converter.ts
index b37faa1b46e..5299a6a1b84 100644
--- a/packages/ui-vue/components/dynamic-resolver/src/converter/grid-selection.converter.ts
+++ b/packages/ui-vue/components/dynamic-resolver/src/converter/grid-selection.converter.ts
@@ -1,4 +1,4 @@
-import { ComponentSchema } from "../../../designer-canvas/src/types";
+import { ComponentSchema } from "@farris/ui-vue/components/designer-canvas";
 import { PropertyConverter, SchemaService } from "../types";
 export default {
     convertTo: (schema: ComponentSchema, propertyKey: string, propertyValue: any, schemaService: SchemaService) => {
diff --git a/packages/ui-vue/components/dynamic-resolver/src/converter/items-count.converter.ts b/packages/ui-vue/components/dynamic-resolver/src/converter/items-count.converter.ts
index 288438ef0f2..c1871cc0344 100644
--- a/packages/ui-vue/components/dynamic-resolver/src/converter/items-count.converter.ts
+++ b/packages/ui-vue/components/dynamic-resolver/src/converter/items-count.converter.ts
@@ -1,4 +1,4 @@
-import { ComponentSchema } from "../../../designer-canvas/src/types";
+import { ComponentSchema } from "@farris/ui-vue/components/designer-canvas";
 import { PropertyConverter, SchemaService } from "../types";
 
 export default {
diff --git a/packages/ui-vue/components/dynamic-resolver/src/converter/pagination.converter.ts b/packages/ui-vue/components/dynamic-resolver/src/converter/pagination.converter.ts
index ebf0e2bb56a..949fd0402a7 100644
--- a/packages/ui-vue/components/dynamic-resolver/src/converter/pagination.converter.ts
+++ b/packages/ui-vue/components/dynamic-resolver/src/converter/pagination.converter.ts
@@ -1,4 +1,4 @@
-import { ComponentSchema } from "../../../designer-canvas/src/types";
+import { ComponentSchema } from "@farris/ui-vue/components/designer-canvas";
 import { PropertyConverter, SchemaService } from "../types";
 /**
  * NG版，此处pagination类型是布尔
diff --git a/packages/ui-vue/components/dynamic-resolver/src/converter/property-editor.converter.ts b/packages/ui-vue/components/dynamic-resolver/src/converter/property-editor.converter.ts
index e6e83cae987..7c35de8510a 100644
--- a/packages/ui-vue/components/dynamic-resolver/src/converter/property-editor.converter.ts
+++ b/packages/ui-vue/components/dynamic-resolver/src/converter/property-editor.converter.ts
@@ -1,4 +1,4 @@
-import { ComponentSchema } from "../../../designer-canvas/src/types";
+import { ComponentSchema } from "@farris/ui-vue/components/designer-canvas";
 import { PropertyConverter, SchemaService } from "../types";
 
 export default {
diff --git a/packages/ui-vue/components/dynamic-resolver/src/converter/row-number.converter.ts b/packages/ui-vue/components/dynamic-resolver/src/converter/row-number.converter.ts
index 929fb4e037a..f3ea8c962db 100644
--- a/packages/ui-vue/components/dynamic-resolver/src/converter/row-number.converter.ts
+++ b/packages/ui-vue/components/dynamic-resolver/src/converter/row-number.converter.ts
@@ -1,4 +1,4 @@
-import { ComponentSchema } from "../../../designer-canvas/src/types";
+import { ComponentSchema } from "@farris/ui-vue/components/designer-canvas";
 import { PropertyConverter, SchemaService } from "../types";
 export default {
     convertTo: (schema: ComponentSchema, propertyKey: string, propertyValue: any, schemaService: SchemaService) => {
diff --git a/packages/ui-vue/components/dynamic-resolver/src/converter/type.converter.ts b/packages/ui-vue/components/dynamic-resolver/src/converter/type.converter.ts
index f3e2f4c71f0..774c240617e 100644
--- a/packages/ui-vue/components/dynamic-resolver/src/converter/type.converter.ts
+++ b/packages/ui-vue/components/dynamic-resolver/src/converter/type.converter.ts
@@ -1,5 +1,4 @@
-import { ComponentSchema } from "../../../designer-canvas/src/types";
-import { DgControl } from "../../../designer-canvas/src/composition/dg-control";
+import { ComponentSchema, DgControl } from "@farris/ui-vue/components/designer-canvas";
 import { PropertyConverter, SchemaService } from "../types";
 
 export default {
diff --git a/packages/ui-vue/components/dynamic-resolver/src/property-config-resolver.ts b/packages/ui-vue/components/dynamic-resolver/src/property-config-resolver.ts
index 5ad10da4e6f..daf0bb93a78 100644
--- a/packages/ui-vue/components/dynamic-resolver/src/property-config-resolver.ts
+++ b/packages/ui-vue/components/dynamic-resolver/src/property-config-resolver.ts
@@ -1,8 +1,9 @@
 import { computed, ref } from "vue";
+import { EditorConfig } from "@farris/ui-vue/components/dynamic-form";
+import { ComponentSchema } from "@farris/ui-vue/components/designer-canvas";
+import { ElementPropertyConfig, PropertyEntity } from "@farris/ui-vue/components/property-panel";
 import { EffectFunction, PropertyConverter, SchemaService } from './types';
-import { EditorConfig } from "../../dynamic-form";
 import { useObjectExpression } from './object-expression';
-import { ComponentSchema } from "../../designer-canvas/src/types";
 import { resolveSchemaWithDefaultValue } from "./schema-resolver";
 import appearanceConverter from './converter/appearance.converter';
 import buttonsConverter from "./converter/buttons.converter";
@@ -13,7 +14,6 @@ import fieldSelectorConverter from "./converter/field-selector.converter";
 import paginationConverter from "./converter/pagination.converter";
 import rowNumberConverter from "./converter/row-number.converter";
 import gridSelectionConverter from "./converter/grid-selection.converter";
-import { ElementPropertyConfig, PropertyEntity } from "../../property-panel/src/composition/entity/property-entity";
 import itemsCountConverter from "./converter/items-count.converter";
 import formGroupLabelConverter from "./converter/form-group-label.converter";
 
diff --git a/packages/ui-vue/components/dynamic-resolver/src/props-resolver.ts b/packages/ui-vue/components/dynamic-resolver/src/props-resolver.ts
index 8884abfc439..ccb91d3c4c9 100644
--- a/packages/ui-vue/components/dynamic-resolver/src/props-resolver.ts
+++ b/packages/ui-vue/components/dynamic-resolver/src/props-resolver.ts
@@ -1,4 +1,4 @@
-import { DesignerHostService } from './../../designer-canvas/src/composition/types';
+import { DesignerHostService } from '@farris/ui-vue/components/designer-canvas';
 import { mappingSchemaToProps, resolveSchemaToProps, schemaMap, schemaResolverMap } from './schema-resolver';
 import { DynamicResolver, EffectFunction, MapperFunction, SchemaResolverFunction } from './types';
 import { propertyConfigSchemaMap, propertyEffectMap } from './property-config-resolver';
diff --git a/packages/ui-vue/components/dynamic-resolver/src/schema-resolver.ts b/packages/ui-vue/components/dynamic-resolver/src/schema-resolver.ts
index d9adc5dfc35..c770142db5d 100644
--- a/packages/ui-vue/components/dynamic-resolver/src/schema-resolver.ts
+++ b/packages/ui-vue/components/dynamic-resolver/src/schema-resolver.ts
@@ -1,5 +1,5 @@
 import { cloneDeep, isPlainObject } from "lodash-es";
-import { DesignerHostService } from "../../designer-canvas/src/composition/types";
+import { DesignerHostService } from "@farris/ui-vue/components/designer-canvas";
 import { MapperFunction, SchemaResolverFunction } from "./types";
 
 const schemaMap = {} as Record<string, any>;
diff --git a/packages/ui-vue/components/dynamic-resolver/src/types.ts b/packages/ui-vue/components/dynamic-resolver/src/types.ts
index 5c096dff439..3b5d9e5add5 100644
--- a/packages/ui-vue/components/dynamic-resolver/src/types.ts
+++ b/packages/ui-vue/components/dynamic-resolver/src/types.ts
@@ -1,5 +1,5 @@
  
-import { DesignerHostService } from "../../designer-canvas/src/composition/types";
+import { DesignerHostService } from "@farris/ui-vue/components/designer-canvas";
 
 export type MapperFunction = (key: string, value: any, resolvedSchema?: any) => Record<string, any>;
 
diff --git a/packages/ui-vue/components/fieldset/src/schema/schema-mapper.ts b/packages/ui-vue/components/fieldset/src/schema/schema-mapper.ts
index a12602b5b0e..c651ec91b1a 100644
--- a/packages/ui-vue/components/fieldset/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/fieldset/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance, resolveToolbar } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance, resolveToolbar } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/filter-bar/src/designer/filter-bar-config/filter-bar-config.props.ts b/packages/ui-vue/components/filter-bar/src/designer/filter-bar-config/filter-bar-config.props.ts
index ea8f4730c1b..e21ffdb0f8b 100644
--- a/packages/ui-vue/components/filter-bar/src/designer/filter-bar-config/filter-bar-config.props.ts
+++ b/packages/ui-vue/components/filter-bar/src/designer/filter-bar-config/filter-bar-config.props.ts
@@ -16,7 +16,7 @@
 import { ExtractPropTypes, PropType } from 'vue';
 
 import { FieldConfig } from '../../../../condition/src/types';
-import { createPropsResolver } from '../../../../dynamic-resolver';
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
 import filterBarConfigSchema from './schema/filter-bar-config.schema.json';
 import { schemaMapper } from './schema/schema-mapper';
 import { schemaResolver } from './schema/schema-resolver';
diff --git a/packages/ui-vue/components/filter-bar/src/designer/filter-bar-config/schema/schema-mapper.ts b/packages/ui-vue/components/filter-bar/src/designer/filter-bar-config/schema/schema-mapper.ts
index 90179d1bf1b..74c1e9dd6c7 100644
--- a/packages/ui-vue/components/filter-bar/src/designer/filter-bar-config/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/filter-bar/src/designer/filter-bar-config/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 // import {resolvePreset} from './preset-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
diff --git a/packages/ui-vue/components/filter-bar/src/designer/filter-bar-config/schema/schema-resolver.ts b/packages/ui-vue/components/filter-bar/src/designer/filter-bar-config/schema/schema-resolver.ts
index a07d8e91d22..d36ae745743 100644
--- a/packages/ui-vue/components/filter-bar/src/designer/filter-bar-config/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/filter-bar/src/designer/filter-bar-config/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
diff --git a/packages/ui-vue/components/input-group/src/property-config/converter/input.converter.ts b/packages/ui-vue/components/input-group/src/property-config/converter/input.converter.ts
index d6b9616f798..93c2b1c8bfa 100644
--- a/packages/ui-vue/components/input-group/src/property-config/converter/input.converter.ts
+++ b/packages/ui-vue/components/input-group/src/property-config/converter/input.converter.ts
@@ -1,5 +1,5 @@
 import { ComponentSchema } from "../../../../designer-canvas/src/types";
-import { PropertyConverter, SchemaService } from "../../../../dynamic-resolver/src/types";
+import { PropertyConverter, SchemaService } from "@farris/ui-vue/components/dynamic-resolver";
 
 const inputFormatValidationTypes = [
     { key: 'none', value: '无' },
diff --git a/packages/ui-vue/components/number-spinner/src/number-spinner.props.ts b/packages/ui-vue/components/number-spinner/src/number-spinner.props.ts
index 8bf68c6fcdd..66ff7d4f3d1 100644
--- a/packages/ui-vue/components/number-spinner/src/number-spinner.props.ts
+++ b/packages/ui-vue/components/number-spinner/src/number-spinner.props.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 import { ExtractPropTypes, PropType } from 'vue';
-import { createPropsResolver } from '../../dynamic-resolver';
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
 import { schemaMapper } from './schema/schema-mapper';
 import numberSpinnerSchema from './schema/number-spinner.schema.json';
 import { schemaResolver } from './schema/schema-resolver';
diff --git a/packages/ui-vue/components/number-spinner/src/schema/schema-mapper.ts b/packages/ui-vue/components/number-spinner/src/schema/schema-mapper.ts
index 97964aee23b..2ca33ca0806 100644
--- a/packages/ui-vue/components/number-spinner/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/number-spinner/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/number-spinner/src/schema/schema-resolver.ts b/packages/ui-vue/components/number-spinner/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/number-spinner/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/number-spinner/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
diff --git a/packages/ui-vue/components/page-header/src/schema/schema-mapper.ts b/packages/ui-vue/components/page-header/src/schema/schema-mapper.ts
index 47a7733d2ea..6c9057ca587 100644
--- a/packages/ui-vue/components/page-header/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/page-header/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance, resolveToolbar } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance, resolveToolbar } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance],
diff --git a/packages/ui-vue/components/query-solution/src/designer/query-solution-config/query-solution-config.props.ts b/packages/ui-vue/components/query-solution/src/designer/query-solution-config/query-solution-config.props.ts
index d649688e0b0..bf6306bc618 100644
--- a/packages/ui-vue/components/query-solution/src/designer/query-solution-config/query-solution-config.props.ts
+++ b/packages/ui-vue/components/query-solution/src/designer/query-solution-config/query-solution-config.props.ts
@@ -16,7 +16,7 @@
 import { ExtractPropTypes, PropType } from 'vue';
 
 import { FieldConfig } from '../../../../condition/src/types';
-import { createPropsResolver } from '../../../../dynamic-resolver';
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
 import querySolutionConfigSchema from './schema/query-solution-config.schema.json';
 import { schemaMapper } from './schema/schema-mapper';
 import { schemaResolver } from './schema/schema-resolver';
diff --git a/packages/ui-vue/components/query-solution/src/designer/query-solution-config/schema/schema-mapper.ts b/packages/ui-vue/components/query-solution/src/designer/query-solution-config/schema/schema-mapper.ts
index 90179d1bf1b..74c1e9dd6c7 100644
--- a/packages/ui-vue/components/query-solution/src/designer/query-solution-config/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/query-solution/src/designer/query-solution-config/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 // import {resolvePreset} from './preset-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
diff --git a/packages/ui-vue/components/query-solution/src/designer/query-solution-config/schema/schema-resolver.ts b/packages/ui-vue/components/query-solution/src/designer/query-solution-config/schema/schema-resolver.ts
index a07d8e91d22..d36ae745743 100644
--- a/packages/ui-vue/components/query-solution/src/designer/query-solution-config/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/query-solution/src/designer/query-solution-config/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
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 bc8fdd676fc..c5bddd848bc 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,6 +1,6 @@
 
 import { ExtractPropTypes, PropType } from 'vue';
-import { createPropsResolver } from '../../../../dynamic-resolver/src/props-resolver';
+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';
-- 
Gitee


From c2ebf948df87e99f4a3e2ae24c0d1430c1ff9c58 Mon Sep 17 00:00:00 2001
From: hyygzds <m15966339253@163.com>
Date: Mon, 4 Aug 2025 14:14:05 +0800
Subject: [PATCH 52/62] fix: split dependency dynamic-resolver again

---
 .../components/button-group/src/schema/schema-resolver.ts       | 2 +-
 packages/ui-vue/components/calendar/src/schema/schema-mapper.ts | 2 +-
 .../ui-vue/components/calendar/src/schema/schema-resolver.ts    | 2 +-
 packages/ui-vue/components/capsule/src/schema/schema-mapper.ts  | 2 +-
 .../ui-vue/components/capsule/src/schema/schema-resolver.ts     | 2 +-
 .../ui-vue/components/color-picker/src/schema/schema-mapper.ts  | 2 +-
 .../components/color-picker/src/schema/schema-resolver.ts       | 2 +-
 .../ui-vue/components/component/src/schema/schema-resolver.ts   | 2 +-
 .../components/content-container/src/schema/schema-resolver.ts  | 2 +-
 .../components/data-grid/src/designer/data-grid-column.props.ts | 2 +-
 .../data-grid/src/designer/grid-field-editor.props.ts           | 2 +-
 .../components/data-grid/src/schema/callback-resolvers.ts       | 2 +-
 .../ui-vue/components/data-grid/src/schema/schema-mapper.ts     | 2 +-
 .../ui-vue/components/data-grid/src/schema/schema-resolver.ts   | 2 +-
 .../dynamic-form/src/schema/response-form-schema-resolver.ts    | 2 +-
 .../ui-vue/components/dynamic-form/src/schema/schema-mapper.ts  | 2 +-
 .../components/dynamic-view/src/composition/use-binding-data.ts | 2 +-
 .../ui-vue/components/events-editor/src/schema/schema-mapper.ts | 2 +-
 .../components/events-editor/src/schema/schema-resolver.ts      | 2 +-
 .../ui-vue/components/fieldset/src/schema/schema-resolver.ts    | 2 +-
 .../ui-vue/components/filter-bar/src/schema/schema-mapper.ts    | 2 +-
 .../ui-vue/components/filter-bar/src/schema/schema-resolver.ts  | 2 +-
 .../ui-vue/components/html-template/src/schema/schema-mapper.ts | 2 +-
 .../components/html-template/src/schema/schema-resolver.ts      | 2 +-
 .../ui-vue/components/image-cropper/src/schema/schema-mapper.ts | 2 +-
 .../components/image-cropper/src/schema/schema-resolver.ts      | 2 +-
 .../ui-vue/components/input-group/src/schema/schema-mapper.ts   | 2 +-
 .../ui-vue/components/input-group/src/schema/schema-resolver.ts | 2 +-
 .../ui-vue/components/json-editor/src/schema/schema-mapper.ts   | 2 +-
 .../ui-vue/components/json-editor/src/schema/schema-resolver.ts | 2 +-
 .../components/layout/src/components/layout-pane.props.ts       | 2 +-
 packages/ui-vue/components/layout/src/schema/schema-mapper.ts   | 2 +-
 packages/ui-vue/components/layout/src/schema/schema-resolver.ts | 2 +-
 packages/ui-vue/components/list-nav/src/schema/schema-mapper.ts | 2 +-
 .../ui-vue/components/list-nav/src/schema/schema-resolver.ts    | 2 +-
 .../components/mapping-editor/src/schema/schema-mapper.ts       | 2 +-
 .../components/mapping-editor/src/schema/schema-resolver.ts     | 2 +-
 .../ui-vue/components/menu-lookup/src/schema/schema-mapper.ts   | 2 +-
 .../ui-vue/components/menu-lookup/src/schema/schema-resolver.ts | 2 +-
 .../ui-vue/components/number-range/src/schema/schema-mapper.ts  | 2 +-
 .../components/number-range/src/schema/schema-resolver.ts       | 2 +-
 packages/ui-vue/components/order/src/schema/schema-mapper.ts    | 2 +-
 packages/ui-vue/components/order/src/schema/schema-resolver.ts  | 2 +-
 .../ui-vue/components/page-footer/src/schema/schema-mapper.ts   | 2 +-
 .../ui-vue/components/page-footer/src/schema/schema-resolver.ts | 2 +-
 .../ui-vue/components/page-header/src/schema/schema-resolver.ts | 2 +-
 .../ui-vue/components/pagination/src/schema/schema-mapper.ts    | 2 +-
 .../ui-vue/components/pagination/src/schema/schema-resolver.ts  | 2 +-
 packages/ui-vue/components/progress/src/schema/schema-mapper.ts | 2 +-
 .../ui-vue/components/progress/src/schema/schema-resolver.ts    | 2 +-
 .../components/property-editor/src/schema/schema-mapper.ts      | 2 +-
 .../components/property-editor/src/schema/schema-resolver.ts    | 2 +-
 .../components/query-solution/src/schema/schema-mapper.ts       | 2 +-
 .../components/query-solution/src/schema/schema-resolver.ts     | 2 +-
 .../ui-vue/components/radio-button/src/schema/schema-mapper.ts  | 2 +-
 .../components/radio-button/src/schema/schema-resolver.ts       | 2 +-
 .../ui-vue/components/radio-group/src/schema/schema-mapper.ts   | 2 +-
 .../ui-vue/components/radio-group/src/schema/schema-resolver.ts | 2 +-
 packages/ui-vue/components/rate/src/schema/schema-mapper.ts     | 2 +-
 packages/ui-vue/components/rate/src/schema/schema-resolver.ts   | 2 +-
 .../response-layout-editor/src/schema/schema-mapper.ts          | 2 +-
 .../response-layout-editor/src/schema/schema-resolver.ts        | 2 +-
 .../ui-vue/components/search-box/src/schema/schema-mapper.ts    | 2 +-
 .../ui-vue/components/search-box/src/schema/schema-resolver.ts  | 2 +-
 .../components/smoke-detector/src/schema/schema-mapper.ts       | 2 +-
 .../components/smoke-detector/src/schema/schema-resolver.ts     | 2 +-
 .../components/splitter/src/components/splitter-pane.props.ts   | 2 +-
 .../splitter/src/schema/splitter-pane-schema-mapper.ts          | 2 +-
 .../components/splitter/src/schema/splitter-schema-mapper.ts    | 2 +-
 .../components/splitter/src/schema/splitter-schema-resolver.ts  | 2 +-
 packages/ui-vue/components/step/src/schema/schema-mapper.ts     | 2 +-
 packages/ui-vue/components/step/src/schema/schema-resolver.ts   | 2 +-
 packages/ui-vue/components/tags/src/schema/schema-mapper.ts     | 2 +-
 packages/ui-vue/components/tags/src/schema/schema-resolver.ts   | 2 +-
 packages/ui-vue/components/text/src/schema/schema-mapper.ts     | 2 +-
 packages/ui-vue/components/text/src/schema/schema-resolver.ts   | 2 +-
 .../ui-vue/components/time-picker/src/schema/schema-mapper.ts   | 2 +-
 .../ui-vue/components/time-picker/src/schema/schema-resolver.ts | 2 +-
 packages/ui-vue/components/transfer/src/schema/schema-mapper.ts | 2 +-
 .../ui-vue/components/transfer/src/schema/schema-resolver.ts    | 2 +-
 packages/ui-vue/components/uploader/src/schema/schema-mapper.ts | 2 +-
 .../ui-vue/components/uploader/src/schema/schema-resolver.ts    | 2 +-
 .../ui-vue/components/verify-detail/src/schema/schema-mapper.ts | 2 +-
 .../components/verify-detail/src/schema/schema-resolver.ts      | 2 +-
 84 files changed, 84 insertions(+), 84 deletions(-)

diff --git a/packages/ui-vue/components/button-group/src/schema/schema-resolver.ts b/packages/ui-vue/components/button-group/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/button-group/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/button-group/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
diff --git a/packages/ui-vue/components/calendar/src/schema/schema-mapper.ts b/packages/ui-vue/components/calendar/src/schema/schema-mapper.ts
index 97964aee23b..2ca33ca0806 100644
--- a/packages/ui-vue/components/calendar/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/calendar/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/calendar/src/schema/schema-resolver.ts b/packages/ui-vue/components/calendar/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/calendar/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/calendar/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
diff --git a/packages/ui-vue/components/capsule/src/schema/schema-mapper.ts b/packages/ui-vue/components/capsule/src/schema/schema-mapper.ts
index 97964aee23b..2ca33ca0806 100644
--- a/packages/ui-vue/components/capsule/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/capsule/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/capsule/src/schema/schema-resolver.ts b/packages/ui-vue/components/capsule/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/capsule/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/capsule/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
diff --git a/packages/ui-vue/components/color-picker/src/schema/schema-mapper.ts b/packages/ui-vue/components/color-picker/src/schema/schema-mapper.ts
index 97964aee23b..2ca33ca0806 100644
--- a/packages/ui-vue/components/color-picker/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/color-picker/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/color-picker/src/schema/schema-resolver.ts b/packages/ui-vue/components/color-picker/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/color-picker/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/color-picker/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
diff --git a/packages/ui-vue/components/component/src/schema/schema-resolver.ts b/packages/ui-vue/components/component/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/component/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/component/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
diff --git a/packages/ui-vue/components/content-container/src/schema/schema-resolver.ts b/packages/ui-vue/components/content-container/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/content-container/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/content-container/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
diff --git a/packages/ui-vue/components/data-grid/src/designer/data-grid-column.props.ts b/packages/ui-vue/components/data-grid/src/designer/data-grid-column.props.ts
index 7ac26ee91c1..b858152164f 100644
--- a/packages/ui-vue/components/data-grid/src/designer/data-grid-column.props.ts
+++ b/packages/ui-vue/components/data-grid/src/designer/data-grid-column.props.ts
@@ -16,7 +16,7 @@
  */
 import { ExtractPropTypes, PropType, VNode } from 'vue';
 import { EditorConfig } from '../../../dynamic-form';
-import { createPropsResolver } from '../../../dynamic-resolver';
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
 import { columnSchemaMapper } from '../schema/schema-mapper';
 import { columnSchemaResolver } from "../schema/schema-resolver";
 import dataGridColumnSchema from '../schema/data-grid-column.schema.json';
diff --git a/packages/ui-vue/components/data-grid/src/designer/grid-field-editor.props.ts b/packages/ui-vue/components/data-grid/src/designer/grid-field-editor.props.ts
index e5375b22297..92fd89e7796 100644
--- a/packages/ui-vue/components/data-grid/src/designer/grid-field-editor.props.ts
+++ b/packages/ui-vue/components/data-grid/src/designer/grid-field-editor.props.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 import { ExtractPropTypes } from 'vue';
-import { createPropsResolver } from '../../../dynamic-resolver';
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
 import { schemaMapper } from '../schema/schema-mapper';
 import { schemaResolver } from "../schema/schema-resolver";
 import gridFieldEditorSchema from '../schema/grid-field-editor.schema.json';
diff --git a/packages/ui-vue/components/data-grid/src/schema/callback-resolvers.ts b/packages/ui-vue/components/data-grid/src/schema/callback-resolvers.ts
index 70ef9e3582c..9ea9b9ef78c 100644
--- a/packages/ui-vue/components/data-grid/src/schema/callback-resolvers.ts
+++ b/packages/ui-vue/components/data-grid/src/schema/callback-resolvers.ts
@@ -1,5 +1,5 @@
 import { DataColumn, VisualData, VisualDataCell } from "@/components/data-view";
-import { Caller } from "../../../dynamic-resolver";
+import { Caller } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function createDataGridCallbackResolver() {
     function resolve(viewSchema: Record<string, any>, caller: Caller) {
diff --git a/packages/ui-vue/components/data-grid/src/schema/schema-mapper.ts b/packages/ui-vue/components/data-grid/src/schema/schema-mapper.ts
index cd9697fa1b6..549e56650c1 100644
--- a/packages/ui-vue/components/data-grid/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/data-grid/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 import { resolveGridColumns } from './column-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
diff --git a/packages/ui-vue/components/data-grid/src/schema/schema-resolver.ts b/packages/ui-vue/components/data-grid/src/schema/schema-resolver.ts
index e7421148946..5513623b42c 100644
--- a/packages/ui-vue/components/data-grid/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/data-grid/src/schema/schema-resolver.ts
@@ -1,7 +1,7 @@
 import { ComponentBuildInfo } from "../../../component/src/composition/inner-component-build-info";
 import { DesignerHostService } from "../../../designer-canvas/src/composition/types";
 import { DesignerComponentInstance } from "../../../designer-canvas/src/types";
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 import { DataGridComponentCreatorService } from "../composition/data-grid-component-creator.service";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>, designerHostService?: DesignerHostService): Record<string, any> {
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 8c4c4325231..747d56aa51c 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
@@ -2,7 +2,7 @@
 import { ComponentBuildInfo } from "../../../component/src/composition/inner-component-build-info";
 import { DesignerHostService } from "../../../designer-canvas/src/composition/types";
 import { DesignerComponentInstance } from "../../../designer-canvas/src/types";
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 import { ResponseFormComponentCreatorService } from "../composition/response-form-component-creator.service";
 
 export function reponseFormSchemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>, designerHostService?: DesignerHostService): Record<string, any> {
diff --git a/packages/ui-vue/components/dynamic-form/src/schema/schema-mapper.ts b/packages/ui-vue/components/dynamic-form/src/schema/schema-mapper.ts
index 2ceeed5d5da..06f647cfb10 100644
--- a/packages/ui-vue/components/dynamic-form/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/dynamic-form/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/dynamic-view/src/composition/use-binding-data.ts b/packages/ui-vue/components/dynamic-view/src/composition/use-binding-data.ts
index f569b2703ee..01b08a28875 100644
--- a/packages/ui-vue/components/dynamic-view/src/composition/use-binding-data.ts
+++ b/packages/ui-vue/components/dynamic-view/src/composition/use-binding-data.ts
@@ -1,4 +1,4 @@
-import { BindingData } from "../../../dynamic-resolver";
+import { BindingData } from "@farris/ui-vue/components/dynamic-resolver";
 import { Ref, SetupContext } from "vue";
 
 export function useBindingData(modelValue: Ref<Record<string, any>>, setupContext: SetupContext): BindingData {
diff --git a/packages/ui-vue/components/events-editor/src/schema/schema-mapper.ts b/packages/ui-vue/components/events-editor/src/schema/schema-mapper.ts
index 97964aee23b..2ca33ca0806 100644
--- a/packages/ui-vue/components/events-editor/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/events-editor/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/events-editor/src/schema/schema-resolver.ts b/packages/ui-vue/components/events-editor/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/events-editor/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/events-editor/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
diff --git a/packages/ui-vue/components/fieldset/src/schema/schema-resolver.ts b/packages/ui-vue/components/fieldset/src/schema/schema-resolver.ts
index bea27633381..0e0e1ff5df4 100644
--- a/packages/ui-vue/components/fieldset/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/fieldset/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
 
diff --git a/packages/ui-vue/components/filter-bar/src/schema/schema-mapper.ts b/packages/ui-vue/components/filter-bar/src/schema/schema-mapper.ts
index 97964aee23b..2ca33ca0806 100644
--- a/packages/ui-vue/components/filter-bar/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/filter-bar/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/filter-bar/src/schema/schema-resolver.ts b/packages/ui-vue/components/filter-bar/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/filter-bar/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/filter-bar/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
diff --git a/packages/ui-vue/components/html-template/src/schema/schema-mapper.ts b/packages/ui-vue/components/html-template/src/schema/schema-mapper.ts
index ec92a2a712f..8e0bbfafa57 100644
--- a/packages/ui-vue/components/html-template/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/html-template/src/schema/schema-mapper.ts
@@ -1,3 +1,3 @@
-import { MapperFunction } from '../../../dynamic-resolver';
+import { MapperFunction } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([]);
diff --git a/packages/ui-vue/components/html-template/src/schema/schema-resolver.ts b/packages/ui-vue/components/html-template/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/html-template/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/html-template/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
diff --git a/packages/ui-vue/components/image-cropper/src/schema/schema-mapper.ts b/packages/ui-vue/components/image-cropper/src/schema/schema-mapper.ts
index 97964aee23b..2ca33ca0806 100644
--- a/packages/ui-vue/components/image-cropper/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/image-cropper/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/image-cropper/src/schema/schema-resolver.ts b/packages/ui-vue/components/image-cropper/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/image-cropper/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/image-cropper/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
diff --git a/packages/ui-vue/components/input-group/src/schema/schema-mapper.ts b/packages/ui-vue/components/input-group/src/schema/schema-mapper.ts
index 97964aee23b..2ca33ca0806 100644
--- a/packages/ui-vue/components/input-group/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/input-group/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/input-group/src/schema/schema-resolver.ts b/packages/ui-vue/components/input-group/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/input-group/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/input-group/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
diff --git a/packages/ui-vue/components/json-editor/src/schema/schema-mapper.ts b/packages/ui-vue/components/json-editor/src/schema/schema-mapper.ts
index ec92a2a712f..8e0bbfafa57 100644
--- a/packages/ui-vue/components/json-editor/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/json-editor/src/schema/schema-mapper.ts
@@ -1,3 +1,3 @@
-import { MapperFunction } from '../../../dynamic-resolver';
+import { MapperFunction } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([]);
diff --git a/packages/ui-vue/components/json-editor/src/schema/schema-resolver.ts b/packages/ui-vue/components/json-editor/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/json-editor/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/json-editor/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
diff --git a/packages/ui-vue/components/layout/src/components/layout-pane.props.ts b/packages/ui-vue/components/layout/src/components/layout-pane.props.ts
index e8280071f42..df0a72a417c 100644
--- a/packages/ui-vue/components/layout/src/components/layout-pane.props.ts
+++ b/packages/ui-vue/components/layout/src/components/layout-pane.props.ts
@@ -1,6 +1,6 @@
  
 import { ExtractPropTypes, PropType } from "vue";
-import { createPropsResolver } from "../../../dynamic-resolver";
+import { createPropsResolver } from "@farris/ui-vue/components/dynamic-resolver";
 import { schemaMapper } from "../schema/schema-mapper";
 import { schemaResolver } from "../schema/schema-resolver";
 import layoutPaneSchema from '../schema/layout-pane.schema.json';
diff --git a/packages/ui-vue/components/layout/src/schema/schema-mapper.ts b/packages/ui-vue/components/layout/src/schema/schema-mapper.ts
index 97964aee23b..2ca33ca0806 100644
--- a/packages/ui-vue/components/layout/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/layout/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/layout/src/schema/schema-resolver.ts b/packages/ui-vue/components/layout/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/layout/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/layout/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
diff --git a/packages/ui-vue/components/list-nav/src/schema/schema-mapper.ts b/packages/ui-vue/components/list-nav/src/schema/schema-mapper.ts
index 97964aee23b..2ca33ca0806 100644
--- a/packages/ui-vue/components/list-nav/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/list-nav/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/list-nav/src/schema/schema-resolver.ts b/packages/ui-vue/components/list-nav/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/list-nav/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/list-nav/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
diff --git a/packages/ui-vue/components/mapping-editor/src/schema/schema-mapper.ts b/packages/ui-vue/components/mapping-editor/src/schema/schema-mapper.ts
index 97964aee23b..2ca33ca0806 100644
--- a/packages/ui-vue/components/mapping-editor/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/mapping-editor/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/mapping-editor/src/schema/schema-resolver.ts b/packages/ui-vue/components/mapping-editor/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/mapping-editor/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/mapping-editor/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
diff --git a/packages/ui-vue/components/menu-lookup/src/schema/schema-mapper.ts b/packages/ui-vue/components/menu-lookup/src/schema/schema-mapper.ts
index ec92a2a712f..8e0bbfafa57 100644
--- a/packages/ui-vue/components/menu-lookup/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/menu-lookup/src/schema/schema-mapper.ts
@@ -1,3 +1,3 @@
-import { MapperFunction } from '../../../dynamic-resolver';
+import { MapperFunction } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([]);
diff --git a/packages/ui-vue/components/menu-lookup/src/schema/schema-resolver.ts b/packages/ui-vue/components/menu-lookup/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/menu-lookup/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/menu-lookup/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
diff --git a/packages/ui-vue/components/number-range/src/schema/schema-mapper.ts b/packages/ui-vue/components/number-range/src/schema/schema-mapper.ts
index 97964aee23b..2ca33ca0806 100644
--- a/packages/ui-vue/components/number-range/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/number-range/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/number-range/src/schema/schema-resolver.ts b/packages/ui-vue/components/number-range/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/number-range/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/number-range/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
diff --git a/packages/ui-vue/components/order/src/schema/schema-mapper.ts b/packages/ui-vue/components/order/src/schema/schema-mapper.ts
index 97964aee23b..2ca33ca0806 100644
--- a/packages/ui-vue/components/order/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/order/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/order/src/schema/schema-resolver.ts b/packages/ui-vue/components/order/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/order/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/order/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
diff --git a/packages/ui-vue/components/page-footer/src/schema/schema-mapper.ts b/packages/ui-vue/components/page-footer/src/schema/schema-mapper.ts
index 97964aee23b..2ca33ca0806 100644
--- a/packages/ui-vue/components/page-footer/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/page-footer/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/page-footer/src/schema/schema-resolver.ts b/packages/ui-vue/components/page-footer/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/page-footer/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/page-footer/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
diff --git a/packages/ui-vue/components/page-header/src/schema/schema-resolver.ts b/packages/ui-vue/components/page-header/src/schema/schema-resolver.ts
index b045f3598ba..2b57455ed8e 100644
--- a/packages/ui-vue/components/page-header/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/page-header/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     schema.title = "标题";
diff --git a/packages/ui-vue/components/pagination/src/schema/schema-mapper.ts b/packages/ui-vue/components/pagination/src/schema/schema-mapper.ts
index 97964aee23b..2ca33ca0806 100644
--- a/packages/ui-vue/components/pagination/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/pagination/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/pagination/src/schema/schema-resolver.ts b/packages/ui-vue/components/pagination/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/pagination/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/pagination/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
diff --git a/packages/ui-vue/components/progress/src/schema/schema-mapper.ts b/packages/ui-vue/components/progress/src/schema/schema-mapper.ts
index 97964aee23b..2ca33ca0806 100644
--- a/packages/ui-vue/components/progress/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/progress/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/progress/src/schema/schema-resolver.ts b/packages/ui-vue/components/progress/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/progress/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/progress/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
diff --git a/packages/ui-vue/components/property-editor/src/schema/schema-mapper.ts b/packages/ui-vue/components/property-editor/src/schema/schema-mapper.ts
index 97964aee23b..2ca33ca0806 100644
--- a/packages/ui-vue/components/property-editor/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/property-editor/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/property-editor/src/schema/schema-resolver.ts b/packages/ui-vue/components/property-editor/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/property-editor/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/property-editor/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
diff --git a/packages/ui-vue/components/query-solution/src/schema/schema-mapper.ts b/packages/ui-vue/components/query-solution/src/schema/schema-mapper.ts
index f81d72ba9b4..8634692bd74 100644
--- a/packages/ui-vue/components/query-solution/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/query-solution/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 import { resolvePreset } from './preset-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
diff --git a/packages/ui-vue/components/query-solution/src/schema/schema-resolver.ts b/packages/ui-vue/components/query-solution/src/schema/schema-resolver.ts
index 6cfaa384157..c9b083dee41 100644
--- a/packages/ui-vue/components/query-solution/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/query-solution/src/schema/schema-resolver.ts
@@ -1,5 +1,5 @@
 import { DesignerComponentInstance, DesignerHostService } from "../../../designer-canvas";
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 import { querySolutionCreatorService } from "../composition/build-solution";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>, designerHostService?: DesignerHostService): Record<string, any> {
diff --git a/packages/ui-vue/components/radio-button/src/schema/schema-mapper.ts b/packages/ui-vue/components/radio-button/src/schema/schema-mapper.ts
index 97964aee23b..2ca33ca0806 100644
--- a/packages/ui-vue/components/radio-button/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/radio-button/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/radio-button/src/schema/schema-resolver.ts b/packages/ui-vue/components/radio-button/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/radio-button/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/radio-button/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
diff --git a/packages/ui-vue/components/radio-group/src/schema/schema-mapper.ts b/packages/ui-vue/components/radio-group/src/schema/schema-mapper.ts
index 2d80eae993a..079a0e56dba 100644
--- a/packages/ui-vue/components/radio-group/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/radio-group/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/radio-group/src/schema/schema-resolver.ts b/packages/ui-vue/components/radio-group/src/schema/schema-resolver.ts
index 1394c7551da..89f36392140 100644
--- a/packages/ui-vue/components/radio-group/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/radio-group/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
diff --git a/packages/ui-vue/components/rate/src/schema/schema-mapper.ts b/packages/ui-vue/components/rate/src/schema/schema-mapper.ts
index 97964aee23b..2ca33ca0806 100644
--- a/packages/ui-vue/components/rate/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/rate/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/rate/src/schema/schema-resolver.ts b/packages/ui-vue/components/rate/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/rate/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/rate/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
diff --git a/packages/ui-vue/components/response-layout-editor/src/schema/schema-mapper.ts b/packages/ui-vue/components/response-layout-editor/src/schema/schema-mapper.ts
index 97964aee23b..2ca33ca0806 100644
--- a/packages/ui-vue/components/response-layout-editor/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/response-layout-editor/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/response-layout-editor/src/schema/schema-resolver.ts b/packages/ui-vue/components/response-layout-editor/src/schema/schema-resolver.ts
index f7d390a1dd0..ea67474b201 100644
--- a/packages/ui-vue/components/response-layout-editor/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/response-layout-editor/src/schema/schema-resolver.ts
@@ -1,6 +1,6 @@
  
 import { ComponentSchema } from "../../../designer-canvas/src/types";
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 function wrapSectionForForm(resolver: DynamicResolver, schema: ComponentSchema, context: Record<string, any>, formSchemaId: string): ComponentSchema {
     const sectionSchema = resolver.getSchemaByType('section') as ComponentSchema;
diff --git a/packages/ui-vue/components/search-box/src/schema/schema-mapper.ts b/packages/ui-vue/components/search-box/src/schema/schema-mapper.ts
index 97964aee23b..2ca33ca0806 100644
--- a/packages/ui-vue/components/search-box/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/search-box/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/search-box/src/schema/schema-resolver.ts b/packages/ui-vue/components/search-box/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/search-box/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/search-box/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
diff --git a/packages/ui-vue/components/smoke-detector/src/schema/schema-mapper.ts b/packages/ui-vue/components/smoke-detector/src/schema/schema-mapper.ts
index 97964aee23b..2ca33ca0806 100644
--- a/packages/ui-vue/components/smoke-detector/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/smoke-detector/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/smoke-detector/src/schema/schema-resolver.ts b/packages/ui-vue/components/smoke-detector/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/smoke-detector/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/smoke-detector/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
diff --git a/packages/ui-vue/components/splitter/src/components/splitter-pane.props.ts b/packages/ui-vue/components/splitter/src/components/splitter-pane.props.ts
index 8ec98d02e5c..fb79f349c33 100644
--- a/packages/ui-vue/components/splitter/src/components/splitter-pane.props.ts
+++ b/packages/ui-vue/components/splitter/src/components/splitter-pane.props.ts
@@ -1,5 +1,5 @@
 import { ExtractPropTypes, PropType } from "vue";
-import { createPropsResolver } from "../../../dynamic-resolver";
+import { createPropsResolver } from "@farris/ui-vue/components/dynamic-resolver";
 import { splitterPaneSchemaMapper } from '../schema/splitter-pane-schema-mapper';
 import splitterPaneSchema from '../schema/splitter-pane.schema.json';
 import { splitterPaneSchemaResolver } from "../schema/splitter-schema-resolver";
diff --git a/packages/ui-vue/components/splitter/src/schema/splitter-pane-schema-mapper.ts b/packages/ui-vue/components/splitter/src/schema/splitter-pane-schema-mapper.ts
index d9158a6968a..6b3ee30d591 100644
--- a/packages/ui-vue/components/splitter/src/schema/splitter-pane-schema-mapper.ts
+++ b/packages/ui-vue/components/splitter/src/schema/splitter-pane-schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const splitterPaneSchemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/splitter/src/schema/splitter-schema-mapper.ts b/packages/ui-vue/components/splitter/src/schema/splitter-schema-mapper.ts
index f4f5325f4c2..cddec527339 100644
--- a/packages/ui-vue/components/splitter/src/schema/splitter-schema-mapper.ts
+++ b/packages/ui-vue/components/splitter/src/schema/splitter-schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const splitterSchemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/splitter/src/schema/splitter-schema-resolver.ts b/packages/ui-vue/components/splitter/src/schema/splitter-schema-resolver.ts
index 1e1d22ed80c..2f221d9fe49 100644
--- a/packages/ui-vue/components/splitter/src/schema/splitter-schema-resolver.ts
+++ b/packages/ui-vue/components/splitter/src/schema/splitter-schema-resolver.ts
@@ -1,6 +1,6 @@
  
 import { ComponentSchema, DesignerComponentInstance } from "../../../designer-canvas/src/types";
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 function wrapContentContainerForDataGrid(resolver: DynamicResolver, schema: ComponentSchema, context: Record<string, any>): ComponentSchema {
     const contentContainerSchema = resolver.getSchemaByType('content-container') as ComponentSchema;
diff --git a/packages/ui-vue/components/step/src/schema/schema-mapper.ts b/packages/ui-vue/components/step/src/schema/schema-mapper.ts
index 97964aee23b..2ca33ca0806 100644
--- a/packages/ui-vue/components/step/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/step/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/step/src/schema/schema-resolver.ts b/packages/ui-vue/components/step/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/step/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/step/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
diff --git a/packages/ui-vue/components/tags/src/schema/schema-mapper.ts b/packages/ui-vue/components/tags/src/schema/schema-mapper.ts
index 97964aee23b..2ca33ca0806 100644
--- a/packages/ui-vue/components/tags/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/tags/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/tags/src/schema/schema-resolver.ts b/packages/ui-vue/components/tags/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/tags/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/tags/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
diff --git a/packages/ui-vue/components/text/src/schema/schema-mapper.ts b/packages/ui-vue/components/text/src/schema/schema-mapper.ts
index 97964aee23b..2ca33ca0806 100644
--- a/packages/ui-vue/components/text/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/text/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/text/src/schema/schema-resolver.ts b/packages/ui-vue/components/text/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/text/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/text/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
diff --git a/packages/ui-vue/components/time-picker/src/schema/schema-mapper.ts b/packages/ui-vue/components/time-picker/src/schema/schema-mapper.ts
index 97964aee23b..2ca33ca0806 100644
--- a/packages/ui-vue/components/time-picker/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/time-picker/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/time-picker/src/schema/schema-resolver.ts b/packages/ui-vue/components/time-picker/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/time-picker/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/time-picker/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
diff --git a/packages/ui-vue/components/transfer/src/schema/schema-mapper.ts b/packages/ui-vue/components/transfer/src/schema/schema-mapper.ts
index 97964aee23b..2ca33ca0806 100644
--- a/packages/ui-vue/components/transfer/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/transfer/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/transfer/src/schema/schema-resolver.ts b/packages/ui-vue/components/transfer/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/transfer/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/transfer/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
diff --git a/packages/ui-vue/components/uploader/src/schema/schema-mapper.ts b/packages/ui-vue/components/uploader/src/schema/schema-mapper.ts
index 97964aee23b..2ca33ca0806 100644
--- a/packages/ui-vue/components/uploader/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/uploader/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/uploader/src/schema/schema-resolver.ts b/packages/ui-vue/components/uploader/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/uploader/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/uploader/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
diff --git a/packages/ui-vue/components/verify-detail/src/schema/schema-mapper.ts b/packages/ui-vue/components/verify-detail/src/schema/schema-mapper.ts
index 97964aee23b..2ca33ca0806 100644
--- a/packages/ui-vue/components/verify-detail/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/verify-detail/src/schema/schema-mapper.ts
@@ -1,4 +1,4 @@
-import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver';
+import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver';
 
 export const schemaMapper = new Map<string, string | MapperFunction>([
     ['appearance', resolveAppearance]
diff --git a/packages/ui-vue/components/verify-detail/src/schema/schema-resolver.ts b/packages/ui-vue/components/verify-detail/src/schema/schema-resolver.ts
index b02bdf93eec..d36ae745743 100644
--- a/packages/ui-vue/components/verify-detail/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/verify-detail/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>): Record<string, any> {
     return schema;
-- 
Gitee


From d87d7f6cc50190eda79868bdc27d52cfe767a16d Mon Sep 17 00:00:00 2001
From: hyygzds <m15966339253@163.com>
Date: Tue, 5 Aug 2025 20:31:53 +0800
Subject: [PATCH 53/62] fix: optimize input dependcenies

---
 .../date-picker-container.component.tsx       |  4 +--
 .../components/number-spinner/designer.ts     | 34 +++++++++++++++++++
 .../ui-vue/components/number-spinner/index.ts | 11 ------
 .../number-spinner.design.component.tsx       |  2 +-
 .../designer/number-spinner.design.props.ts   | 14 ++++++++
 .../src/number-spinner.props.ts               | 12 -------
 .../number-spinner.property-config.ts         |  4 +--
 7 files changed, 52 insertions(+), 29 deletions(-)
 create mode 100644 packages/ui-vue/components/number-spinner/designer.ts
 create mode 100644 packages/ui-vue/components/number-spinner/src/designer/number-spinner.design.props.ts

diff --git a/packages/ui-vue/components/date-picker/src/components/date-picker-container/date-picker-container.component.tsx b/packages/ui-vue/components/date-picker/src/components/date-picker-container/date-picker-container.component.tsx
index ebdad418a1d..244eac9009d 100644
--- a/packages/ui-vue/components/date-picker/src/components/date-picker-container/date-picker-container.component.tsx
+++ b/packages/ui-vue/components/date-picker/src/components/date-picker-container/date-picker-container.component.tsx
@@ -15,7 +15,8 @@
 */
 import { computed, defineComponent, onMounted, ref, SetupContext, watch, watchEffect } from "vue";
 import { cloneDeep } from "lodash-es";
-import { FTimePickerTimeView, convertToDate, convertToString, TimeValueText } from '@farris/ui-vue/components/time-picker';
+import { useDateFormat, formatTime, getTimeObject } from '@farris/ui-vue/components/common';
+import { FTimePickerTimeView, TimeValueText } from '@farris/ui-vue/components/time-picker';
 import { FButton } from "@farris/ui-vue/components/button";
 import { datePickerContainerProps, DatePickerContainerProps, DisplayMode } from "./date-picker-container.props";
 import FCalenderNavBar from '../calendar-navbar/calendar-navbar.component';
@@ -30,7 +31,6 @@ import { useDate } from "../../composition/use-date";
 import { ActiveMonth } from "../../types/month";
 import { useMonth } from "../../composition/use-month";
 import { useYear } from "../../composition/use-year";
-import { useDateFormat, formatTime, getTimeObject } from '@farris/ui-vue/components/common';
 import { CalenderDayItem } from "../../types/calendar";
 
 import { useDisableMonth } from "../../composition/use-disable-month";
diff --git a/packages/ui-vue/components/number-spinner/designer.ts b/packages/ui-vue/components/number-spinner/designer.ts
new file mode 100644
index 00000000000..b85a560283b
--- /dev/null
+++ b/packages/ui-vue/components/number-spinner/designer.ts
@@ -0,0 +1,34 @@
+
+/**
+ * Copyright (c) 2020 - present, Inspur Genersoft Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { withInstall } from '@farris/ui-vue/components/common';
+import FNumberSpinner from '@farris/ui-vue/components/number-spinner';
+import FNumberSpinnerDesign from './src/designer/number-spinner.design.component';
+import { propsResolver } from './src/designer/number-spinner.design.props';
+
+export * from './src/designer/number-spinner.design.props';
+
+FNumberSpinnerDesign.register = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>, resolverMap: Record<string, any>) => {
+    componentMap['number-spinner'] = FNumberSpinner;
+    propsResolverMap['number-spinner'] = propsResolver;
+};
+FNumberSpinnerDesign.registerDesigner = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>) => {
+    componentMap['number-spinner'] = FNumberSpinnerDesign;
+    propsResolverMap['number-spinner'] = propsResolver;
+};
+
+export { FNumberSpinnerDesign };
+export default withInstall(FNumberSpinnerDesign);
diff --git a/packages/ui-vue/components/number-spinner/index.ts b/packages/ui-vue/components/number-spinner/index.ts
index f2a04754174..ec87d812717 100644
--- a/packages/ui-vue/components/number-spinner/index.ts
+++ b/packages/ui-vue/components/number-spinner/index.ts
@@ -16,8 +16,6 @@
  */
 import { withInstall } from '@farris/ui-vue/components/common';
 import FNumberSpinner from './src/number-spinner.component';
-import FNumberSpinnerDesign from './src/designer/number-spinner.design.component';
-import { propsResolver } from './src/number-spinner.props';
 
 export * from './src/number-spinner.props';
 export * from './src/composition/use-format';
@@ -27,14 +25,5 @@ export * from './src/composition/use-text-box';
 export { default as getNumberTextBoxRender } from './src/components/text-box.component';
 export { default as getSpinnerRender } from './src/components/spinner.component';
 
-FNumberSpinner.register = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>, resolverMap: Record<string, any>) => {
-    componentMap['number-spinner'] = FNumberSpinner;
-    propsResolverMap['number-spinner'] = propsResolver;
-};
-FNumberSpinner.registerDesigner = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>) => {
-    componentMap['number-spinner'] = FNumberSpinnerDesign;
-    propsResolverMap['number-spinner'] = propsResolver;
-};
-
 export { FNumberSpinner };
 export default withInstall(FNumberSpinner);
diff --git a/packages/ui-vue/components/number-spinner/src/designer/number-spinner.design.component.tsx b/packages/ui-vue/components/number-spinner/src/designer/number-spinner.design.component.tsx
index e91d43ff532..a40950ddd69 100644
--- a/packages/ui-vue/components/number-spinner/src/designer/number-spinner.design.component.tsx
+++ b/packages/ui-vue/components/number-spinner/src/designer/number-spinner.design.component.tsx
@@ -15,7 +15,7 @@
  */
 import { defineComponent, onMounted, ref, inject } from 'vue';
 import type { SetupContext } from 'vue';
-import { numberSpinnerDesignProps, NumberSpinnerDesignProps } from '../number-spinner.props';
+import { numberSpinnerDesignProps, NumberSpinnerDesignProps } from './number-spinner.design.props';
 import { useSpinner } from '../composition/use-spinner';
 import { useFormat } from '../composition/use-format';
 import { useNumber } from '../composition/use-number';
diff --git a/packages/ui-vue/components/number-spinner/src/designer/number-spinner.design.props.ts b/packages/ui-vue/components/number-spinner/src/designer/number-spinner.design.props.ts
new file mode 100644
index 00000000000..d83aca43da8
--- /dev/null
+++ b/packages/ui-vue/components/number-spinner/src/designer/number-spinner.design.props.ts
@@ -0,0 +1,14 @@
+import { ExtractPropTypes } from 'vue';
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
+import { numberSpinnerProps } from '@farris/ui-vue/components/number-spinner';
+import { schemaMapper } from '../schema/schema-mapper';
+import numberSpinnerSchema from '../schema/number-spinner.schema.json';
+import { schemaResolver } from '../schema/schema-resolver';
+
+export const numberSpinnerDesignProps = Object.assign({}, numberSpinnerProps, {
+    readonly: {}
+});
+
+export type NumberSpinnerDesignProps = ExtractPropTypes<typeof numberSpinnerDesignProps>;
+
+export const propsResolver = createPropsResolver<NumberSpinnerDesignProps>(numberSpinnerDesignProps, numberSpinnerSchema, schemaMapper, schemaResolver);
\ No newline at end of file
diff --git a/packages/ui-vue/components/number-spinner/src/number-spinner.props.ts b/packages/ui-vue/components/number-spinner/src/number-spinner.props.ts
index 66ff7d4f3d1..6f47a744008 100644
--- a/packages/ui-vue/components/number-spinner/src/number-spinner.props.ts
+++ b/packages/ui-vue/components/number-spinner/src/number-spinner.props.ts
@@ -15,10 +15,6 @@
  * limitations under the License.
  */
 import { ExtractPropTypes, PropType } from 'vue';
-import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
-import { schemaMapper } from './schema/schema-mapper';
-import numberSpinnerSchema from './schema/number-spinner.schema.json';
-import { schemaResolver } from './schema/schema-resolver';
 
 type TextAlignType = 'left' | 'right' | 'center' | 'start' | 'end' | 'justify';
 export const numberSpinnerProps = {
@@ -138,11 +134,3 @@ export const numberSpinnerProps = {
 } as Record<string, any>;
 
 export type NumberSpinnerProps = ExtractPropTypes<typeof numberSpinnerProps>;
-
-export const numberSpinnerDesignProps = Object.assign({}, numberSpinnerProps, {
-    readonly: {}
-});
-
-export type NumberSpinnerDesignProps = ExtractPropTypes<typeof numberSpinnerDesignProps>;
-
-export const propsResolver = createPropsResolver<NumberSpinnerProps>(numberSpinnerProps, numberSpinnerSchema, schemaMapper, schemaResolver);
diff --git a/packages/ui-vue/components/number-spinner/src/property-config/number-spinner.property-config.ts b/packages/ui-vue/components/number-spinner/src/property-config/number-spinner.property-config.ts
index d47b9d55945..378b65fbd22 100644
--- a/packages/ui-vue/components/number-spinner/src/property-config/number-spinner.property-config.ts
+++ b/packages/ui-vue/components/number-spinner/src/property-config/number-spinner.property-config.ts
@@ -1,7 +1,5 @@
 import { FormSchemaEntityFieldTypeName } from "@farris/ui-vue/components/common";
-import { FormPropertyChangeObject } from "../../../property-panel";
-import { InputBaseProperty } from "../../../property-panel/src/composition/entity/input-base-property";
-
+import { FormPropertyChangeObject, InputBaseProperty } from "@farris/ui-vue/components/property-panel";
 export class NumberSpinnerProperty extends InputBaseProperty {
 
     constructor(componentId: string, designerHostService: any) {
-- 
Gitee


From 7aa0ba8336d5f592c1e48034df40f17eb28b8999 Mon Sep 17 00:00:00 2001
From: hyygzds <m15966339253@163.com>
Date: Tue, 5 Aug 2025 20:53:00 +0800
Subject: [PATCH 54/62] fix: optimize input dependcenies

---
 .../ui-vue/components/date-picker/designer.ts |  3 +--
 .../ui-vue/components/date-picker/index.ts    |  1 +
 .../date-picker-container.props.ts            |  7 -------
 .../src/designer/date-picker.design.props.ts  |  6 +++++-
 .../designer-canvas/src/components/maps.ts    |  4 ++--
 .../dynamic-view/src/components/maps.ts       |  4 ++--
 .../ui-vue/components/time-picker/designer.ts | 21 +++++++++++++++++++
 .../ui-vue/components/time-picker/index.ts    | 10 ---------
 .../designer/time-picker.design.component.tsx |  5 ++---
 .../time-picker/src/time-picker.props.ts      |  5 -----
 10 files changed, 34 insertions(+), 32 deletions(-)
 create mode 100644 packages/ui-vue/components/time-picker/designer.ts

diff --git a/packages/ui-vue/components/date-picker/designer.ts b/packages/ui-vue/components/date-picker/designer.ts
index 35097040c33..048a43cd7f0 100644
--- a/packages/ui-vue/components/date-picker/designer.ts
+++ b/packages/ui-vue/components/date-picker/designer.ts
@@ -2,8 +2,7 @@ import { withInstall } from '@farris/ui-vue/components/common';
 import { DatePickerContainer, DatePicker, } from '@farris/ui-vue/components/date-picker';
 import FDatePickerDesign from './src/designer/date-picker.design.component';
 import FDateViewDesign from './src/designer/date-view.design.component';
-import { datePickerPropsResolver } from './src/designer/date-picker.design.props';
-import { dateViewPropsResolver } from './src/components/date-picker-container/date-picker-container.props';
+import { datePickerPropsResolver, dateViewPropsResolver } from './src/designer/date-picker.design.props';
 
 FDatePickerDesign.register = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>, resolverMap: Record<string, any>) => {
     componentMap['date-picker'] = DatePicker;
diff --git a/packages/ui-vue/components/date-picker/index.ts b/packages/ui-vue/components/date-picker/index.ts
index 02a8633b078..e149e2bf4cc 100644
--- a/packages/ui-vue/components/date-picker/index.ts
+++ b/packages/ui-vue/components/date-picker/index.ts
@@ -24,6 +24,7 @@ import DatePicker from './src/date-picker.component';
 
 export * from './src/components/calendar/calendar.props';
 export * from './src/date-picker.props';
+export * from './src/components/date-picker-container/date-picker-container.props';
 
 export * from './src/types/calendar';
 export * from './src/types/common';
diff --git a/packages/ui-vue/components/date-picker/src/components/date-picker-container/date-picker-container.props.ts b/packages/ui-vue/components/date-picker/src/components/date-picker-container/date-picker-container.props.ts
index 7e9205a40d2..c2a40ec140f 100644
--- a/packages/ui-vue/components/date-picker/src/components/date-picker-container/date-picker-container.props.ts
+++ b/packages/ui-vue/components/date-picker/src/components/date-picker-container/date-picker-container.props.ts
@@ -15,15 +15,10 @@
  * limitations under the License.
  */
 import { ExtractPropTypes, PropType } from 'vue';
-import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
 import { CalendarWeekItem } from '../../types/calendar';
 import { DateObject, Period, SelectMode, weekDays } from '../../types/common';
 import { defaultNameOfMonths, MonthViewItem } from '../../types/month';
 import { YearViewItem } from '../../types/year';
-import { schemaMapper } from '../../schema/schema-mapper';
-import { schemaResolver } from '../../schema/schema-resolver';
-import dateViewSchema from '../../schema/date-view.schema.json';
-import propertyConfig from '../../property-config/date-view.property-config.json';
 
 export type DisplayMode = 'Embedded' | 'Popup';
 
@@ -103,5 +98,3 @@ export const datePickerContainerProps = {
 } as Record<string, any>;
 
 export type DatePickerContainerProps = ExtractPropTypes<typeof datePickerContainerProps>;
-
-export const dateViewPropsResolver = createPropsResolver<DatePickerContainerProps>(datePickerContainerProps, dateViewSchema, schemaMapper, schemaResolver, propertyConfig);
diff --git a/packages/ui-vue/components/date-picker/src/designer/date-picker.design.props.ts b/packages/ui-vue/components/date-picker/src/designer/date-picker.design.props.ts
index 792737f1d60..986733ba4c4 100644
--- a/packages/ui-vue/components/date-picker/src/designer/date-picker.design.props.ts
+++ b/packages/ui-vue/components/date-picker/src/designer/date-picker.design.props.ts
@@ -1,10 +1,12 @@
 
 import { ExtractPropTypes } from 'vue';
 import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
-import { datePickerProps, DatePickerProps } from '@farris/ui-vue/components/date-picker';
+import { datePickerProps, DatePickerProps, DatePickerContainerProps, datePickerContainerProps } from '@farris/ui-vue/components/date-picker';
 import { schemaResolver } from '../schema/schema-resolver';
 import { schemaMapper } from '../schema/schema-mapper';
 import datePickerSchema from '../schema/date-picker.schema.json';
+import dateViewSchema from '../schema/date-view.schema.json';
+import propertyConfig from '../property-config/date-view.property-config.json';
 
 export const MAX_DATE = { year: 9999, month: 12, day: 31, hour: 23, minute: 59, second: 59 };
 export const MIN_DATE = { year: 1900, month: 1, day: 1, hour: 0, minute: 0, second: 0 };
@@ -16,3 +18,5 @@ export const datePickerDesignProps = Object.assign({}, datePickerProps, {
 export type DatePickerDesignProps = ExtractPropTypes<typeof datePickerDesignProps>;
 
 export const datePickerPropsResolver = createPropsResolver<DatePickerProps>(datePickerProps, datePickerSchema, schemaMapper, schemaResolver);
+
+export const dateViewPropsResolver = createPropsResolver<DatePickerContainerProps>(datePickerContainerProps, dateViewSchema, schemaMapper, schemaResolver, propertyConfig);
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 5e58ac5cd4a..bf8d848977a 100644
--- a/packages/ui-vue/components/designer-canvas/src/components/maps.ts
+++ b/packages/ui-vue/components/designer-canvas/src/components/maps.ts
@@ -22,7 +22,7 @@ import FListNav from '@farris/ui-vue/components/list-nav';
 import FListView from '@farris/ui-vue/components/list-view';
 import FLookup from '@farris/ui-vue/components/lookup';
 import FNav from '@farris/ui-vue/components/nav';
-import FNumberSpinner from '@farris/ui-vue/components/number-spinner';
+import FNumberSpinner from '@farris/ui-vue/components/number-spinner/designer';
 import FNumberRange from '@farris/ui-vue/components/number-range';
 import FOrder from '@farris/ui-vue/components/order';
 import FPageHeader from '@farris/ui-vue/components/page-header';
@@ -44,7 +44,7 @@ import FSwitch from '@farris/ui-vue/components/switch';
 import FTab from '@farris/ui-vue/components/tabs/designer';
 import FTags from '@farris/ui-vue/components/tags';
 import FText from '@farris/ui-vue/components/text';
-import FTimePicker from '@farris/ui-vue/components/time-picker';
+import FTimePicker from '@farris/ui-vue/components/time-picker/designer';
 import FTransfer from '@farris/ui-vue/components/transfer';
 import FTreeview from '@farris/ui-vue/components/tree-view';
 import FUploader from '@farris/ui-vue/components/uploader';
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 953b7229989..cb675cff48a 100644
--- a/packages/ui-vue/components/dynamic-view/src/components/maps.ts
+++ b/packages/ui-vue/components/dynamic-view/src/components/maps.ts
@@ -28,7 +28,7 @@ import FLookup from '@farris/ui-vue/components/lookup';
 import FMappingEditor from '@farris/ui-vue/components/mapping-editor';
 import FNav from '@farris/ui-vue/components/nav';
 import FNumberRange from '@farris/ui-vue/components/number-range';
-import FNumberSpinner from '@farris/ui-vue/components/number-spinner';
+import FNumberSpinner from '@farris/ui-vue/components/number-spinner/designer';
 import FOrder from '@farris/ui-vue/components/order';
 import FPageHeader from '@farris/ui-vue/components/page-header';
 import FPageFooter from '@farris/ui-vue/components/page-footer';
@@ -49,7 +49,7 @@ import FSwitch from '@farris/ui-vue/components/switch';
 import FTabs from '@farris/ui-vue/components/tabs/designer';
 import FTags from '@farris/ui-vue/components/tags';
 import FText from '@farris/ui-vue/components/text';
-import FTimePicker from '@farris/ui-vue/components/time-picker';
+import FTimePicker from '@farris/ui-vue/components/time-picker/designer';
 import FTransfer from '@farris/ui-vue/components/transfer';
 import FTreeview from '@farris/ui-vue/components/tree-view';
 import FUploader from '@farris/ui-vue/components/uploader';
diff --git a/packages/ui-vue/components/time-picker/designer.ts b/packages/ui-vue/components/time-picker/designer.ts
new file mode 100644
index 00000000000..a1247359d6e
--- /dev/null
+++ b/packages/ui-vue/components/time-picker/designer.ts
@@ -0,0 +1,21 @@
+
+import type { Plugin } from 'vue';
+import FTimePicker, { TimePickerProps, timePickerProps } from '@farris/ui-vue/components/time-picker';
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
+import FTimePickerDesign from './src/designer/time-picker.design.component';
+import { schemaMapper } from './src/schema/schema-mapper';
+import timePickerSchema from './src/schema/time-picker.schema.json';
+import { schemaResolver } from './src/schema/schema-resolver';
+export const propsResolver = createPropsResolver<TimePickerProps>(timePickerProps, timePickerSchema, schemaMapper, schemaResolver);
+
+FTimePickerDesign.register = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>, resolverMap: Record<string, any>) => {
+    componentMap['time-picker'] = FTimePicker;
+    propsResolverMap['time-picker'] = propsResolver;
+};
+FTimePickerDesign.registerDesigner = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>) => {
+    componentMap['time-picker'] = FTimePickerDesign;
+    propsResolverMap['time-picker'] = propsResolver;
+};
+
+export { FTimePickerDesign };
+export default FTimePickerDesign as typeof FTimePickerDesign & Plugin;
diff --git a/packages/ui-vue/components/time-picker/index.ts b/packages/ui-vue/components/time-picker/index.ts
index b66fd017266..9502905e45d 100644
--- a/packages/ui-vue/components/time-picker/index.ts
+++ b/packages/ui-vue/components/time-picker/index.ts
@@ -2,8 +2,6 @@
 import type { App, Plugin } from 'vue';
 import FTimePicker from './src/time-picker.component';
 import FTimePickerTimeView from './src/components/time.component';
-import { propsResolver } from './src/time-picker.props';
-import FTimePickerDesign from './src/designer/time-picker.design.component';
 export * from './src/composition/types';
 export * from './src/composition/utils';
 
@@ -14,14 +12,6 @@ FTimePicker.install = (app: App) => {
     app.component(FTimePicker.name as string, FTimePicker)
         .component(FTimePickerTimeView.name as string, FTimePickerTimeView);
 };
-FTimePicker.register = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>, resolverMap: Record<string, any>) => {
-    componentMap['time-picker'] = FTimePicker;
-    propsResolverMap['time-picker'] = propsResolver;
-};
-FTimePicker.registerDesigner = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>) => {
-    componentMap['time-picker'] = FTimePickerDesign;
-    propsResolverMap['time-picker'] = propsResolver;
-};
 
 export { FTimePicker, FTimePickerTimeView };
 export default FTimePicker as typeof FTimePicker & Plugin;
diff --git a/packages/ui-vue/components/time-picker/src/designer/time-picker.design.component.tsx b/packages/ui-vue/components/time-picker/src/designer/time-picker.design.component.tsx
index bacc91a0d2e..b4efa47f0a6 100644
--- a/packages/ui-vue/components/time-picker/src/designer/time-picker.design.component.tsx
+++ b/packages/ui-vue/components/time-picker/src/designer/time-picker.design.component.tsx
@@ -1,8 +1,7 @@
 import { SetupContext, defineComponent, inject, onMounted, ref } from 'vue';
 import { TimePickerProps, timePickerProps } from '../time-picker.props';
-import { FButtonEdit } from '../../../button-edit';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
+import { FButtonEdit } from '@farris/ui-vue/components/button-edit';
+import { useDesignerComponent, DesignerItemContext } from '@farris/ui-vue/components/designer-canvas';
 import { useTimePickerDesignerRules } from './use-design-rules';
 
 export default defineComponent({
diff --git a/packages/ui-vue/components/time-picker/src/time-picker.props.ts b/packages/ui-vue/components/time-picker/src/time-picker.props.ts
index 95bdb8b8373..d1f1e94d9f9 100644
--- a/packages/ui-vue/components/time-picker/src/time-picker.props.ts
+++ b/packages/ui-vue/components/time-picker/src/time-picker.props.ts
@@ -1,9 +1,5 @@
  
 import { ExtractPropTypes, PropType } from 'vue';
-import { createPropsResolver } from '../../dynamic-resolver';
-import { schemaMapper } from './schema/schema-mapper';
-import timePickerSchema from './schema/time-picker.schema.json';
-import { schemaResolver } from './schema/schema-resolver';
 import { DisabledHoursFunction, DisabledMinutesFunction, DisabledSecondsFunction } from './composition/types';
 
 export const timePickerProps = {
@@ -39,4 +35,3 @@ export const timePickerProps = {
 
 export type TimePickerProps = ExtractPropTypes<typeof timePickerProps>;
 
-export const propsResolver = createPropsResolver<TimePickerProps>(timePickerProps, timePickerSchema, schemaMapper, schemaResolver);
-- 
Gitee


From ffd08773f014e2935cede342bfcb9d2022efeea0 Mon Sep 17 00:00:00 2001
From: hyygzds <m15966339253@163.com>
Date: Wed, 6 Aug 2025 09:09:25 +0800
Subject: [PATCH 55/62] fix: split switch and date-picker dependcenies

---
 .../designer-canvas/src/components/maps.ts    |  4 +--
 .../dynamic-view/src/components/maps.ts       |  4 +--
 packages/ui-vue/components/switch/designer.ts | 36 +++++++++++++++++++
 packages/ui-vue/components/switch/index.ts    | 12 -------
 .../src/designer/switch.design.component.tsx  |  2 +-
 .../components/switch/src/switch.props.ts     |  8 +----
 packages/ui-vue/components/tags/designer.ts   | 27 ++++++++++++++
 packages/ui-vue/components/tags/index.ts      | 13 -------
 .../ui-vue/components/tags/src/tags.props.ts  |  6 ----
 9 files changed, 69 insertions(+), 43 deletions(-)
 create mode 100644 packages/ui-vue/components/switch/designer.ts
 create mode 100644 packages/ui-vue/components/tags/designer.ts

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 bf8d848977a..4e752b83171 100644
--- a/packages/ui-vue/components/designer-canvas/src/components/maps.ts
+++ b/packages/ui-vue/components/designer-canvas/src/components/maps.ts
@@ -40,9 +40,9 @@ import FSection from '@farris/ui-vue/components/section/designer';
 import FSmokeDetector from '@farris/ui-vue/components/smoke-detector';
 import FSplitter from '@farris/ui-vue/components/splitter';
 import FStep from '@farris/ui-vue/components/step';
-import FSwitch from '@farris/ui-vue/components/switch';
+import FSwitch from '@farris/ui-vue/components/switch/designer';
 import FTab from '@farris/ui-vue/components/tabs/designer';
-import FTags from '@farris/ui-vue/components/tags';
+import FTags from '@farris/ui-vue/components/tags/designer';
 import FText from '@farris/ui-vue/components/text';
 import FTimePicker from '@farris/ui-vue/components/time-picker/designer';
 import FTransfer from '@farris/ui-vue/components/transfer';
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 cb675cff48a..da2061f6fe0 100644
--- a/packages/ui-vue/components/dynamic-view/src/components/maps.ts
+++ b/packages/ui-vue/components/dynamic-view/src/components/maps.ts
@@ -45,9 +45,9 @@ import FSection from '@farris/ui-vue/components/section/designer';
 import FSmokeDetector from '@farris/ui-vue/components/smoke-detector';
 import FSplitter from '@farris/ui-vue/components/splitter';
 import FStep from '@farris/ui-vue/components/step';
-import FSwitch from '@farris/ui-vue/components/switch';
+import FSwitch from '@farris/ui-vue/components/switch/designer';
 import FTabs from '@farris/ui-vue/components/tabs/designer';
-import FTags from '@farris/ui-vue/components/tags';
+import FTags from '@farris/ui-vue/components/tags/designer';
 import FText from '@farris/ui-vue/components/text';
 import FTimePicker from '@farris/ui-vue/components/time-picker/designer';
 import FTransfer from '@farris/ui-vue/components/transfer';
diff --git a/packages/ui-vue/components/switch/designer.ts b/packages/ui-vue/components/switch/designer.ts
new file mode 100644
index 00000000000..2a13021eb0c
--- /dev/null
+++ b/packages/ui-vue/components/switch/designer.ts
@@ -0,0 +1,36 @@
+
+/**
+ * Copyright (c) 2020 - present, Inspur Genersoft Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import FSwitch, { SwitchProps, switchProps } from '@farris/ui-vue/components/switch';
+import { withInstall } from '@farris/ui-vue/components/common';
+import FSwitchDesign from './src/designer/switch.design.component';
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
+import { schemaMapper } from './src/schema/schema-mapper';
+import switchSchema from './src/schema/switch.schema.json';
+import { schemaResolver } from './src/schema/schema-resolver';
+export const propsResolver = createPropsResolver<SwitchProps>(switchProps, switchSchema, schemaMapper, schemaResolver);
+
+FSwitchDesign.register = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>, resolverMap: Record<string, any>) => {
+    componentMap.switch = FSwitch;
+    propsResolverMap.switch = propsResolver;
+};
+FSwitchDesign.registerDesigner = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>) => {
+    componentMap.switch = FSwitchDesign;
+    propsResolverMap.switch = propsResolver;
+};
+
+export { FSwitchDesign };
+export default withInstall(FSwitchDesign);
diff --git a/packages/ui-vue/components/switch/index.ts b/packages/ui-vue/components/switch/index.ts
index f8b87179ad6..24417ee5ec6 100644
--- a/packages/ui-vue/components/switch/index.ts
+++ b/packages/ui-vue/components/switch/index.ts
@@ -14,22 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { App } from 'vue';
 import FSwitch from './src/switch.component';
-import { propsResolver } from './src/switch.props';
-import FSwitchDesign from './src/designer/switch.design.component';
 import { withInstall } from '@farris/ui-vue/components/common';
 
 export * from './src/switch.props';
 
-FSwitch.register = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>, resolverMap: Record<string, any>) => {
-    componentMap.switch = FSwitch;
-    propsResolverMap.switch = propsResolver;
-};
-FSwitch.registerDesigner = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>) => {
-    componentMap.switch = FSwitchDesign;
-    propsResolverMap.switch = propsResolver;
-};
-
 export { FSwitch };
 export default withInstall(FSwitch);
diff --git a/packages/ui-vue/components/switch/src/designer/switch.design.component.tsx b/packages/ui-vue/components/switch/src/designer/switch.design.component.tsx
index b6cf664c8a9..a31270f9c89 100644
--- a/packages/ui-vue/components/switch/src/designer/switch.design.component.tsx
+++ b/packages/ui-vue/components/switch/src/designer/switch.design.component.tsx
@@ -16,7 +16,7 @@
  */
 import { computed, defineComponent, inject, onMounted, ref, SetupContext, toRefs } from 'vue';
 import { useDesignerComponent, DesignerItemContext } from '@farris/ui-vue/components/designer-canvas';
-import { switchProps, SwitchProps } from '../switch.props';
+import { switchProps, SwitchProps } from '@farris/ui-vue/components/switch';
 import { useSwitchDesignerRules } from './use-design-rules';
 
 export default defineComponent({
diff --git a/packages/ui-vue/components/switch/src/switch.props.ts b/packages/ui-vue/components/switch/src/switch.props.ts
index dbf1414cab3..68a6cdbbc14 100644
--- a/packages/ui-vue/components/switch/src/switch.props.ts
+++ b/packages/ui-vue/components/switch/src/switch.props.ts
@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 import { ExtractPropTypes, PropType } from 'vue';
-import { createPropsResolver } from '../../dynamic-resolver';
-import { schemaMapper } from './schema/schema-mapper';
-import switchSchema from './schema/switch.schema.json';
-import { schemaResolver } from './schema/schema-resolver';
 
 export type SwitchType = 'small' | 'medium' | 'large';
 
@@ -42,6 +38,4 @@ export const switchProps = {
     focusOnCreated: { type: Boolean, default: false }
 } as Record<string, any>;
 
-export type SwitchProps = ExtractPropTypes<typeof switchProps>;
-
-export const propsResolver = createPropsResolver<SwitchProps>(switchProps, switchSchema, schemaMapper, schemaResolver);
+export type SwitchProps = ExtractPropTypes<typeof switchProps>;
\ No newline at end of file
diff --git a/packages/ui-vue/components/tags/designer.ts b/packages/ui-vue/components/tags/designer.ts
new file mode 100644
index 00000000000..f88908e14d5
--- /dev/null
+++ b/packages/ui-vue/components/tags/designer.ts
@@ -0,0 +1,27 @@
+
+
+import { withInstall } from '@farris/ui-vue/components/common';
+import FTags, { TagsProps, tagsProps } from '@farris/ui-vue/components/tags';
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
+import FTagsDesign from './src/designer/tags.design.component';
+import { schemaResolver } from './src/schema/schema-resolver';
+import { schemaMapper } from './src/schema/schema-mapper';
+import propertyConfig from './src/property-config/tags.property-config.json';
+import tagsSchema from './src/schema/tags.schema.json';
+export * from './src/tags.props';
+export const propsResolver = createPropsResolver<TagsProps>(tagsProps, tagsSchema, schemaMapper, schemaResolver, propertyConfig);
+import './tags.scss';
+
+FTagsDesign.register = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>, resolverMap: Record<string, any>): void => {
+    componentMap.tags = FTags;
+    propsResolverMap.tags = propsResolver;
+};
+
+FTagsDesign.registerDesigner = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>): void => {
+    componentMap.tags = FTagsDesign;
+    propsResolverMap.tags = propsResolver;
+};
+
+export { FTagsDesign };
+
+export default withInstall(FTagsDesign);
diff --git a/packages/ui-vue/components/tags/index.ts b/packages/ui-vue/components/tags/index.ts
index ee226df6007..90e43f3c92e 100644
--- a/packages/ui-vue/components/tags/index.ts
+++ b/packages/ui-vue/components/tags/index.ts
@@ -2,23 +2,10 @@
  
 import { withInstall } from '@farris/ui-vue/components/common';
 import FTags from './src/tags.component';
-import { propsResolver } from './src/tags.props';
-import FTagsDesign from './src/designer/tags.design.component';
-
 export * from './src/tags.props';
 
 import './tags.scss';
 
-FTags.register = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>, resolverMap: Record<string, any>): void => {
-    componentMap.tags = FTags;
-    propsResolverMap.tags = propsResolver;
-};
-
-FTags.registerDesigner = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>): void => {
-    componentMap.tags = FTagsDesign;
-    propsResolverMap.tags = propsResolver;
-};
-
 export { FTags };
 
 export default withInstall(FTags);
diff --git a/packages/ui-vue/components/tags/src/tags.props.ts b/packages/ui-vue/components/tags/src/tags.props.ts
index 04dcdb91d4b..61616f7132f 100644
--- a/packages/ui-vue/components/tags/src/tags.props.ts
+++ b/packages/ui-vue/components/tags/src/tags.props.ts
@@ -1,10 +1,5 @@
  
 import { ExtractPropTypes, PropType } from 'vue';
-import { schemaResolver } from './schema/schema-resolver';
-import { schemaMapper } from './schema/schema-mapper';
-import propertyConfig from './property-config/tags.property-config.json';
-import { createPropsResolver } from '../../dynamic-resolver/src/props-resolver';
-import tagsSchema from './schema/tags.schema.json';
 
 export interface Tag {
     name: string;
@@ -39,4 +34,3 @@ export const tagsProps = {
 } as Record<string, any>;
 
 export type TagsProps = ExtractPropTypes<typeof tagsProps>;
-export const propsResolver = createPropsResolver<TagsProps>(tagsProps, tagsSchema, schemaMapper, schemaResolver, propertyConfig);
-- 
Gitee


From d11ba51140f1725eb4a7d31eec026172ce4e57cf Mon Sep 17 00:00:00 2001
From: hyygzds <m15966339253@163.com>
Date: Thu, 7 Aug 2025 19:30:27 +0800
Subject: [PATCH 56/62] fix: split denpendency dynamic resolver of all
 components

---
 .../components/accordion/src/accordion.props.ts      |  2 +-
 .../ui-vue/components/avatar/src/avatar.props.ts     |  2 +-
 .../border-editor/src/border-editor.props.ts         |  2 +-
 .../ui-vue/components/calendar/src/calendar.props.ts |  2 +-
 .../ui-vue/components/capsule/src/capsule.props.ts   |  2 +-
 .../color-picker/src/color-picker.props.ts           |  2 +-
 .../components/component/src/component-ref.props.ts  |  2 +-
 .../components/component/src/component.props.ts      |  2 +-
 .../content-container/src/content-container.props.ts |  2 +-
 packages/ui-vue/components/designer-canvas/index.ts  | 12 +++++++-----
 .../dynamic-form/src/response-form.props.ts          |  2 +-
 packages/ui-vue/components/dynamic-resolver/index.ts |  3 ++-
 .../components/dynamic-view/src/callback-deliver.ts  |  2 +-
 .../dynamic-view/src/dynamic-view.component.tsx      |  2 +-
 .../components/dynamic-view/src/event-dispatcher.ts  |  2 +-
 .../events-editor/src/events-editor.props.ts         |  2 +-
 .../src/expression-textbox.props.ts                  |  2 +-
 .../ui-vue/components/fieldset/src/fieldset.props.ts |  2 +-
 .../composition/use-filterbar-rules.ts               |  2 +-
 .../components/filter-bar/src/filter-bar.props.ts    |  2 +-
 .../src/filter-condition-editor.props.ts             |  2 +-
 .../html-template/src/html-template.props.ts         |  2 +-
 .../image-cropper/src/image-cropper.props.ts         |  2 +-
 .../src/property-config/converter/input.converter.ts |  2 +-
 .../components/json-editor/src/json-editor.props.ts  |  2 +-
 .../ui-vue/components/layout/src/layout.props.ts     |  2 +-
 .../ui-vue/components/list-nav/src/list-nav.props.ts |  2 +-
 .../mapping-editor/src/mapping-editor.props.ts       |  2 +-
 .../components/menu-lookup/src/menu-lookup.props.ts  |  2 +-
 .../number-range/src/number-range.props.ts           |  2 +-
 packages/ui-vue/components/order/src/order.props.ts  |  2 +-
 .../components/page-footer/src/page-footer.props.ts  |  2 +-
 .../components/page-header/src/page-header.props.ts  |  2 +-
 .../components/pagination/src/pagination.props.ts    |  2 +-
 .../ui-vue/components/progress/src/progress.props.ts |  2 +-
 .../property-editor/src/property-editor.props.ts     |  2 +-
 .../src/composition/entity/base-property.ts          |  4 +---
 .../src/composition/entity/input-base-property.ts    |  7 +++----
 .../src/composition/entity/schema-dom-mapping.ts     |  2 +-
 .../src/composition/entity/use-input-rules.ts        |  2 +-
 .../property-panel/src/property-panel.component.tsx  |  4 ++--
 .../composition/use-querysolution-rules.ts           |  2 +-
 .../radio-button/src/radio-button.props.ts           |  2 +-
 packages/ui-vue/components/rate/src/rate.props.ts    |  2 +-
 .../src/schema-selector-editor.props.ts              |  2 +-
 .../components/search-box/src/search-box.props.ts    |  2 +-
 .../smoke-detector/src/smoke-detector.props.ts       |  2 +-
 .../src/sort-condition-editor.props.ts               |  2 +-
 .../spacing-editor/src/spacing-editor.props.ts       |  2 +-
 .../ui-vue/components/splitter/src/splitter.props.ts |  2 +-
 packages/ui-vue/components/step/src/step.props.ts    |  2 +-
 packages/ui-vue/components/text/src/text.props.ts    |  2 +-
 .../ui-vue/components/transfer/src/transfer.props.ts |  2 +-
 .../components/tree-view/src/tree-view.props.ts      |  2 +-
 .../ui-vue/components/uploader/src/uploader.props.ts |  2 +-
 .../verify-detail/src/verify-detail.props.ts         |  2 +-
 56 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/packages/ui-vue/components/accordion/src/accordion.props.ts b/packages/ui-vue/components/accordion/src/accordion.props.ts
index 34ec4227798..535c80d527f 100644
--- a/packages/ui-vue/components/accordion/src/accordion.props.ts
+++ b/packages/ui-vue/components/accordion/src/accordion.props.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 import { ExtractPropTypes } from 'vue';
-import { createPropsResolver } from '../../dynamic-resolver';
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
 import { schemaMapper } from './schema/schema-mapper';
 import accordionSchema from './schema/accordion.schema.json';
 import { schemaResolver } from './schema/schema-resolver';
diff --git a/packages/ui-vue/components/avatar/src/avatar.props.ts b/packages/ui-vue/components/avatar/src/avatar.props.ts
index edddcc443ea..d9037bd40a4 100644
--- a/packages/ui-vue/components/avatar/src/avatar.props.ts
+++ b/packages/ui-vue/components/avatar/src/avatar.props.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 import { ExtractPropTypes, PropType } from 'vue';
-import { createPropsResolver } from '../../dynamic-resolver';
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
 import { schemaResolver } from './schema/schema-resolver';
 import { schemaMapper } from './schema/schema-mapper';
 import avatarSchema from './schema/avatar.schema.json';
diff --git a/packages/ui-vue/components/border-editor/src/border-editor.props.ts b/packages/ui-vue/components/border-editor/src/border-editor.props.ts
index dad9807b490..3ba6d4498a3 100644
--- a/packages/ui-vue/components/border-editor/src/border-editor.props.ts
+++ b/packages/ui-vue/components/border-editor/src/border-editor.props.ts
@@ -1,6 +1,6 @@
  
 import { ExtractPropTypes, PropType } from "vue";
-// import { createPropsResolver } from "../../dynamic-resolver";
+// import { createPropsResolver } from "@farris/ui-vue/components/dynamic-resolver";
 // import { schemaMapper } from "./schema/schema-mapper";
 // import borderEditorSchema from './schema/border-editor.schema.json';
 // import { schemaResolver } from './schema/schema-resolver';
diff --git a/packages/ui-vue/components/calendar/src/calendar.props.ts b/packages/ui-vue/components/calendar/src/calendar.props.ts
index 9d03f1d00d5..88421962ffb 100644
--- a/packages/ui-vue/components/calendar/src/calendar.props.ts
+++ b/packages/ui-vue/components/calendar/src/calendar.props.ts
@@ -1,7 +1,7 @@
  
 import { ExtractPropTypes } from 'vue';
 import { ScheduleEvent } from './types/schedule';
-import { createPropsResolver } from '../../dynamic-resolver';
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
 import { schemaMapper } from './schema/schema-mapper';
 import { schemaResolver } from './schema/schema-resolver';
 import calendarSchema from './schema/calendar.schema.json';
diff --git a/packages/ui-vue/components/capsule/src/capsule.props.ts b/packages/ui-vue/components/capsule/src/capsule.props.ts
index 45481882f89..d87c5e5c20f 100644
--- a/packages/ui-vue/components/capsule/src/capsule.props.ts
+++ b/packages/ui-vue/components/capsule/src/capsule.props.ts
@@ -1,6 +1,6 @@
 import { ComputedRef, ExtractPropTypes, PropType } from 'vue';
 import capsuleSchema from "./schema/capsule.schema.json";
-import { createPropsResolver } from '../../dynamic-resolver/src/props-resolver';
+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';
diff --git a/packages/ui-vue/components/color-picker/src/color-picker.props.ts b/packages/ui-vue/components/color-picker/src/color-picker.props.ts
index a72bc06e12e..ae65eea20a5 100644
--- a/packages/ui-vue/components/color-picker/src/color-picker.props.ts
+++ b/packages/ui-vue/components/color-picker/src/color-picker.props.ts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 import { ExtractPropTypes } from 'vue';
-import { createPropsResolver } from '../../dynamic-resolver';
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
 import colorPickerSchema from './schema/color-picker.schema.json';
 import { schemaResolver } from './schema/schema-resolver';
 import { schemaMapper } from './schema/schema-mapper';
diff --git a/packages/ui-vue/components/component/src/component-ref.props.ts b/packages/ui-vue/components/component/src/component-ref.props.ts
index 54059432325..a6997b57538 100644
--- a/packages/ui-vue/components/component/src/component-ref.props.ts
+++ b/packages/ui-vue/components/component/src/component-ref.props.ts
@@ -1,6 +1,6 @@
  
 import { ExtractPropTypes } from 'vue';
-import { createPropsResolver } from '../../dynamic-resolver';
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
 import { schemaMapper } from './schema/schema-mapper';
 import componentRefSchema from './schema/component-ref.schema.json';
 import { schemaResolver } from './schema/schema-resolver';
diff --git a/packages/ui-vue/components/component/src/component.props.ts b/packages/ui-vue/components/component/src/component.props.ts
index d681b0fcf66..6a44cd43531 100644
--- a/packages/ui-vue/components/component/src/component.props.ts
+++ b/packages/ui-vue/components/component/src/component.props.ts
@@ -1,6 +1,6 @@
  
 import { ExtractPropTypes } from 'vue';
-import { createPropsResolver } from '../../dynamic-resolver';
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
 import { schemaMapper } from './schema/schema-mapper';
 import componentSchema from './schema/component.schema.json';
 import { schemaResolver } from './schema/schema-resolver';
diff --git a/packages/ui-vue/components/content-container/src/content-container.props.ts b/packages/ui-vue/components/content-container/src/content-container.props.ts
index c14b8b29507..38cd8bf2698 100644
--- a/packages/ui-vue/components/content-container/src/content-container.props.ts
+++ b/packages/ui-vue/components/content-container/src/content-container.props.ts
@@ -1,6 +1,6 @@
 
 import { ExtractPropTypes } from 'vue';
-import { createPropsResolver } from '../../dynamic-resolver';
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
 import { schemaMapper } from './schema/schema-mapper';
 import contentContainerSchema from './schema/content-container.schema.json';
 import { schemaResolver } from './schema/schema-resolver';
diff --git a/packages/ui-vue/components/designer-canvas/index.ts b/packages/ui-vue/components/designer-canvas/index.ts
index f4ecd9e79d8..359395edb2a 100644
--- a/packages/ui-vue/components/designer-canvas/index.ts
+++ b/packages/ui-vue/components/designer-canvas/index.ts
@@ -4,6 +4,7 @@ import FDesignerInnerItem from './src/components/designer-inner-item.component';
 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';
 
 export * from './src/composition/props/designer-canvas.props';
 export * from './src/composition/function/use-designer-component';
@@ -16,14 +17,15 @@ export * from './src/types';
 export {
     FDesignerCanvas,
     canvasChanged,
+    refreshCanvas,
     setPositionForSelectedElement,
     setPositionOfButtonGroup,
     setPositionOfSelectedComponentBtnGroup,
     FDesignerItem,
-    DgControl, 
-    UseDesignerRules, 
-    DesignerHostService, 
-    DesignerHTMLElement, 
-    DraggingResolveContext, 
+    DgControl,
+    UseDesignerRules,
+    DesignerHostService,
+    DesignerHTMLElement,
+    DraggingResolveContext,
     FDesignerInnerItem
 };
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 c376d9e5a05..22e5b011ad5 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,5 +1,5 @@
 import { ExtractPropTypes } from 'vue';
-import { createPropsResolver } from '../../dynamic-resolver';
+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';
diff --git a/packages/ui-vue/components/dynamic-resolver/index.ts b/packages/ui-vue/components/dynamic-resolver/index.ts
index 2500f1c640b..e2e5e17f374 100644
--- a/packages/ui-vue/components/dynamic-resolver/index.ts
+++ b/packages/ui-vue/components/dynamic-resolver/index.ts
@@ -10,4 +10,5 @@ export * from './src/visible-prop-resolver';
 export * from './src/event-handler-resolver';
 export * from './src/schema-resolver';
 export * from './src/update-columns-resolver';
-export { propertyConfigSchemaMap } from './src/property-config-resolver';
+export * from './src/property-config-resolver';
+export { propertyConfigSchemaMap } from './src/property-config-resolver';
\ No newline at end of file
diff --git a/packages/ui-vue/components/dynamic-view/src/callback-deliver.ts b/packages/ui-vue/components/dynamic-view/src/callback-deliver.ts
index 77070fdc522..547241e14bc 100644
--- a/packages/ui-vue/components/dynamic-view/src/callback-deliver.ts
+++ b/packages/ui-vue/components/dynamic-view/src/callback-deliver.ts
@@ -1,4 +1,4 @@
-import { Caller } from "../../dynamic-resolver";
+import { Caller } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function createCallbackDeliver(callback: (type: string, args: any[]) => any): Caller {
     function call(methodName: string, payloads: any[]): any {
diff --git a/packages/ui-vue/components/dynamic-view/src/dynamic-view.component.tsx b/packages/ui-vue/components/dynamic-view/src/dynamic-view.component.tsx
index f654b4c4120..b3ac431f090 100644
--- a/packages/ui-vue/components/dynamic-view/src/dynamic-view.component.tsx
+++ b/packages/ui-vue/components/dynamic-view/src/dynamic-view.component.tsx
@@ -4,7 +4,7 @@ import { SetupContext, defineComponent, ref, watch, inject, createVNode, VNode,
 import { cloneDeep, merge, mergeWith } from 'lodash-es';
 import { dynamicViewProps, DynamicViewProps } from './dynamic-view.props';
 import { componentMap, componentPropsConverter, loadRegister, resolverMap } from './components/maps';
-import { createEventsResolver, createFormBindingResolver, EditorResolver, SelectionItemResolver, UpdateColumnsResolver } from '../../dynamic-resolver';
+import { createEventsResolver, createFormBindingResolver, EditorResolver, SelectionItemResolver, UpdateColumnsResolver } from '@farris/ui-vue/components/dynamic-resolver';
 import { createEventDispatcher } from './event-dispatcher';
 import { useComponentManager } from './composition/use-component-manager';
 import { useBindingData } from './composition/use-binding-data';
diff --git a/packages/ui-vue/components/dynamic-view/src/event-dispatcher.ts b/packages/ui-vue/components/dynamic-view/src/event-dispatcher.ts
index 058df419d88..6c0e833fb66 100644
--- a/packages/ui-vue/components/dynamic-view/src/event-dispatcher.ts
+++ b/packages/ui-vue/components/dynamic-view/src/event-dispatcher.ts
@@ -1,6 +1,6 @@
 
 import { SetupContext } from "vue";
-import { EventDispatcher } from "../../dynamic-resolver";
+import { EventDispatcher } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function createEventDispatcher(context: SetupContext, schema: Record<string, any>): EventDispatcher {
     function dispatch(token: string, eventName: string, type: string, payloads: any[]) {
diff --git a/packages/ui-vue/components/events-editor/src/events-editor.props.ts b/packages/ui-vue/components/events-editor/src/events-editor.props.ts
index 9f255bbfd14..e595480523b 100644
--- a/packages/ui-vue/components/events-editor/src/events-editor.props.ts
+++ b/packages/ui-vue/components/events-editor/src/events-editor.props.ts
@@ -1,6 +1,6 @@
 import { ExtractPropTypes, PropType } from "vue";
 import { InternalCommand } from "./types";
-import { createPropsResolver } from "../../dynamic-resolver/src/props-resolver";
+import { createPropsResolver } from "@farris/ui-vue/components/dynamic-resolver";
 import { schemaMapper } from './schema/schema-mapper';
 import { schemaResolver } from './schema/schema-resolver';
 import eventsEditorSchema from './schema/events-editor.schema.json';
diff --git a/packages/ui-vue/components/expression-editor/src/expression-textbox.props.ts b/packages/ui-vue/components/expression-editor/src/expression-textbox.props.ts
index afde95bc56b..2546e7ac42b 100644
--- a/packages/ui-vue/components/expression-editor/src/expression-textbox.props.ts
+++ b/packages/ui-vue/components/expression-editor/src/expression-textbox.props.ts
@@ -1,6 +1,6 @@
 import { ExtractPropTypes, PropType } from "vue";
 
-import { createPropsResolver } from '../../dynamic-resolver';
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
 
 import schema from './schema/expression-editor.schema.json';
 import { DisabledFunction, ExpressionBeforeSubmitResult } from "./composition/types";
diff --git a/packages/ui-vue/components/fieldset/src/fieldset.props.ts b/packages/ui-vue/components/fieldset/src/fieldset.props.ts
index 03323c18298..4a7e3696f1d 100644
--- a/packages/ui-vue/components/fieldset/src/fieldset.props.ts
+++ b/packages/ui-vue/components/fieldset/src/fieldset.props.ts
@@ -1,6 +1,6 @@
 
 import { ExtractPropTypes } from "vue";
-import { createPropsResolver } from "../../dynamic-resolver";
+import { createPropsResolver } from "@farris/ui-vue/components/dynamic-resolver";
 import { schemaMapper } from "./schema/schema-mapper";
 import fieldsetSchema from './schema/fieldset.schema.json';
 import { schemaResolver } from './schema/schema-resolver';
diff --git a/packages/ui-vue/components/filter-bar/src/designer/filter-bar-config/composition/use-filterbar-rules.ts b/packages/ui-vue/components/filter-bar/src/designer/filter-bar-config/composition/use-filterbar-rules.ts
index 881cda0f170..a9a8ddc3a23 100644
--- a/packages/ui-vue/components/filter-bar/src/designer/filter-bar-config/composition/use-filterbar-rules.ts
+++ b/packages/ui-vue/components/filter-bar/src/designer/filter-bar-config/composition/use-filterbar-rules.ts
@@ -1,5 +1,5 @@
 import { UseDesignerRules } from "@farris/ui-vue/components/designer-canvas/";
-import { ComponentSchema, DesignerComponentInstance, DesignerItemContext } from "../../../../../designer-canvas/src/types";
+import { ComponentSchema, DesignerComponentInstance, DesignerItemContext } from "@farris/ui-vue/components/designer-canvas";
 import { FilterBarPropertyConfig } from "../../../property-config/filter-bar.property-config";;
 
 export function useFilterBarDesignerRules(designItemContext: DesignerItemContext, designerHostService): UseDesignerRules {
diff --git a/packages/ui-vue/components/filter-bar/src/filter-bar.props.ts b/packages/ui-vue/components/filter-bar/src/filter-bar.props.ts
index bab437b2a0d..df23f5d1c2b 100644
--- a/packages/ui-vue/components/filter-bar/src/filter-bar.props.ts
+++ b/packages/ui-vue/components/filter-bar/src/filter-bar.props.ts
@@ -1,7 +1,7 @@
  
 import { ExtractPropTypes, PropType } from "vue";
 import { Condition, FieldConfig } from "./types";
-import { createPropsResolver } from "../../dynamic-resolver/src/props-resolver";
+import { createPropsResolver } from "@farris/ui-vue/components/dynamic-resolver";
 import { schemaMapper } from './schema/schema-mapper';
 import { schemaResolver } from './schema/schema-resolver';
 import filterBarSchema from './schema/filter-bar.schema.json';
diff --git a/packages/ui-vue/components/filter-condition-editor/src/filter-condition-editor.props.ts b/packages/ui-vue/components/filter-condition-editor/src/filter-condition-editor.props.ts
index 69c124fb8ce..bafd5cb1abe 100644
--- a/packages/ui-vue/components/filter-condition-editor/src/filter-condition-editor.props.ts
+++ b/packages/ui-vue/components/filter-condition-editor/src/filter-condition-editor.props.ts
@@ -1,5 +1,5 @@
 import { ExtractPropTypes, PropType } from "vue";
-import { createPropsResolver } from "../../dynamic-resolver";
+import { createPropsResolver } from "@farris/ui-vue/components/dynamic-resolver";
 import schema from './schema/filter-condition-editor.json';
 import { ExpressionOptions } from "./composition/types";
 
diff --git a/packages/ui-vue/components/html-template/src/html-template.props.ts b/packages/ui-vue/components/html-template/src/html-template.props.ts
index acd0d17086d..10e199333da 100644
--- a/packages/ui-vue/components/html-template/src/html-template.props.ts
+++ b/packages/ui-vue/components/html-template/src/html-template.props.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { ExtractPropTypes, PropType, RenderFunction } from 'vue';
-import { createPropsResolver } from "../../dynamic-resolver";
+import { createPropsResolver } from "@farris/ui-vue/components/dynamic-resolver";
 import htmlTemplateSchema from './schema/html-template.schema.json';
 import { schemaMapper } from './schema/schema-mapper';
 import { schemaResolver } from './schema/schema-resolver';
diff --git a/packages/ui-vue/components/image-cropper/src/image-cropper.props.ts b/packages/ui-vue/components/image-cropper/src/image-cropper.props.ts
index 142d9a27baa..e261fe9a1bd 100644
--- a/packages/ui-vue/components/image-cropper/src/image-cropper.props.ts
+++ b/packages/ui-vue/components/image-cropper/src/image-cropper.props.ts
@@ -16,7 +16,7 @@
  */
 import { ExtractPropTypes, PropType } from 'vue';
 import { ImageTransform, CropperPosition } from './composition/type';
-import { createPropsResolver } from '../../dynamic-resolver';
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
 import { schemaResolver } from './schema/schema-resolver';
 import { schemaMapper } from './schema/schema-mapper';
 import imageCropperSchema from './schema/image-cropper.schema.json';
diff --git a/packages/ui-vue/components/input-group/src/property-config/converter/input.converter.ts b/packages/ui-vue/components/input-group/src/property-config/converter/input.converter.ts
index 93c2b1c8bfa..4acd9e57fb8 100644
--- a/packages/ui-vue/components/input-group/src/property-config/converter/input.converter.ts
+++ b/packages/ui-vue/components/input-group/src/property-config/converter/input.converter.ts
@@ -1,4 +1,4 @@
-import { ComponentSchema } from "../../../../designer-canvas/src/types";
+import { ComponentSchema } from "@farris/ui-vue/components/designer-canvas";
 import { PropertyConverter, SchemaService } from "@farris/ui-vue/components/dynamic-resolver";
 
 const inputFormatValidationTypes = [
diff --git a/packages/ui-vue/components/json-editor/src/json-editor.props.ts b/packages/ui-vue/components/json-editor/src/json-editor.props.ts
index 49ab61a5d0e..34773db0570 100644
--- a/packages/ui-vue/components/json-editor/src/json-editor.props.ts
+++ b/packages/ui-vue/components/json-editor/src/json-editor.props.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { ExtractPropTypes, PropType } from 'vue';
-import { createPropsResolver } from "../../dynamic-resolver";
+import { createPropsResolver } from "@farris/ui-vue/components/dynamic-resolver";
 import JsonEditorSchema from './schema/json-editor.schema.json';
 import { schemaMapper } from './schema/schema-mapper';
 import { schemaResolver } from './schema/schema-resolver';
diff --git a/packages/ui-vue/components/layout/src/layout.props.ts b/packages/ui-vue/components/layout/src/layout.props.ts
index d80f6b57070..458baf45dea 100644
--- a/packages/ui-vue/components/layout/src/layout.props.ts
+++ b/packages/ui-vue/components/layout/src/layout.props.ts
@@ -1,6 +1,6 @@
  
 import { ExtractPropTypes } from "vue";
-import { createPropsResolver } from "../../dynamic-resolver";
+import { createPropsResolver } from "@farris/ui-vue/components/dynamic-resolver";
 import { schemaMapper } from "./schema/schema-mapper";
 import { schemaResolver } from "./schema/schema-resolver";
 import layoutSchema from './schema/layout.schema.json';
diff --git a/packages/ui-vue/components/list-nav/src/list-nav.props.ts b/packages/ui-vue/components/list-nav/src/list-nav.props.ts
index 10f0a99d931..33cabd8edec 100644
--- a/packages/ui-vue/components/list-nav/src/list-nav.props.ts
+++ b/packages/ui-vue/components/list-nav/src/list-nav.props.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 import { ExtractPropTypes, PropType } from 'vue';
-import { createPropsResolver } from '../../dynamic-resolver';
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
 import { schemaMapper } from './schema/schema-mapper';
 import { schemaResolver } from './schema/schema-resolver';
 import listNavSchema from './schema/list-nav.schema.json';
diff --git a/packages/ui-vue/components/mapping-editor/src/mapping-editor.props.ts b/packages/ui-vue/components/mapping-editor/src/mapping-editor.props.ts
index 7065c9e048e..bee7fb9d477 100644
--- a/packages/ui-vue/components/mapping-editor/src/mapping-editor.props.ts
+++ b/packages/ui-vue/components/mapping-editor/src/mapping-editor.props.ts
@@ -1,6 +1,6 @@
 import { read } from "fs";
 import { ExtractPropTypes, PropType } from "vue";
-import { createPropsResolver } from "../../dynamic-resolver";
+import { createPropsResolver } from "@farris/ui-vue/components/dynamic-resolver";
 import mappingEditorSchema from './schema/mapping-editor.schema.json';
 
 export interface MappingDataSource {
diff --git a/packages/ui-vue/components/menu-lookup/src/menu-lookup.props.ts b/packages/ui-vue/components/menu-lookup/src/menu-lookup.props.ts
index d00c84c0839..993fd8ffdd8 100644
--- a/packages/ui-vue/components/menu-lookup/src/menu-lookup.props.ts
+++ b/packages/ui-vue/components/menu-lookup/src/menu-lookup.props.ts
@@ -15,7 +15,7 @@
  */
 import { ExtractPropTypes, PropType } from 'vue';
 import { TargetType, FetchNodeApi } from './composition/types';
-import { createPropsResolver } from "../../dynamic-resolver";
+import { createPropsResolver } from "@farris/ui-vue/components/dynamic-resolver";
 import menuLookupSchema from './schema/menu-lookup.schema.json';
 import { schemaMapper } from './schema/schema-mapper';
 import { schemaResolver } from './schema/schema-resolver';
diff --git a/packages/ui-vue/components/number-range/src/number-range.props.ts b/packages/ui-vue/components/number-range/src/number-range.props.ts
index 8e8b91abe9e..ff52d80d559 100644
--- a/packages/ui-vue/components/number-range/src/number-range.props.ts
+++ b/packages/ui-vue/components/number-range/src/number-range.props.ts
@@ -16,7 +16,7 @@
  */
 import { ExtractPropTypes, PropType } from 'vue';
 import { schemaResolver } from './schema/schema-resolver';
-import { createPropsResolver } from '../../dynamic-resolver';
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
 import { schemaMapper } from './schema/schema-mapper';
 import numberRangeSchema from './schema/number-range.schema.json';
 
diff --git a/packages/ui-vue/components/order/src/order.props.ts b/packages/ui-vue/components/order/src/order.props.ts
index 360ab36e7a2..c89f01d765b 100644
--- a/packages/ui-vue/components/order/src/order.props.ts
+++ b/packages/ui-vue/components/order/src/order.props.ts
@@ -1,5 +1,5 @@
 import { ExtractPropTypes } from 'vue';
-import { createPropsResolver } from '../../dynamic-resolver/src/props-resolver';
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
 import { schemaMapper } from './schema/schema-mapper';
 import orderSchema from './schema/order.schema.json';
 import { schemaResolver } from './schema/schema-resolver';
diff --git a/packages/ui-vue/components/page-footer/src/page-footer.props.ts b/packages/ui-vue/components/page-footer/src/page-footer.props.ts
index ca48fcfdf40..c1dbf6a0b71 100644
--- a/packages/ui-vue/components/page-footer/src/page-footer.props.ts
+++ b/packages/ui-vue/components/page-footer/src/page-footer.props.ts
@@ -1,6 +1,6 @@
  
 import { ExtractPropTypes } from 'vue';
-import { createPropsResolver } from '../../dynamic-resolver';
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
 import { schemaMapper } from './schema/schema-mapper';
 import pageFooterSchema from './schema/page-footer.schema.json';
 import { schemaResolver } from './schema/schema-resolver';
diff --git a/packages/ui-vue/components/page-header/src/page-header.props.ts b/packages/ui-vue/components/page-header/src/page-header.props.ts
index 8aa61ab0314..fce62efec6e 100644
--- a/packages/ui-vue/components/page-header/src/page-header.props.ts
+++ b/packages/ui-vue/components/page-header/src/page-header.props.ts
@@ -1,6 +1,6 @@
 
 import { ExtractPropTypes } from "vue";
-import { createPageHeaderEventHandlerResolver, createPropsResolver } from "../../dynamic-resolver";
+import { createPageHeaderEventHandlerResolver, createPropsResolver } from "@farris/ui-vue/components/dynamic-resolver";
 import { schemaMapper } from "./schema/schema-mapper";
 import pageHeaderSchema from './schema/page-header.schema.json';
 // import pageHeaderPropertyConfig from './property-config/page-header.property-config.json';
diff --git a/packages/ui-vue/components/pagination/src/pagination.props.ts b/packages/ui-vue/components/pagination/src/pagination.props.ts
index 2ac62eb901b..63d8a775653 100644
--- a/packages/ui-vue/components/pagination/src/pagination.props.ts
+++ b/packages/ui-vue/components/pagination/src/pagination.props.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 import { ExtractPropTypes, PropType } from 'vue';
-import { createPropsResolver } from "../../dynamic-resolver";
+import { createPropsResolver } from "@farris/ui-vue/components/dynamic-resolver";
 import { schemaMapper } from "./schema/schema-mapper";
 import paginationSchema from './schema/pagination.schema.json';
 import propertyConfig from './property-config/pagination.property-config.json';
diff --git a/packages/ui-vue/components/progress/src/progress.props.ts b/packages/ui-vue/components/progress/src/progress.props.ts
index e9dd81bde4c..f78cc1723f4 100644
--- a/packages/ui-vue/components/progress/src/progress.props.ts
+++ b/packages/ui-vue/components/progress/src/progress.props.ts
@@ -1,7 +1,7 @@
  
  
 import { ExtractPropTypes, PropType } from 'vue';
-import { createPropsResolver } from '../../dynamic-resolver';
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
 import { schemaMapper } from './schema/schema-mapper';
 import { schemaResolver } from './schema/schema-resolver';
 import progressSchema from './schema/progress.schema.json';
diff --git a/packages/ui-vue/components/property-editor/src/property-editor.props.ts b/packages/ui-vue/components/property-editor/src/property-editor.props.ts
index 9ba44286bef..8f96bba4fe0 100644
--- a/packages/ui-vue/components/property-editor/src/property-editor.props.ts
+++ b/packages/ui-vue/components/property-editor/src/property-editor.props.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 import { ExtractPropTypes } from 'vue';
-import { createPropsResolver } from '../../dynamic-resolver/src/props-resolver';
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
 import { schemaMapper } from './schema/schema-mapper';
 import { schemaResolver } from './schema/schema-resolver';
 import propertyEditorSchema from './schema/property-editor.schema.json';
diff --git a/packages/ui-vue/components/property-panel/src/composition/entity/base-property.ts b/packages/ui-vue/components/property-panel/src/composition/entity/base-property.ts
index 82749a19d04..8d0f2f4a717 100644
--- a/packages/ui-vue/components/property-panel/src/composition/entity/base-property.ts
+++ b/packages/ui-vue/components/property-panel/src/composition/entity/base-property.ts
@@ -1,8 +1,6 @@
 import { DesignerComponentInstance } from "@farris/ui-vue/components/designer-canvas";
-import { DgControl } from "../../../../designer-canvas/src/composition/dg-control";
+import { DgControl, refreshCanvas, canvasChanged } from "@farris/ui-vue/components/designer-canvas";
 import { cloneDeep } from "lodash-es";
-import { refreshCanvas } from "../../../../designer-canvas/src/composition/update-cancas";
-import { canvasChanged } from "../../../../designer-canvas/src/composition/designer-canvas-changed";
 import { PropertyChangeObject } from "./property-entity";
 import { usePropertyEditor } from "../../../../property-editor/src/composition/use-property-editor";
 import { ExpressionProperty } from "./expression-property";
diff --git a/packages/ui-vue/components/property-panel/src/composition/entity/input-base-property.ts b/packages/ui-vue/components/property-panel/src/composition/entity/input-base-property.ts
index 527b5726430..0899afddcdc 100644
--- a/packages/ui-vue/components/property-panel/src/composition/entity/input-base-property.ts
+++ b/packages/ui-vue/components/property-panel/src/composition/entity/input-base-property.ts
@@ -1,16 +1,15 @@
 
 import { BaseControlProperty } from "./base-property";
 import { SchemaDOMMapping } from './schema-dom-mapping';
-import { canvasChanged } from '../../../../designer-canvas/src/composition/designer-canvas-changed';
-import { DesignerComponentInstance } from "../../../../designer-canvas/src/types";
-import { ElementPropertyConfig, FormBindingType, FormPropertyChangeObject, FormUnifiedColumnLayout } from "../type";
+import { canvasChanged, DesignerComponentInstance } from '@farris/ui-vue/components/designer-canvas';
+import { FormBindingType, FormPropertyChangeObject, FormUnifiedColumnLayout } from "../type";
 import {
     ResponseFormLayoutContext,
     UseResponseLayoutEditorSetting,
 } from "@farris/ui-vue/components/response-layout-editor";
 import { useResponseLayoutEditorSetting } from "../../../../response-layout-editor/src/composition/converter/use-response-layout-editor-setting";
 import { FormSchemaEntityField$Type, FormSchemaEntityFieldType$Type, FormVariable } from "@farris/ui-vue/components/common";
-import { DgControl } from "../../../../designer-canvas";
+import { DgControl } from "@farris/ui-vue/components/designer-canvas";
 import { ExpressionProperty } from "./expression-property";
 
 export class InputBaseProperty extends BaseControlProperty {
diff --git a/packages/ui-vue/components/property-panel/src/composition/entity/schema-dom-mapping.ts b/packages/ui-vue/components/property-panel/src/composition/entity/schema-dom-mapping.ts
index 7900e2ea6a1..99f60e8a3ec 100644
--- a/packages/ui-vue/components/property-panel/src/composition/entity/schema-dom-mapping.ts
+++ b/packages/ui-vue/components/property-panel/src/composition/entity/schema-dom-mapping.ts
@@ -1,5 +1,5 @@
 
-import { DgControl } from "../../../../designer-canvas/src/composition/dg-control";
+import { DgControl } from "@farris/ui-vue/components/designer-canvas";
 import { FormPropertyChangeObject } from "./property-entity";
 
 export class SchemaDOMMapping {
diff --git a/packages/ui-vue/components/property-panel/src/composition/entity/use-input-rules.ts b/packages/ui-vue/components/property-panel/src/composition/entity/use-input-rules.ts
index dda534127e2..c6b74119d4e 100644
--- a/packages/ui-vue/components/property-panel/src/composition/entity/use-input-rules.ts
+++ b/packages/ui-vue/components/property-panel/src/composition/entity/use-input-rules.ts
@@ -1,7 +1,7 @@
  
 import { ref } from "vue";
 import { DesignerItemContext, ComponentSchema, } from '@farris/ui-vue/components/designer-canvas';
-import { DesignerHTMLElement, DraggingResolveContext, UseDesignerRules } from '../../../../designer-canvas/src/composition/types';
+import { DesignerHTMLElement, DraggingResolveContext, UseDesignerRules } from '@farris/ui-vue/components/designer-canvas';
 
 export function useInputDesignerRules(designItemContext: DesignerItemContext, designerHostService): UseDesignerRules {
     const schema = designItemContext.schema as ComponentSchema;
diff --git a/packages/ui-vue/components/property-panel/src/property-panel.component.tsx b/packages/ui-vue/components/property-panel/src/property-panel.component.tsx
index 9b4131f398b..d37e4904f92 100644
--- a/packages/ui-vue/components/property-panel/src/property-panel.component.tsx
+++ b/packages/ui-vue/components/property-panel/src/property-panel.component.tsx
@@ -17,8 +17,8 @@
  */
 import { defineComponent, SetupContext, ref, watch, onMounted, onBeforeMount, inject, nextTick } from 'vue';
 import { PropertyPanelProps, propertyPanelProps } from './composition/props/property-panel.props';
-import { getPropertyConfigBySchema } from '../../dynamic-resolver/src/property-config-resolver';
-import { SchemaService } from '../../dynamic-resolver';
+import { getPropertyConfigBySchema } from '@farris/ui-vue/components/dynamic-resolver';
+import { SchemaService } from '@farris/ui-vue/components/dynamic-resolver';
 import FPropertyPanelItemList from '../src/component/property-panel-item-list.component';
 
 import './composition/class/property-panel.css';
diff --git a/packages/ui-vue/components/query-solution/src/designer/query-solution-config/composition/use-querysolution-rules.ts b/packages/ui-vue/components/query-solution/src/designer/query-solution-config/composition/use-querysolution-rules.ts
index 97830c11f32..578818962cb 100644
--- a/packages/ui-vue/components/query-solution/src/designer/query-solution-config/composition/use-querysolution-rules.ts
+++ b/packages/ui-vue/components/query-solution/src/designer/query-solution-config/composition/use-querysolution-rules.ts
@@ -1,5 +1,5 @@
 import { UseDesignerRules } from "@farris/ui-vue/components/designer-canvas/";
-import { ComponentSchema, DesignerComponentInstance, DesignerItemContext } from "../../../../../designer-canvas/src/types";
+import { ComponentSchema, DesignerComponentInstance, DesignerItemContext } from "@farris/ui-vue/components/designer-canvas";
 import { QuerySolutionPropertyConfig } from "../../../property-config/query-solution.property-config";;
 
 export function useQuerysolutionDesignerRules(designItemContext: DesignerItemContext, designerHostService): UseDesignerRules {
diff --git a/packages/ui-vue/components/radio-button/src/radio-button.props.ts b/packages/ui-vue/components/radio-button/src/radio-button.props.ts
index 10f8f38f76b..bec83a7b36f 100644
--- a/packages/ui-vue/components/radio-button/src/radio-button.props.ts
+++ b/packages/ui-vue/components/radio-button/src/radio-button.props.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 import { ExtractPropTypes, PropType } from 'vue';
-import { createPropsResolver } from '../../dynamic-resolver/src/props-resolver';
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
 import { schemaMapper } from './schema/schema-mapper';
 import { schemaResolver } from './schema/schema-resolver';
 import radioButtonSchema from './schema/radio-button.schema.json';
diff --git a/packages/ui-vue/components/rate/src/rate.props.ts b/packages/ui-vue/components/rate/src/rate.props.ts
index a10474f5643..c179016d1e0 100644
--- a/packages/ui-vue/components/rate/src/rate.props.ts
+++ b/packages/ui-vue/components/rate/src/rate.props.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { ExtractPropTypes, PropType } from 'vue';
-import { createPropsResolver } from '../../dynamic-resolver/src/props-resolver';
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
 import { schemaMapper } from './schema/schema-mapper';
 import { schemaResolver } from './schema/schema-resolver';
 import rateSchema from './schema/rate.schema.json';
diff --git a/packages/ui-vue/components/schema-selector/src/schema-selector-editor.props.ts b/packages/ui-vue/components/schema-selector/src/schema-selector-editor.props.ts
index 67d954e85bf..fe00dca2aa1 100644
--- a/packages/ui-vue/components/schema-selector/src/schema-selector-editor.props.ts
+++ b/packages/ui-vue/components/schema-selector/src/schema-selector-editor.props.ts
@@ -1,5 +1,5 @@
 import { ExtractPropTypes, PropType } from "vue";
-import { createPropsResolver } from "../../dynamic-resolver";
+import { createPropsResolver } from "@farris/ui-vue/components/dynamic-resolver";
 import { ViewOption } from "./schema-selector.props";
 import schemaSelectorEditorSchema from './schema/schema-editor.schema.json';
 
diff --git a/packages/ui-vue/components/search-box/src/search-box.props.ts b/packages/ui-vue/components/search-box/src/search-box.props.ts
index a732dce5764..9f1efd11008 100644
--- a/packages/ui-vue/components/search-box/src/search-box.props.ts
+++ b/packages/ui-vue/components/search-box/src/search-box.props.ts
@@ -1,6 +1,6 @@
  
 import { ExtractPropTypes, PropType } from "vue";
-import { createPropsResolver } from "../../dynamic-resolver";
+import { createPropsResolver } from "@farris/ui-vue/components/dynamic-resolver";
 import { schemaMapper } from "./schema/schema-mapper";
 import searchBoxSchema from './schema/search-box.schema.json';
 import { schemaResolver } from './schema/schema-resolver';
diff --git a/packages/ui-vue/components/smoke-detector/src/smoke-detector.props.ts b/packages/ui-vue/components/smoke-detector/src/smoke-detector.props.ts
index 900abaf4210..49e5faf9c18 100644
--- a/packages/ui-vue/components/smoke-detector/src/smoke-detector.props.ts
+++ b/packages/ui-vue/components/smoke-detector/src/smoke-detector.props.ts
@@ -1,6 +1,6 @@
  
 import { ExtractPropTypes, PropType } from 'vue';
-import { createPropsResolver } from '../../dynamic-resolver';
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
 import { schemaMapper } from './schema/schema-mapper';
 import { schemaResolver } from './schema/schema-resolver';
 import smokeDetectorSchema from './schema/smoke-detector.schema.json';
diff --git a/packages/ui-vue/components/sort-condition-editor/src/sort-condition-editor.props.ts b/packages/ui-vue/components/sort-condition-editor/src/sort-condition-editor.props.ts
index b4bda7507ce..41c2faafd41 100644
--- a/packages/ui-vue/components/sort-condition-editor/src/sort-condition-editor.props.ts
+++ b/packages/ui-vue/components/sort-condition-editor/src/sort-condition-editor.props.ts
@@ -1,5 +1,5 @@
 import { ExtractPropTypes, PropType } from "vue";
-import { createPropsResolver } from "../../dynamic-resolver";
+import { createPropsResolver } from "@farris/ui-vue/components/dynamic-resolver";
 import schema from './schema/sort-editor.json';
 
 export type BeforeOpenFunction = (...params: any) => Promise<{ fields: any, conditions: any }>;
diff --git a/packages/ui-vue/components/spacing-editor/src/spacing-editor.props.ts b/packages/ui-vue/components/spacing-editor/src/spacing-editor.props.ts
index 9d8968001d7..7ffba918c27 100644
--- a/packages/ui-vue/components/spacing-editor/src/spacing-editor.props.ts
+++ b/packages/ui-vue/components/spacing-editor/src/spacing-editor.props.ts
@@ -1,6 +1,6 @@
  
 import { ExtractPropTypes, PropType } from "vue";
-import { createPropsResolver } from "../../dynamic-resolver";
+import { createPropsResolver } from "@farris/ui-vue/components/dynamic-resolver";
 // import { schemaMapper } from "./schema/schema-mapper";
 // import spacingEditorSchema from './schema/spacing-editor.schema.json';
 // import { schemaResolver } from './schema/schema-resolver';
diff --git a/packages/ui-vue/components/splitter/src/splitter.props.ts b/packages/ui-vue/components/splitter/src/splitter.props.ts
index 74d18f9a892..6cc1d21ce6d 100644
--- a/packages/ui-vue/components/splitter/src/splitter.props.ts
+++ b/packages/ui-vue/components/splitter/src/splitter.props.ts
@@ -1,6 +1,6 @@
  
 import { ExtractPropTypes, PropType } from "vue";
-import { createPropsResolver } from "../../dynamic-resolver";
+import { createPropsResolver } from "@farris/ui-vue/components/dynamic-resolver";
 import { splitterSchemaMapper } from "./schema/splitter-schema-mapper";
 import { schemaResolver } from './schema/splitter-schema-resolver';
 import splitterSchema from './schema/splitter.schema.json';
diff --git a/packages/ui-vue/components/step/src/step.props.ts b/packages/ui-vue/components/step/src/step.props.ts
index e8a424e2cd5..9f4431e39a2 100644
--- a/packages/ui-vue/components/step/src/step.props.ts
+++ b/packages/ui-vue/components/step/src/step.props.ts
@@ -1,5 +1,5 @@
 import { ExtractPropTypes, PropType } from 'vue';
-import { createPropsResolver } from '../../dynamic-resolver';
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
 import { schemaMapper } from './schema/schema-mapper';
 import { schemaResolver } from './schema/schema-resolver';
 import stepSchema from './schema/step.schema.json';
diff --git a/packages/ui-vue/components/text/src/text.props.ts b/packages/ui-vue/components/text/src/text.props.ts
index a24630fe30e..f6f11439227 100644
--- a/packages/ui-vue/components/text/src/text.props.ts
+++ b/packages/ui-vue/components/text/src/text.props.ts
@@ -17,7 +17,7 @@ import { ExtractPropTypes, PropType } from 'vue';
 import { schemaMapper } from './schema/schema-mapper';
 import { schemaResolver } from './schema/schema-resolver';
 import propertyConfig from './property-config/text.property-config.json';
-import { createPropsResolver } from '../../dynamic-resolver/src/props-resolver';
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
 import textSchema from './schema/text.schema.json';
 import { TextType, FormNumberOptions, TextAlignment } from './composition/types';
 
diff --git a/packages/ui-vue/components/transfer/src/transfer.props.ts b/packages/ui-vue/components/transfer/src/transfer.props.ts
index a1d66f963ca..e741765f6fb 100644
--- a/packages/ui-vue/components/transfer/src/transfer.props.ts
+++ b/packages/ui-vue/components/transfer/src/transfer.props.ts
@@ -4,7 +4,7 @@ import { DataColumn, RowOptions } from "@farris/ui-vue/components/data-view";
 import { schemaMapper } from './schema/schema-mapper';
 import { schemaResolver } from './schema/schema-resolver';
 import propertyConfig from './property-config/transfer.property-config.json';
-import { createPropsResolver } from '../../dynamic-resolver/src/props-resolver';
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
 import transferSchema from './schema/transfer.schema.json';
 
 export const transferProps = {
diff --git a/packages/ui-vue/components/tree-view/src/tree-view.props.ts b/packages/ui-vue/components/tree-view/src/tree-view.props.ts
index 7b3f3a6d204..9dcc870dcf3 100644
--- a/packages/ui-vue/components/tree-view/src/tree-view.props.ts
+++ b/packages/ui-vue/components/tree-view/src/tree-view.props.ts
@@ -2,7 +2,7 @@
 import { ExtractPropTypes, PropType } from 'vue';
 import { schemaMapper } from './schema/schema-mapper';
 import { schemaResolver } from './schema/schema-resolver';
-import { createPropsResolver } from '../../dynamic-resolver/src/props-resolver';
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
 import { DataColumn, HierarchyOptions, RowNumberOptions, RowOptions, SelectionOptions } from '../../data-view';
 import propertyConfig from './property-config/tree-view.property-config.json';
 import treeViewSchema from './schema/tree-view.schema.json';
diff --git a/packages/ui-vue/components/uploader/src/uploader.props.ts b/packages/ui-vue/components/uploader/src/uploader.props.ts
index f3a3f25fb0d..d23c82e1257 100644
--- a/packages/ui-vue/components/uploader/src/uploader.props.ts
+++ b/packages/ui-vue/components/uploader/src/uploader.props.ts
@@ -1,6 +1,6 @@
 import { ExtractPropTypes, PropType } from 'vue';
 import { FUploadFileExtend, FUploadPreviewColumn, UploaderOptions } from './composition/type';
-import { createPropsResolver } from '../../dynamic-resolver/src/props-resolver';
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
 import { StepProps } from '../../step/src/step.props';
 import uploaderSchema from './schema/uploader.schema.json';
 import { schemaMapper } from './schema/schema-mapper';
diff --git a/packages/ui-vue/components/verify-detail/src/verify-detail.props.ts b/packages/ui-vue/components/verify-detail/src/verify-detail.props.ts
index 78ddf51bd5e..ccc0124e09f 100644
--- a/packages/ui-vue/components/verify-detail/src/verify-detail.props.ts
+++ b/packages/ui-vue/components/verify-detail/src/verify-detail.props.ts
@@ -1,5 +1,5 @@
 import { ExtractPropTypes, PropType } from 'vue';
-import { createPropsResolver } from '../../dynamic-resolver/src/props-resolver';
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
 import { schemaMapper } from './schema/schema-mapper';
 import { schemaResolver } from './schema/schema-resolver';
 import verifyDetailSchema from './schema/verify-detail.schema.json';
-- 
Gitee


From c6a20e9dc35fedab743069d376205b875253a15f Mon Sep 17 00:00:00 2001
From: hyygzds <m15966339253@163.com>
Date: Fri, 8 Aug 2025 11:31:33 +0800
Subject: [PATCH 57/62] fix: split denpendency designer canvas of all
 components

---
 .../components/avatar/src/designer/use-rules.ts    |  3 +--
 .../src/designer/calendar.design.component.tsx     |  3 +--
 .../src/designer/capsule.design.component.tsx      |  3 +--
 .../src/designer/color-picker.design.component.tsx |  3 +--
 .../src/composition/field-tree-builder.ts          |  2 +-
 .../src/composition/inner-component-build-info.ts  |  2 +-
 .../src/composition/use-sibling-component.tsx      |  3 +--
 .../src/composition/use-split-component.tsx        |  4 +---
 .../src/designer/component.design.component.tsx    |  6 ++----
 .../component/src/designer/use-designer-rules.ts   |  4 +---
 .../content-container.design.component.tsx         |  6 ++----
 .../src/designer/use-designer-rules.ts             |  9 ++++-----
 .../data-grid-component-creator.service.ts         |  9 +++------
 .../designer/column-header.design.component.tsx    |  3 +--
 .../designer/data-grid-column.design.component.tsx |  3 +--
 .../src/designer/data-grid.design.component.tsx    |  5 +----
 .../data-grid/src/designer/use-column-rules.ts     |  3 +--
 .../data-grid/src/designer/use-designer-rules.ts   |  3 +--
 .../data-grid-column.property-config.ts            |  2 +-
 .../data-grid/src/schema/schema-resolver.ts        |  5 ++---
 .../src/composition/use-outline-node.ts            |  4 +---
 .../src/designer/form-group.design.component.tsx   |  3 +--
 .../designer/response-form-use-designer-rules.ts   |  3 +--
 .../designer/response-form.design.component.tsx    |  4 +---
 .../response-form.property-config.ts               |  2 +-
 .../src/schema/response-form-schema-resolver.ts    |  4 ++--
 .../entity-binding-selector.component.tsx          |  2 +-
 .../src/designer/fieldset.design.component.tsx     |  2 --
 .../property-config/filter-bar.property-config.ts  |  2 +-
 .../src/components/flow-node-item.component.tsx    |  2 +-
 .../designer/html-template.design.component.tsx    |  3 +--
 .../src/designer/use-designer-rules.ts             |  3 +--
 .../designer/image-cropper.design.component.tsx    |  3 +--
 .../src/designer/layout-pane-use-designer-rules.ts |  4 +---
 .../src/designer/layout-pane.design.component.tsx  |  4 +---
 .../src/designer/layout-use-designer-rules.ts      |  3 +--
 .../src/designer/layout.design.component.tsx       |  3 +--
 .../src/designer/list-nav.design.component.tsx     |  4 +---
 .../list-nav/src/designer/use-designer-rules.ts    |  5 +----
 .../src/designer/number-range.design.component.tsx |  3 +--
 .../number-range/src/designer/use-design-rules.ts  |  3 +--
 .../src/composition/use-design-rules.ts            |  3 +--
 .../designer/number-spinner.design.component.tsx   |  3 +--
 .../order/src/designer/order.design.component.tsx  |  3 +--
 .../src/designer/page-footer.design.component.tsx  |  5 ++---
 .../src/designer/page-header.design.component.tsx  |  4 +---
 .../page-header/src/designer/use-designer-rules.ts |  3 +--
 .../src/designer/pagination.design.components.tsx  |  3 +--
 .../src/designer/progress.design.component.tsx     |  6 ++----
 .../query-solution/src/schema/schema-resolver.ts   |  2 +-
 .../src/designer/radio-button.design.component.tsx |  4 +---
 .../src/designer/radio-group.design.component.tsx  |  3 +--
 .../radio-group/src/designer/use-design-rules.ts   |  3 +--
 .../rate/src/designer/rate.design.component.tsx    |  3 +--
 ...onse-layout-editor-setting.design.component.tsx |  4 +---
 .../src/schema/schema-resolver.ts                  |  2 +-
 .../src/composition/use-toolbar-item-design.tsx    |  3 +--
 .../src/designer/search-box.design.component.tsx   |  5 ++---
 .../designer/smoke-detector.design.component.tsx   |  3 +--
 .../designer/splitter-pane-use-designer-rules.ts   | 14 ++++++++------
 .../designer/splitter-pane.design.component.tsx    |  6 ++----
 .../src/designer/splitter-use-designer-rules.ts    |  4 +---
 .../src/designer/splitter.design.component.tsx     |  8 +++-----
 .../src/schema/splitter-schema-resolver.ts         |  2 +-
 .../step/src/designer/step.design.component.tsx    |  3 +--
 .../tags/src/designer/tags.design.component.tsx    |  3 +--
 .../text/src/designer/text.design.component.tsx    |  3 +--
 .../time-picker/src/designer/use-design-rules.ts   |  3 +--
 .../src/designer/transfer.design.component.tsx     |  5 ++---
 .../src/designer/uploader.design.component.tsx     |  8 +++-----
 .../designer/verify-detail.design.component.tsx    |  3 +--
 71 files changed, 95 insertions(+), 176 deletions(-)

diff --git a/packages/ui-vue/components/avatar/src/designer/use-rules.ts b/packages/ui-vue/components/avatar/src/designer/use-rules.ts
index b19c36c5e4c..0996f3c78cc 100644
--- a/packages/ui-vue/components/avatar/src/designer/use-rules.ts
+++ b/packages/ui-vue/components/avatar/src/designer/use-rules.ts
@@ -1,6 +1,5 @@
  
-import { UseDesignerRules } from "../../../designer-canvas/src/composition/types";
-import { ComponentSchema, DesignerComponentInstance, DesignerItemContext } from "../../../designer-canvas/src/types";
+import { ComponentSchema, DesignerComponentInstance, DesignerItemContext, UseDesignerRules } from "@farris/ui-vue/components/designer-canvas";
 import { AvatarProperty } from "../property-config/avatar.property-config";
 
 export function useAvatarDesignerRules(designItemContext: DesignerItemContext, designerHostService): UseDesignerRules {
diff --git a/packages/ui-vue/components/calendar/src/designer/calendar.design.component.tsx b/packages/ui-vue/components/calendar/src/designer/calendar.design.component.tsx
index f51d1afc479..caf089c6b51 100644
--- a/packages/ui-vue/components/calendar/src/designer/calendar.design.component.tsx
+++ b/packages/ui-vue/components/calendar/src/designer/calendar.design.component.tsx
@@ -7,8 +7,7 @@ import { useCompare } from '../composition/use-compare';
 import { DateObject, weekDays } from '../types/common';
 import { ScheduleEvent } from '../types/schedule';
 import { defaultNameOfMonths } from '../types/month';
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
+import { DesignerItemContext, useDesignerComponent } from '@farris/ui-vue/components/designer-canvas';
 
 import FCalenderHeader from '../components/header/header.component';
 import FCalenderMonthView from '../components/month/month-view.component';
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 3c88256124e..5e111984034 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,8 +1,7 @@
 import { Ref, SetupContext, computed, defineComponent, inject, nextTick, onMounted, ref, watch } from "vue";
 import { CapsuleItem, CapsuleProps, capsuleProps } from "../capsule.props";
 import FCapsuleItem from '../capsule-item.component';
-import { DesignerItemContext } from "../../../designer-canvas/src/types";
-import { useDesignerComponent } from "../../../designer-canvas/src/composition/function/use-designer-component";
+import { DesignerItemContext, useDesignerComponent } from "@farris/ui-vue/components/designer-canvas";
 
 export default defineComponent({
     name: 'FCapsuleDesign',
diff --git a/packages/ui-vue/components/color-picker/src/designer/color-picker.design.component.tsx b/packages/ui-vue/components/color-picker/src/designer/color-picker.design.component.tsx
index 43ff463acd8..94e476ba72d 100644
--- a/packages/ui-vue/components/color-picker/src/designer/color-picker.design.component.tsx
+++ b/packages/ui-vue/components/color-picker/src/designer/color-picker.design.component.tsx
@@ -23,8 +23,7 @@ import SvPanel from '../composition/component/sv-panel';
 import Hue from '../composition/component/hue';
 import Alpha from '../composition/component/alpha';
 import Preset from '../composition/component/preset';
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
+import { DesignerItemContext, useDesignerComponent } from '@farris/ui-vue/components/designer-canvas';
 
 export default defineComponent({
     name: 'FColorPickerDesign',
diff --git a/packages/ui-vue/components/component/src/composition/field-tree-builder.ts b/packages/ui-vue/components/component/src/composition/field-tree-builder.ts
index 0ee33d3f022..cc013744280 100644
--- a/packages/ui-vue/components/component/src/composition/field-tree-builder.ts
+++ b/packages/ui-vue/components/component/src/composition/field-tree-builder.ts
@@ -1,5 +1,5 @@
 import { DesignViewModelField } from "@farris/ui-vue/components/common";
-import { DesignerHostService, DgControl } from "../../../designer-canvas";
+import { DesignerHostService, DgControl } from "@farris/ui-vue/components/designer-canvas";
 import { FormBindingType } from "../../../property-panel";
 
 
diff --git a/packages/ui-vue/components/component/src/composition/inner-component-build-info.ts b/packages/ui-vue/components/component/src/composition/inner-component-build-info.ts
index e3270aae32d..b94ea1f416b 100644
--- a/packages/ui-vue/components/component/src/composition/inner-component-build-info.ts
+++ b/packages/ui-vue/components/component/src/composition/inner-component-build-info.ts
@@ -1,5 +1,5 @@
 import { FormSchemaEntity } from "@farris/ui-vue/components/common";
-import { DesignerComponentInstance } from "../../../designer-canvas";
+import { DesignerComponentInstance } from "@farris/ui-vue/components/designer-canvas";
 
 
 export interface ComponentBuildInfo {
diff --git a/packages/ui-vue/components/component/src/composition/use-sibling-component.tsx b/packages/ui-vue/components/component/src/composition/use-sibling-component.tsx
index 54a575f789c..f25879cd1c9 100644
--- a/packages/ui-vue/components/component/src/composition/use-sibling-component.tsx
+++ b/packages/ui-vue/components/component/src/composition/use-sibling-component.tsx
@@ -1,6 +1,5 @@
 import EntityBindingSelectorComponent from "../../../entity-binding-selector/entity-binding-selector.component";
-import { DesignerHostService, DraggingResolveContext } from "../../../designer-canvas/src/composition/types";
-import { DesignerItemContext } from "../../../designer-canvas";
+import { DesignerHostService, DraggingResolveContext, DesignerItemContext } from "@farris/ui-vue/components/designer-canvas";
 import { ModalFunctions } from "../../../modal/src/composition/type";
 
 export function useSiblingComponent(designItemContext: DesignerItemContext, designerHostService?: DesignerHostService) {
diff --git a/packages/ui-vue/components/component/src/composition/use-split-component.tsx b/packages/ui-vue/components/component/src/composition/use-split-component.tsx
index ea85eb2d70b..5c7cf2f29f1 100644
--- a/packages/ui-vue/components/component/src/composition/use-split-component.tsx
+++ b/packages/ui-vue/components/component/src/composition/use-split-component.tsx
@@ -1,12 +1,10 @@
 import { ref, nextTick } from "vue";
-import { DesignerHostService } from "../../../designer-canvas/src/composition/types";
+import { DesignerHostService, canvasChanged, refreshCanvas } from "@farris/ui-vue/components/designer-canvas";
 import { ComponentSchema, DesignerItemContext, DgControl } from "@farris/ui-vue/components/designer-canvas";
 import { ModalFunctions } from "../../../modal/src/composition/type";
 import SplitterFormComponent from '../components/split-form-component.component';
 import { getSchemaByType, schemaMap } from "@farris/ui-vue/components/dynamic-resolver";
 import { useGuid } from "../../../common";
-import { canvasChanged } from "../../../designer-canvas/src/composition/designer-canvas-changed";
-import { refreshCanvas } from "../../../designer-canvas/src/composition/update-cancas";
 import { cloneDeep } from "lodash-es";
 import { FormBindingType } from "@farris/ui-vue/components/property-panel";
 
diff --git a/packages/ui-vue/components/component/src/designer/component.design.component.tsx b/packages/ui-vue/components/component/src/designer/component.design.component.tsx
index e5764d18013..2cb79e241e1 100644
--- a/packages/ui-vue/components/component/src/designer/component.design.component.tsx
+++ b/packages/ui-vue/components/component/src/designer/component.design.component.tsx
@@ -1,7 +1,5 @@
-import { DesignerHostService } from '../../../designer-canvas/src/composition/types';
-import { SetupContext, defineComponent, inject, ref, onMounted, computed } from 'vue';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
+import { DesignerHostService, DesignerItemContext, useDesignerComponent } from '@farris/ui-vue/components/designer-canvas';
+import { defineComponent, inject, ref, onMounted, computed } from 'vue';
 import { ComponentPropsType, componentProps } from '../component.props';
 import { useDesignerRules } from './use-designer-rules';
 import { getCustomClass } from '@farris/ui-vue/components/common';
diff --git a/packages/ui-vue/components/component/src/designer/use-designer-rules.ts b/packages/ui-vue/components/component/src/designer/use-designer-rules.ts
index 2bbc428dfd8..cc4e813dec4 100644
--- a/packages/ui-vue/components/component/src/designer/use-designer-rules.ts
+++ b/packages/ui-vue/components/component/src/designer/use-designer-rules.ts
@@ -1,6 +1,4 @@
-import { DesignerHostService, UseDesignerRules } from "../../../designer-canvas/src/composition/types";
-import { DesignerComponentButton, DesignerItemContext } from "../../../designer-canvas/src/types";
-import { UseTemplateDragAndDropRules } from "../../../designer-canvas/src/composition/rule/use-template-rule";
+import { DesignerHostService, UseDesignerRules, UseTemplateDragAndDropRules, DesignerComponentButton, DesignerItemContext } from "@farris/ui-vue/components/designer-canvas";
 import { ComponentProperty } from "../property-config/component.property-config";
 import { useSiblingComponent } from "../composition/use-sibling-component";
 import { useSplitFormComponent } from "../composition/use-split-component";
diff --git a/packages/ui-vue/components/content-container/src/designer/content-container.design.component.tsx b/packages/ui-vue/components/content-container/src/designer/content-container.design.component.tsx
index 308f7d2ce29..cf57c8cd951 100644
--- a/packages/ui-vue/components/content-container/src/designer/content-container.design.component.tsx
+++ b/packages/ui-vue/components/content-container/src/designer/content-container.design.component.tsx
@@ -1,10 +1,8 @@
 import { SetupContext, computed, defineComponent, inject, onMounted, ref } from 'vue';
+import { getCustomClass } from '@farris/ui-vue/components/common';
 import { ContentContainerPropsType, contentContainerProps } from '../content-container.props';
 import { useDesignerRulesForContentContainer } from './use-designer-rules';
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
-import { getCustomClass } from '@farris/ui-vue/components/common';
-import { DesignerHostService } from '../../../designer-canvas/src/composition/types';
+import { DesignerItemContext, useDesignerComponent, DesignerHostService } from '@farris/ui-vue/components/designer-canvas';
 export default defineComponent({
     name: 'FContentContainerDesign',
     props: contentContainerProps,
diff --git a/packages/ui-vue/components/content-container/src/designer/use-designer-rules.ts b/packages/ui-vue/components/content-container/src/designer/use-designer-rules.ts
index c912399ddef..bb54ae6876e 100644
--- a/packages/ui-vue/components/content-container/src/designer/use-designer-rules.ts
+++ b/packages/ui-vue/components/content-container/src/designer/use-designer-rules.ts
@@ -1,8 +1,7 @@
-import { DesignerHostService, DraggingResolveContext, UseDesignerRules } from "../../../designer-canvas/src/composition/types";
-import { useDragulaCommonRule } from "../../../designer-canvas/src/composition/rule/use-dragula-common-rule";
-import { ComponentSchema, DesignerItemContext } from "../../../designer-canvas/src/types";
-import { UseTemplateDragAndDropRules } from "../../../designer-canvas/src/composition/rule/use-template-rule";
-import { DgControl } from "../../../designer-canvas";
+import { DesignerHostService, DraggingResolveContext, 
+    UseDesignerRules, useDragulaCommonRule, 
+    ComponentSchema, DesignerItemContext,
+    UseTemplateDragAndDropRules, DgControl } from "@farris/ui-vue/components/designer-canvas";
 import { ContentContainerProperty } from "../property-config/content-container.property-config";
 
 export function useDesignerRulesForContentContainer(designItemContext: DesignerItemContext, designerHostService?: DesignerHostService): UseDesignerRules {
diff --git a/packages/ui-vue/components/data-grid/src/composition/data-grid-component-creator.service.ts b/packages/ui-vue/components/data-grid/src/composition/data-grid-component-creator.service.ts
index 0bacebc8977..4a479bef291 100644
--- a/packages/ui-vue/components/data-grid/src/composition/data-grid-component-creator.service.ts
+++ b/packages/ui-vue/components/data-grid/src/composition/data-grid-component-creator.service.ts
@@ -1,11 +1,8 @@
-import { DesignerHostService } from '../../../designer-canvas/src/composition/types';
+import { cloneDeep } from 'lodash-es';
+import { FormSchemaEntityField$Type, FormSchemaEntityFieldTypeName, useGuid } from '@farris/ui-vue/components/common';
 import { DynamicResolver } from '@farris/ui-vue/components/dynamic-resolver';
+import { DesignerHostService, ComponentSchema, DgControl } from '@farris/ui-vue/components/designer-canvas';
 import { ComponentBuildInfo } from '../../../component/src/composition/inner-component-build-info';
-import { ComponentSchema } from '../../../../components/designer-canvas';
-import { FormSchemaEntityField$Type, FormSchemaEntityFieldTypeName } from '@farris/ui-vue/components/common';
-import { cloneDeep } from 'lodash-es';
-import { DgControl } from '../../../designer-canvas/src/composition/dg-control';
-import { useGuid } from '@farris/ui-vue/components/common';
 
 const ROOT_VIEW_MODEL_ID = 'root-viewmodel';
 
diff --git a/packages/ui-vue/components/data-grid/src/designer/column-header.design.component.tsx b/packages/ui-vue/components/data-grid/src/designer/column-header.design.component.tsx
index a288ac5b5fb..b7e4fa64fbd 100644
--- a/packages/ui-vue/components/data-grid/src/designer/column-header.design.component.tsx
+++ b/packages/ui-vue/components/data-grid/src/designer/column-header.design.component.tsx
@@ -15,8 +15,7 @@
  */
 import { computed, ref } from 'vue';
 import { HeaderCell, UseColumn, UseVirtualScroll, DataViewOptions } from '../../../data-view/composition/types';
-import FDesignerItem from '../../../designer-canvas/src/components/designer-item.component';
-import { DesignerItemContext } from '../../../designer-canvas';
+import { DesignerItemContext, FDesignerItem } from '@farris/ui-vue/components/designer-canvas';
 export default function (
     designItemContext: DesignerItemContext,
     props: DataViewOptions,
diff --git a/packages/ui-vue/components/data-grid/src/designer/data-grid-column.design.component.tsx b/packages/ui-vue/components/data-grid/src/designer/data-grid-column.design.component.tsx
index 9902f93a8f3..43e8554dd11 100644
--- a/packages/ui-vue/components/data-grid/src/designer/data-grid-column.design.component.tsx
+++ b/packages/ui-vue/components/data-grid/src/designer/data-grid-column.design.component.tsx
@@ -1,7 +1,6 @@
 import { SetupContext, defineComponent, inject, onMounted, ref } from 'vue';
 import { dataGridColumnProps, DataGridColumnProps } from './data-grid-column.props';
-import { DesignerHostService, DesignerItemContext } from '../../../designer-canvas';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
+import { DesignerHostService, DesignerItemContext, useDesignerComponent } from '@farris/ui-vue/components/designer-canvas';
 import { useDesignerRulesForDataGridColumn } from './use-column-rules';
 import { useFormBindingResolverDesign } from '../../../dynamic-form/src/composition/form-binding-resolver-design';
 
diff --git a/packages/ui-vue/components/data-grid/src/designer/data-grid.design.component.tsx b/packages/ui-vue/components/data-grid/src/designer/data-grid.design.component.tsx
index bda59a8f153..b47d13bbdcc 100644
--- a/packages/ui-vue/components/data-grid/src/designer/data-grid.design.component.tsx
+++ b/packages/ui-vue/components/data-grid/src/designer/data-grid.design.component.tsx
@@ -25,11 +25,8 @@ import {
     useFilter, DataColumn, useRow
 } from '../../../data-view';
 import getColumnHeader from './column-header.design.component';
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
+import { DesignerItemContext, useDesignerComponent, DesignerHostService, canvasChanged } from '@farris/ui-vue/components/designer-canvas';
 import { useDesignerRulesForDataGrid } from './use-designer-rules';
-import { DesignerHostService } from '../../../designer-canvas/src/composition/types';
-import { canvasChanged } from '../../../designer-canvas/src/composition/designer-canvas-changed';
 
 export default defineComponent({
     name: 'FDataGridDesign',
diff --git a/packages/ui-vue/components/data-grid/src/designer/use-column-rules.ts b/packages/ui-vue/components/data-grid/src/designer/use-column-rules.ts
index 4abe19de7ab..124fc71b359 100644
--- a/packages/ui-vue/components/data-grid/src/designer/use-column-rules.ts
+++ b/packages/ui-vue/components/data-grid/src/designer/use-column-rules.ts
@@ -1,8 +1,7 @@
  
  
 import { ref } from "vue";
-import { DraggingResolveContext, UseDesignerRules } from "../../../designer-canvas/src/composition/types";
-import { ComponentSchema, DesignerItemContext } from "../../../designer-canvas/src/types";
+import { DraggingResolveContext, UseDesignerRules, ComponentSchema, DesignerItemContext } from "@farris/ui-vue/components/designer-canvas";
 import { DataGriColumnProperty } from "../property-config/data-grid-column.property-config";
 
 export function useDesignerRulesForDataGridColumn(designItemContext: DesignerItemContext, designerHostService): UseDesignerRules {
diff --git a/packages/ui-vue/components/data-grid/src/designer/use-designer-rules.ts b/packages/ui-vue/components/data-grid/src/designer/use-designer-rules.ts
index 0f730c481d5..72a70ea8a01 100644
--- a/packages/ui-vue/components/data-grid/src/designer/use-designer-rules.ts
+++ b/packages/ui-vue/components/data-grid/src/designer/use-designer-rules.ts
@@ -1,6 +1,5 @@
 import { ref } from "vue";
-import { DraggingResolveContext, DesignerHTMLElement, UseDesignerRules, DesignerHostService } from "../../../designer-canvas/src/composition/types";
-import { ComponentSchema, DesignerItemContext } from "../../../designer-canvas/src/types";
+import { DraggingResolveContext, UseDesignerRules, DesignerHostService, ComponentSchema, DesignerItemContext } from "@farris/ui-vue/components/designer-canvas";
 import { DataGridProperty } from "../property-config/data-grid.property-config";
 
 export function useDesignerRulesForDataGrid(designItemContext: DesignerItemContext, designerHostService?: DesignerHostService): UseDesignerRules {
diff --git a/packages/ui-vue/components/data-grid/src/property-config/data-grid-column.property-config.ts b/packages/ui-vue/components/data-grid/src/property-config/data-grid-column.property-config.ts
index c436907b71c..8f6bf489ce2 100644
--- a/packages/ui-vue/components/data-grid/src/property-config/data-grid-column.property-config.ts
+++ b/packages/ui-vue/components/data-grid/src/property-config/data-grid-column.property-config.ts
@@ -1,6 +1,6 @@
 
 import { BaseControlProperty } from '../../../property-panel/src/composition/entity/base-property';
-import { DgControl } from '../../../designer-canvas/src/composition/dg-control';
+import { DgControl } from '@farris/ui-vue/components/designer-canvas';
 import { InputGroupProperty } from '../../../input-group/src/property-config/input-group.property-config';
 import { AvatarProperty } from '../../../avatar/src/property-config/avatar.property-config';
 import { CheckGroupProperty } from '../../../checkbox-group/src/property-config/check-group.property-config';
diff --git a/packages/ui-vue/components/data-grid/src/schema/schema-resolver.ts b/packages/ui-vue/components/data-grid/src/schema/schema-resolver.ts
index 5513623b42c..5e5c73ad49b 100644
--- a/packages/ui-vue/components/data-grid/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/data-grid/src/schema/schema-resolver.ts
@@ -1,7 +1,6 @@
-import { ComponentBuildInfo } from "../../../component/src/composition/inner-component-build-info";
-import { DesignerHostService } from "../../../designer-canvas/src/composition/types";
-import { DesignerComponentInstance } from "../../../designer-canvas/src/types";
 import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
+import { ComponentBuildInfo } from "../../../component/src/composition/inner-component-build-info";
+import { DesignerHostService, DesignerComponentInstance } from "@farris/ui-vue/components/designer-canvas";
 import { DataGridComponentCreatorService } from "../composition/data-grid-component-creator.service";
 
 export function schemaResolver(resolver: DynamicResolver, schema: Record<string, any>, context: Record<string, any>, designerHostService?: DesignerHostService): Record<string, any> {
diff --git a/packages/ui-vue/components/designer-outline/src/composition/use-outline-node.ts b/packages/ui-vue/components/designer-outline/src/composition/use-outline-node.ts
index 1204c1088e4..faf841c6927 100644
--- a/packages/ui-vue/components/designer-outline/src/composition/use-outline-node.ts
+++ b/packages/ui-vue/components/designer-outline/src/composition/use-outline-node.ts
@@ -1,10 +1,8 @@
 
-import { DgControl } from '../../../designer-canvas/src/composition/dg-control';
+import { DgControl, DesignerHostService } from '@farris/ui-vue/components/designer-canvas';
 import { ref, SetupContext } from 'vue';
 import { ComponentType } from '../types';
 import { UseOutlineNode } from './types';
-import { DesignerHostService } from '../../../designer-canvas/src/composition/types';
-
 /**
  * 组装控件树节点的展示文本、图标
  */
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 ae1efe3667b..9b9a3d0e795 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,8 +1,7 @@
  
 import { SetupContext, defineComponent, inject, onMounted, ref } from 'vue';
 import { DynamicFormGroupPropsType, dynamicFormGroupProps } from '../component/dynamic-form-group/dynamic-form-group.props';
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
+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';
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 8492f9b69bb..982bd14f099 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
@@ -1,8 +1,7 @@
 import { DesignerHostService, DesignerHTMLElement, DraggingResolveContext, UseDesignerRules } from "@farris/ui-vue/components/designer-canvas";
-import { useDragulaCommonRule } from "../../../designer-canvas/src/composition/rule/use-dragula-common-rule";
+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 { UseTemplateDragAndDropRules } from "../../../designer-canvas/src/composition/rule/use-template-rule";
 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";
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 a7ca0c430ff..d2656703b5a 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,10 +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 } from '../../../designer-canvas/src/types';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
+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 { DesignerHostService } from '../../../designer-canvas/src/composition/types';
 
 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 c24abde5c82..d46be9d044f 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
@@ -2,7 +2,7 @@
 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 { refreshCanvas } from "../../../designer-canvas/src/composition/update-cancas";
+import { refreshCanvas } from "@farris/ui-vue/components/designer-canvas";
 
 export class ResponseFormProperty extends BaseControlProperty {
 
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 747d56aa51c..9f94324b052 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,7 @@
 
 import { ComponentBuildInfo } from "../../../component/src/composition/inner-component-build-info";
-import { DesignerHostService } from "../../../designer-canvas/src/composition/types";
-import { DesignerComponentInstance } from "../../../designer-canvas/src/types";
+import { DesignerHostService } from "@farris/ui-vue/components/designer-canvas";
+import { 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/entity-binding-selector/entity-binding-selector.component.tsx b/packages/ui-vue/components/entity-binding-selector/entity-binding-selector.component.tsx
index 104f9f8dd9e..14590b28290 100644
--- a/packages/ui-vue/components/entity-binding-selector/entity-binding-selector.component.tsx
+++ b/packages/ui-vue/components/entity-binding-selector/entity-binding-selector.component.tsx
@@ -3,7 +3,7 @@ import { FNotifyService } from "../notify";
 import { entityBindingSelectorProps, EntityBindingSelectorProps } from "./entity-binding-selector.props";
 import { FTreeGrid } from '../tree-grid';
 import { useEntityTree } from "./composition/use-entity-tree";
-import { ComponentBindingSourceContext } from "../designer-canvas/src/composition/types";
+import { ComponentBindingSourceContext } from "@farris/ui-vue/components/designer-canvas";
 import { Step } from '../step';
 import { useFieldTree } from "./composition/use-field-tree";
 import { FDynamicFormGroup } from "../dynamic-form";
diff --git a/packages/ui-vue/components/fieldset/src/designer/fieldset.design.component.tsx b/packages/ui-vue/components/fieldset/src/designer/fieldset.design.component.tsx
index 03e5dabeead..47b2b181152 100644
--- a/packages/ui-vue/components/fieldset/src/designer/fieldset.design.component.tsx
+++ b/packages/ui-vue/components/fieldset/src/designer/fieldset.design.component.tsx
@@ -1,9 +1,7 @@
 import { computed, defineComponent, inject, onMounted, ref } from 'vue';
 import { FieldsetDesignerProps, fieldsetDesignerProps } from '../fieldset.props';
 import { useDesignerComponent, DesignerItemContext, DesignerHostService } from '@farris/ui-vue/components/designer-canvas';
-// import { DesignerItemContext } from '../../../designer-canvas/src/types';
 import { useDesignerRules } from './use-designer-rules';
-// import { DesignerHostService } from '../../../designer-canvas';
 
 export default defineComponent({
     name: 'FFieldsetDesign',
diff --git a/packages/ui-vue/components/filter-bar/src/property-config/filter-bar.property-config.ts b/packages/ui-vue/components/filter-bar/src/property-config/filter-bar.property-config.ts
index 9b3482eba5b..5d85c07c922 100644
--- a/packages/ui-vue/components/filter-bar/src/property-config/filter-bar.property-config.ts
+++ b/packages/ui-vue/components/filter-bar/src/property-config/filter-bar.property-config.ts
@@ -1,5 +1,5 @@
 import { InputBaseProperty } from "../../../property-panel/src/composition/entity/input-base-property";
-import { DesignerComponentInstance } from "../../../designer-canvas/src/types";
+import { DesignerComponentInstance } from "@farris/ui-vue/components/designer-canvas";
 
 
 export class FilterBarPropertyConfig extends InputBaseProperty {
diff --git a/packages/ui-vue/components/flow-canvas/src/components/flow-node-item.component.tsx b/packages/ui-vue/components/flow-canvas/src/components/flow-node-item.component.tsx
index fda81f34e03..8e3997102d2 100644
--- a/packages/ui-vue/components/flow-canvas/src/components/flow-node-item.component.tsx
+++ b/packages/ui-vue/components/flow-canvas/src/components/flow-node-item.component.tsx
@@ -1,7 +1,7 @@
 import { computed, defineComponent, inject, ref, watch } from "vue";
 import { FlowNodeItemProps, flowNodeItemProps } from "./flow-node-item.props";
 import { Connection, UseBezierCurve, UseConnections, UseDrawingBezier } from "../composition/types";
-import { FDesignerCanvas } from '../../../designer-canvas';
+import { FDesignerCanvas } from '@farris/ui-vue/components/designer-canvas';
 
 export default defineComponent({
     name: 'FFlowNodeItem',
diff --git a/packages/ui-vue/components/html-template/src/designer/html-template.design.component.tsx b/packages/ui-vue/components/html-template/src/designer/html-template.design.component.tsx
index 3ef64883dc9..756071340a0 100644
--- a/packages/ui-vue/components/html-template/src/designer/html-template.design.component.tsx
+++ b/packages/ui-vue/components/html-template/src/designer/html-template.design.component.tsx
@@ -15,8 +15,7 @@
  */
 import { defineComponent, inject, onMounted, ref, SetupContext, computed } from 'vue';
 import { htmlTemplateDesignProps, HtmlTemplateDesignProps } from '../html-template.props';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
+import { DesignerItemContext, useDesignerComponent } from '@farris/ui-vue/components/designer-canvas';
 import { useDesignerRules } from './use-designer-rules';
 
 export default defineComponent({
diff --git a/packages/ui-vue/components/html-template/src/designer/use-designer-rules.ts b/packages/ui-vue/components/html-template/src/designer/use-designer-rules.ts
index 517fa091ee1..36247467e02 100644
--- a/packages/ui-vue/components/html-template/src/designer/use-designer-rules.ts
+++ b/packages/ui-vue/components/html-template/src/designer/use-designer-rules.ts
@@ -1,5 +1,4 @@
-import { UseDesignerRules } from "../../../designer-canvas/src/composition/types";
-import { ComponentSchema } from "../../../designer-canvas/src/types";
+import { ComponentSchema, UseDesignerRules } from "@farris/ui-vue/components/designer-canvas";
 import { HtmlTemplateProperty } from '../property-config/html-template.property-config';
 
 export function useDesignerRules(schema: ComponentSchema, designerHostService: any): UseDesignerRules {
diff --git a/packages/ui-vue/components/image-cropper/src/designer/image-cropper.design.component.tsx b/packages/ui-vue/components/image-cropper/src/designer/image-cropper.design.component.tsx
index e42169ed304..5b2c6caa772 100644
--- a/packages/ui-vue/components/image-cropper/src/designer/image-cropper.design.component.tsx
+++ b/packages/ui-vue/components/image-cropper/src/designer/image-cropper.design.component.tsx
@@ -18,8 +18,7 @@
 import { defineComponent, ref, withModifiers, SetupContext, inject, onMounted } from 'vue';
 import { ImageCropperProps, imageCropperProps } from '../image-cropper.props';
 import { useImageInfo } from '../composition/use-image-info';
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
+import { DesignerItemContext, useDesignerComponent } from '@farris/ui-vue/components/designer-canvas';
 
 export default defineComponent({
     name: 'FImageCropperDesign',
diff --git a/packages/ui-vue/components/layout/src/designer/layout-pane-use-designer-rules.ts b/packages/ui-vue/components/layout/src/designer/layout-pane-use-designer-rules.ts
index 10104e81ee6..2500e319165 100644
--- a/packages/ui-vue/components/layout/src/designer/layout-pane-use-designer-rules.ts
+++ b/packages/ui-vue/components/layout/src/designer/layout-pane-use-designer-rules.ts
@@ -1,6 +1,4 @@
-import { DesignerHostService, DraggingResolveContext, UseDesignerRules } from "../../../designer-canvas/src/composition/types";
-import { useDragulaCommonRule } from "../../../designer-canvas/src/composition/rule/use-dragula-common-rule";
-import { ComponentSchema, DesignerItemContext } from "../../../designer-canvas/src/types";
+import { DesignerHostService, DraggingResolveContext, UseDesignerRules, useDragulaCommonRule, ComponentSchema, DesignerItemContext } from "@farris/ui-vue/components/designer-canvas";
 
 export function useDesignerRules(designItemContext: DesignerItemContext, designerHostService?: DesignerHostService): UseDesignerRules {
     const schema = designItemContext.schema as ComponentSchema;
diff --git a/packages/ui-vue/components/layout/src/designer/layout-pane.design.component.tsx b/packages/ui-vue/components/layout/src/designer/layout-pane.design.component.tsx
index 47e96178358..8a52966731c 100644
--- a/packages/ui-vue/components/layout/src/designer/layout-pane.design.component.tsx
+++ b/packages/ui-vue/components/layout/src/designer/layout-pane.design.component.tsx
@@ -2,10 +2,8 @@ import { computed, defineComponent, inject, onMounted, ref } from 'vue';
 import { LayoutPanePosition, LayoutPaneProps, layoutPaneProps } from '../components/layout-pane.props';
 import { LayoutContext } from '../composition/types';
 import { useResizePane } from '../composition/use-resize-pane';
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
+import { DesignerItemContext, useDesignerComponent, DesignerHostService } from '@farris/ui-vue/components/designer-canvas';
 import { useDesignerRules } from './layout-pane-use-designer-rules';
-import { DesignerHostService } from '../../../designer-canvas/src/composition/types';
 
 export default defineComponent({
     name: 'FLayoutPaneDesign',
diff --git a/packages/ui-vue/components/layout/src/designer/layout-use-designer-rules.ts b/packages/ui-vue/components/layout/src/designer/layout-use-designer-rules.ts
index aa1d9785a77..8a17a08069d 100644
--- a/packages/ui-vue/components/layout/src/designer/layout-use-designer-rules.ts
+++ b/packages/ui-vue/components/layout/src/designer/layout-use-designer-rules.ts
@@ -1,5 +1,4 @@
-import { UseDesignerRules } from "../../../designer-canvas/src/composition/types";
-import { ComponentSchema } from "../../../designer-canvas/src/types";
+import { UseDesignerRules, ComponentSchema } from "@farris/ui-vue/components/designer-canvas";
 
 export function useDesignerRules(schema: ComponentSchema, parentSchema?: ComponentSchema): UseDesignerRules {
 
diff --git a/packages/ui-vue/components/layout/src/designer/layout.design.component.tsx b/packages/ui-vue/components/layout/src/designer/layout.design.component.tsx
index 6b3e29a720b..9e326302af2 100644
--- a/packages/ui-vue/components/layout/src/designer/layout.design.component.tsx
+++ b/packages/ui-vue/components/layout/src/designer/layout.design.component.tsx
@@ -1,8 +1,7 @@
 import { defineComponent, inject, onMounted, provide, ref } from 'vue';
 import { LayoutProps, layoutProps } from '../layout.props';
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
+import { DesignerItemContext, useDesignerComponent } from '@farris/ui-vue/components/designer-canvas';
 import { useDesignerRules } from './layout-use-designer-rules';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
 import { useResizeHandle } from '../composition/use-resize-handle';
 import { LayoutContext } from '../composition/types';
 
diff --git a/packages/ui-vue/components/list-nav/src/designer/list-nav.design.component.tsx b/packages/ui-vue/components/list-nav/src/designer/list-nav.design.component.tsx
index 837298a80d7..23a2ae27e8a 100644
--- a/packages/ui-vue/components/list-nav/src/designer/list-nav.design.component.tsx
+++ b/packages/ui-vue/components/list-nav/src/designer/list-nav.design.component.tsx
@@ -15,10 +15,8 @@
  */
 import { computed, defineComponent, inject, onMounted, ref, SetupContext } from 'vue';
 import { listNavProps, ListNavProps } from '../list-nav.props';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
+import { useDesignerComponent, DesignerItemContext, DesignerHostService } from '@farris/ui-vue/components/designer-canvas';
 import { useDesignerRules } from './use-designer-rules';
-import { DesignerHostService } from '../../../designer-canvas/src/composition/types';
 
 export default defineComponent({
     name: 'FListNavDesign',
diff --git a/packages/ui-vue/components/list-nav/src/designer/use-designer-rules.ts b/packages/ui-vue/components/list-nav/src/designer/use-designer-rules.ts
index e9f2211d1a5..a442d88ffbb 100644
--- a/packages/ui-vue/components/list-nav/src/designer/use-designer-rules.ts
+++ b/packages/ui-vue/components/list-nav/src/designer/use-designer-rules.ts
@@ -1,9 +1,6 @@
  
  
-import { DesignerHostService, DraggingResolveContext, UseDesignerRules } from "../../../designer-canvas/src/composition/types";
-import { useDragulaCommonRule } from "../../../designer-canvas/src/composition/rule/use-dragula-common-rule";
-import { DesignerItemContext } from "../../../designer-canvas/src/types";
-import { UseTemplateDragAndDropRules } from "../../../designer-canvas/src/composition/rule/use-template-rule";
+import { DesignerHostService, DraggingResolveContext, UseDesignerRules, useDragulaCommonRule, DesignerItemContext, UseTemplateDragAndDropRules } from "@farris/ui-vue/components/designer-canvas";
 
 export function useDesignerRules(designItemContext: DesignerItemContext, designerHostService?: DesignerHostService): UseDesignerRules {
     const dragAndDropRules = new UseTemplateDragAndDropRules();
diff --git a/packages/ui-vue/components/number-range/src/designer/number-range.design.component.tsx b/packages/ui-vue/components/number-range/src/designer/number-range.design.component.tsx
index c0ebf177382..036dfb28445 100644
--- a/packages/ui-vue/components/number-range/src/designer/number-range.design.component.tsx
+++ b/packages/ui-vue/components/number-range/src/designer/number-range.design.component.tsx
@@ -22,8 +22,7 @@ import { useSpinner } from '../composition/use-spinner';
 import { useTextBox } from '../composition/use-text-box';
 import getNumberTextBoxRender from '../components/text-box.component';
 import getSpinnerRender from '../components/spinner.component';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
+import { DesignerItemContext, useDesignerComponent } from '@farris/ui-vue/components/designer-canvas';
 import { useNumberRangeDesignerRules } from './use-design-rules';
 
 export default defineComponent({
diff --git a/packages/ui-vue/components/number-range/src/designer/use-design-rules.ts b/packages/ui-vue/components/number-range/src/designer/use-design-rules.ts
index ce1491dc2be..c765f2335af 100644
--- a/packages/ui-vue/components/number-range/src/designer/use-design-rules.ts
+++ b/packages/ui-vue/components/number-range/src/designer/use-design-rules.ts
@@ -1,6 +1,5 @@
  
-import { UseDesignerRules } from "../../../designer-canvas/src/composition/types";
-import { ComponentSchema, DesignerComponentInstance, DesignerItemContext } from "../../../designer-canvas/src/types";
+import { ComponentSchema, DesignerComponentInstance, DesignerItemContext, UseDesignerRules } from "@farris/ui-vue/components/designer-canvas";
 import { NumberRangeProperty } from "../property-config/number-range.property-config";
 
 export function useNumberRangeDesignerRules(designItemContext: DesignerItemContext, designerHostService): UseDesignerRules {
diff --git a/packages/ui-vue/components/number-spinner/src/composition/use-design-rules.ts b/packages/ui-vue/components/number-spinner/src/composition/use-design-rules.ts
index 1cea29185a1..662df81924f 100644
--- a/packages/ui-vue/components/number-spinner/src/composition/use-design-rules.ts
+++ b/packages/ui-vue/components/number-spinner/src/composition/use-design-rules.ts
@@ -1,7 +1,6 @@
  
  
-import { ComponentSchema, DesignerComponentInstance, DesignerItemContext } from "../../../designer-canvas/src/types";
-import { UseDesignerRules } from "../../../designer-canvas/src/composition/types";
+import { ComponentSchema, DesignerComponentInstance, DesignerItemContext, UseDesignerRules } from "@farris/ui-vue/components/designer-canvas";
 import { NumberSpinnerProperty } from "../property-config/number-spinner.property-config";
 export function useNumberSpinnerDesignerRules(designItemContext: DesignerItemContext, designerHostService): UseDesignerRules {
 
diff --git a/packages/ui-vue/components/number-spinner/src/designer/number-spinner.design.component.tsx b/packages/ui-vue/components/number-spinner/src/designer/number-spinner.design.component.tsx
index a40950ddd69..ebf8fb56e05 100644
--- a/packages/ui-vue/components/number-spinner/src/designer/number-spinner.design.component.tsx
+++ b/packages/ui-vue/components/number-spinner/src/designer/number-spinner.design.component.tsx
@@ -20,8 +20,7 @@ import { useSpinner } from '../composition/use-spinner';
 import { useFormat } from '../composition/use-format';
 import { useNumber } from '../composition/use-number';
 import getSpinnerRenderDesign from './spinner.design.component';
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
+import { DesignerItemContext, useDesignerComponent } from '@farris/ui-vue/components/designer-canvas';
 import { useNumberSpinnerDesignerRules } from '../composition/use-design-rules';
 
 export default defineComponent({
diff --git a/packages/ui-vue/components/order/src/designer/order.design.component.tsx b/packages/ui-vue/components/order/src/designer/order.design.component.tsx
index b33b9de468c..3f5bb00c457 100644
--- a/packages/ui-vue/components/order/src/designer/order.design.component.tsx
+++ b/packages/ui-vue/components/order/src/designer/order.design.component.tsx
@@ -3,8 +3,7 @@ import { OrderProps, OrderedItem, orderProps } from "../order.props";
 import FListView from '../../../../components/list-view/src/list-view.component';
 import FButton from '../../../../components/button/src/button.component';
 import FComboList from '../../../combo-list';
-import { useDesignerComponent } from "../../../designer-canvas/src/composition/function/use-designer-component";
-import { DesignerItemContext } from "../../../designer-canvas/src/types";
+import { DesignerItemContext, useDesignerComponent } from "@farris/ui-vue/components/designer-canvas";
 
 export default defineComponent({
     name: 'FOrderDesign',
diff --git a/packages/ui-vue/components/page-footer/src/designer/page-footer.design.component.tsx b/packages/ui-vue/components/page-footer/src/designer/page-footer.design.component.tsx
index a6933707d84..4362e062bb4 100644
--- a/packages/ui-vue/components/page-footer/src/designer/page-footer.design.component.tsx
+++ b/packages/ui-vue/components/page-footer/src/designer/page-footer.design.component.tsx
@@ -1,8 +1,7 @@
 import { computed, defineComponent, inject, onMounted, ref } from "vue";
-import { pageFooterProps, PageFooterProps } from '../page-footer.props';
-import { DesignerItemContext, useDesignerComponent } from "@farris/ui-vue/components/designer-canvas";
+import { DesignerItemContext, useDesignerComponent, DesignerHostService } from "@farris/ui-vue/components/designer-canvas";
 import { useDesignerRules } from "@farris/ui-vue/components/dynamic-form";
-import { DesignerHostService } from "../../../designer-canvas/src/composition/types";
+import { pageFooterProps, PageFooterProps } from '../page-footer.props';
 
 export default defineComponent({
     name: 'FPageFooterDesign',
diff --git a/packages/ui-vue/components/page-header/src/designer/page-header.design.component.tsx b/packages/ui-vue/components/page-header/src/designer/page-header.design.component.tsx
index 8a7f37ed735..abe29b3d351 100644
--- a/packages/ui-vue/components/page-header/src/designer/page-header.design.component.tsx
+++ b/packages/ui-vue/components/page-header/src/designer/page-header.design.component.tsx
@@ -1,10 +1,8 @@
 import { computed, defineComponent, inject, onMounted, ref, watch } from 'vue';
 import FResponseToolbarDesignComponent, { responseToolbarResolver } from '@farris/ui-vue/components/response-toolbar/designer';
 import { PageHeaderDesignerProps, pageHeaderDesignerProps } from '../page-header.props';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
+import { useDesignerComponent, FDesignerInnerItem, DesignerItemContext } from '@farris/ui-vue/components/designer-canvas';
 import { useDesignerRules } from './use-designer-rules';
-import FDesignerInnerItem from '../../../designer-canvas/src/components/designer-inner-item.component';
 
 export default defineComponent({
     name: 'FPageHeaderDesign',
diff --git a/packages/ui-vue/components/page-header/src/designer/use-designer-rules.ts b/packages/ui-vue/components/page-header/src/designer/use-designer-rules.ts
index bd432617e61..3cee9ecc68d 100644
--- a/packages/ui-vue/components/page-header/src/designer/use-designer-rules.ts
+++ b/packages/ui-vue/components/page-header/src/designer/use-designer-rules.ts
@@ -1,5 +1,4 @@
-import { DraggingResolveContext, UseDesignerRules } from "../../../designer-canvas/src/composition/types";
-import { ComponentSchema } from "../../../designer-canvas/src/types";
+import { DraggingResolveContext, UseDesignerRules, ComponentSchema } from "@farris/ui-vue/components/designer-canvas";
 import { PageHeaderProperty } from '../property-config/page-header.property-config';
 
 export function useDesignerRules(schema: ComponentSchema, designerHostService): UseDesignerRules {
diff --git a/packages/ui-vue/components/pagination/src/designer/pagination.design.components.tsx b/packages/ui-vue/components/pagination/src/designer/pagination.design.components.tsx
index 93361806d72..d5ede09f9bc 100644
--- a/packages/ui-vue/components/pagination/src/designer/pagination.design.components.tsx
+++ b/packages/ui-vue/components/pagination/src/designer/pagination.design.components.tsx
@@ -23,8 +23,7 @@ import getPageNumber from '../components/pages/page-number.component';
 import getPreviousButtons from '../components/buttons/previous-buttons.component';
 import { usePages } from '../composition/use-pages';
 
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
+import { DesignerItemContext, useDesignerComponent } from '@farris/ui-vue/components/designer-canvas';
 
 export default defineComponent({
     name: 'FPagination',
diff --git a/packages/ui-vue/components/progress/src/designer/progress.design.component.tsx b/packages/ui-vue/components/progress/src/designer/progress.design.component.tsx
index aa44e815872..2e4566dd454 100644
--- a/packages/ui-vue/components/progress/src/designer/progress.design.component.tsx
+++ b/packages/ui-vue/components/progress/src/designer/progress.design.component.tsx
@@ -1,8 +1,6 @@
-import { SetupContext, computed, defineComponent, inject, onMounted, ref, watch } from 'vue';
+import { computed, defineComponent, inject, onMounted, ref, watch } from 'vue';
 import { ProgressProps, progressProps } from '../progress.props';
-
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
+import { DesignerItemContext, useDesignerComponent } from '@farris/ui-vue/components/designer-canvas';
 
 export default defineComponent({
     name: 'FProgressDesign',
diff --git a/packages/ui-vue/components/query-solution/src/schema/schema-resolver.ts b/packages/ui-vue/components/query-solution/src/schema/schema-resolver.ts
index c9b083dee41..7158be02d05 100644
--- a/packages/ui-vue/components/query-solution/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/query-solution/src/schema/schema-resolver.ts
@@ -1,4 +1,4 @@
-import { DesignerComponentInstance, DesignerHostService } from "../../../designer-canvas";
+import { DesignerComponentInstance, DesignerHostService } from "@farris/ui-vue/components/designer-canvas";
 import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 import { querySolutionCreatorService } from "../composition/build-solution";
 
diff --git a/packages/ui-vue/components/radio-button/src/designer/radio-button.design.component.tsx b/packages/ui-vue/components/radio-button/src/designer/radio-button.design.component.tsx
index e334d807743..294fb97404c 100644
--- a/packages/ui-vue/components/radio-button/src/designer/radio-button.design.component.tsx
+++ b/packages/ui-vue/components/radio-button/src/designer/radio-button.design.component.tsx
@@ -13,10 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { computed, defineComponent, SetupContext, ref, withModifiers, onMounted, inject } from 'vue';
+import { defineComponent, SetupContext } from 'vue';
 import { RadioButtonProps, radioButtonProps } from '../radio-button.props';
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
 
 export default defineComponent({
     name: 'FRadioButtonDesign',
diff --git a/packages/ui-vue/components/radio-group/src/designer/radio-group.design.component.tsx b/packages/ui-vue/components/radio-group/src/designer/radio-group.design.component.tsx
index 9d94faea7b5..979733f54c7 100644
--- a/packages/ui-vue/components/radio-group/src/designer/radio-group.design.component.tsx
+++ b/packages/ui-vue/components/radio-group/src/designer/radio-group.design.component.tsx
@@ -17,8 +17,7 @@ import { defineComponent, computed, ref, inject, onMounted } from 'vue';
 import type { SetupContext } from 'vue';
 import { radioGroupProps, RadioGroupProps } from '../radio-group.props';
 import { changeRadio } from '../composition/change-radio';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
+import { DesignerItemContext, useDesignerComponent } from '@farris/ui-vue/components/designer-canvas';
 import { useRadioGroupDesignerRules } from './use-design-rules';
 
 export default defineComponent({
diff --git a/packages/ui-vue/components/radio-group/src/designer/use-design-rules.ts b/packages/ui-vue/components/radio-group/src/designer/use-design-rules.ts
index c1fd77c50c8..e9d3dfdfcf0 100644
--- a/packages/ui-vue/components/radio-group/src/designer/use-design-rules.ts
+++ b/packages/ui-vue/components/radio-group/src/designer/use-design-rules.ts
@@ -1,7 +1,6 @@
  
  
-import { ComponentSchema, DesignerComponentInstance, DesignerItemContext } from "../../../designer-canvas/src/types";
-import { UseDesignerRules } from "../../../designer-canvas/src/composition/types";
+import { ComponentSchema, DesignerComponentInstance, DesignerItemContext, UseDesignerRules } from "@farris/ui-vue/components/designer-canvas";
 import { RadioGroupProperty } from "../property-config/radio-group.property-config";
 export function useRadioGroupDesignerRules(designItemContext: DesignerItemContext, designerHostService): UseDesignerRules {
     const schema = designItemContext.schema as ComponentSchema;
diff --git a/packages/ui-vue/components/rate/src/designer/rate.design.component.tsx b/packages/ui-vue/components/rate/src/designer/rate.design.component.tsx
index 3bf4142b77c..d0da8f8944a 100644
--- a/packages/ui-vue/components/rate/src/designer/rate.design.component.tsx
+++ b/packages/ui-vue/components/rate/src/designer/rate.design.component.tsx
@@ -16,8 +16,7 @@
  */
 import { computed, defineComponent, SetupContext, ref, withModifiers, onMounted, inject } from 'vue';
 import { RateProps, rateProps } from '../rate.props';
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
+import { DesignerItemContext, useDesignerComponent } from '@farris/ui-vue/components/designer-canvas';
 
 export default defineComponent({
     name: 'FRateDesign',
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 0625f19301a..513856f7a59 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
@@ -3,10 +3,8 @@ import { defineComponent, onMounted, inject, ref, SetupContext } from 'vue';
 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';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
 
 export default defineComponent({
     name: 'FResponseLayoutEditorSettingDesign',
diff --git a/packages/ui-vue/components/response-layout-editor/src/schema/schema-resolver.ts b/packages/ui-vue/components/response-layout-editor/src/schema/schema-resolver.ts
index ea67474b201..b8b5c87dd7d 100644
--- a/packages/ui-vue/components/response-layout-editor/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/response-layout-editor/src/schema/schema-resolver.ts
@@ -1,5 +1,5 @@
  
-import { ComponentSchema } from "../../../designer-canvas/src/types";
+import { ComponentSchema } from "@farris/ui-vue/components/designer-canvas";
 import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 function wrapSectionForForm(resolver: DynamicResolver, schema: ComponentSchema, context: Record<string, any>, formSchemaId: string): ComponentSchema {
diff --git a/packages/ui-vue/components/response-toolbar/src/composition/use-toolbar-item-design.tsx b/packages/ui-vue/components/response-toolbar/src/composition/use-toolbar-item-design.tsx
index 8281e830813..550a8d359a4 100644
--- a/packages/ui-vue/components/response-toolbar/src/composition/use-toolbar-item-design.tsx
+++ b/packages/ui-vue/components/response-toolbar/src/composition/use-toolbar-item-design.tsx
@@ -1,7 +1,6 @@
 import { Ref, inject, ref } from 'vue';
-import FDesignerInnerItem from '../../../designer-canvas/src/components/designer-inner-item.component';
 import FResponseToolbarDesignItemComponent from '../designer/response-toolbar-item.design.component';
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
+import { DesignerItemContext, FDesignerInnerItem } from '@farris/ui-vue/components/designer-canvas';
 import { ResponseToolbarItemActionHandler } from '../types/common';
 export function useToolbarItemDesign(props, resizedContent, designItemContext: DesignerItemContext, actionHandlers: ResponseToolbarItemActionHandler) {
     function onSelectionChange(schemaType: string, schemaValue: any, componentId: string, componentInstance: any) {
diff --git a/packages/ui-vue/components/search-box/src/designer/search-box.design.component.tsx b/packages/ui-vue/components/search-box/src/designer/search-box.design.component.tsx
index d16b5efd2d3..212af8d171a 100644
--- a/packages/ui-vue/components/search-box/src/designer/search-box.design.component.tsx
+++ b/packages/ui-vue/components/search-box/src/designer/search-box.design.component.tsx
@@ -1,8 +1,7 @@
-import { SetupContext, defineComponent, inject, onMounted, ref, watch } from "vue";
+import { defineComponent, inject, onMounted, ref, watch } from "vue";
 import { SearchBoxProps, searchBoxProps } from "../search-box.props";
 import SearchBoxContainer from '../components/search-box-container.component';
-import { useDesignerComponent } from "../../../designer-canvas/src/composition/function/use-designer-component";
-import { DesignerItemContext } from "../../../designer-canvas/src/types";
+import { DesignerItemContext, useDesignerComponent } from "@farris/ui-vue/components/designer-canvas";
 
 export default defineComponent({
     name: 'FSearchBoxDesign',
diff --git a/packages/ui-vue/components/smoke-detector/src/designer/smoke-detector.design.component.tsx b/packages/ui-vue/components/smoke-detector/src/designer/smoke-detector.design.component.tsx
index 42e04714b7f..9b1a874f4d2 100644
--- a/packages/ui-vue/components/smoke-detector/src/designer/smoke-detector.design.component.tsx
+++ b/packages/ui-vue/components/smoke-detector/src/designer/smoke-detector.design.component.tsx
@@ -1,7 +1,6 @@
 import { defineComponent, ref, inject, onMounted } from 'vue';
 import { SmokeDetectorProps, smokeDetectorProps } from '../smoke-detector.props';
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
+import { DesignerItemContext, useDesignerComponent } from '@farris/ui-vue/components/designer-canvas';
 
 import '../smoke-detector.css';
 
diff --git a/packages/ui-vue/components/splitter/src/designer/splitter-pane-use-designer-rules.ts b/packages/ui-vue/components/splitter/src/designer/splitter-pane-use-designer-rules.ts
index 5153addc0dc..1b0f247d367 100644
--- a/packages/ui-vue/components/splitter/src/designer/splitter-pane-use-designer-rules.ts
+++ b/packages/ui-vue/components/splitter/src/designer/splitter-pane-use-designer-rules.ts
@@ -1,7 +1,9 @@
-import { UseTemplateDragAndDropRules } from "../../../designer-canvas/src/composition/rule/use-template-rule";
-import { DesignerHostService, DraggingResolveContext, UseDesignerRules } from "../../../designer-canvas/src/composition/types";
-import { useDragulaCommonRule } from "../../../designer-canvas/src/composition/rule/use-dragula-common-rule";
-import { ComponentSchema, DesignerItemContext } from "../../../designer-canvas/src/types";
+import {
+    UseTemplateDragAndDropRules, ComponentSchema,
+    DesignerItemContext, DesignerHostService,
+    DraggingResolveContext, UseDesignerRules,
+    useDragulaCommonRule
+} from "@farris/ui-vue/components/designer-canvas";
 import { SplitterPaneProperty } from "../property-config/splitter-pane.property-config";
 
 export function useDesignerRules(designItemContext: DesignerItemContext, designerHostService?: DesignerHostService): UseDesignerRules {
@@ -20,8 +22,8 @@ export function useDesignerRules(designItemContext: DesignerItemContext, designe
         }
         return canAccept;
     }
-      // 构造属性配置方法
-      function getPropsConfig(componentId: string) {
+    // 构造属性配置方法
+    function getPropsConfig(componentId: string) {
         const splitterPaneProp = new SplitterPaneProperty(componentId, designerHostService);
         return splitterPaneProp.getPropertyConfig(schema);
     }
diff --git a/packages/ui-vue/components/splitter/src/designer/splitter-pane.design.component.tsx b/packages/ui-vue/components/splitter/src/designer/splitter-pane.design.component.tsx
index 7825b1aa8be..f7b6657cf02 100644
--- a/packages/ui-vue/components/splitter/src/designer/splitter-pane.design.component.tsx
+++ b/packages/ui-vue/components/splitter/src/designer/splitter-pane.design.component.tsx
@@ -1,12 +1,10 @@
 import { computed, defineComponent, inject, onMounted, ref } from 'vue';
+import { getCustomClass, getCustomStyle } from '@farris/ui-vue/components/common';
 import { SplitterPanePropsType, splitterPaneProps } from '../components/splitter-pane.props';
 import { SplitterContext } from '../composition/types';
 import { useResizePane } from '../composition/use-resize-pane';
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
+import { DesignerItemContext, useDesignerComponent, DesignerHostService } from '@farris/ui-vue/components/designer-canvas';
 import { useDesignerRules } from './splitter-pane-use-designer-rules';
-import { getCustomClass, getCustomStyle } from '@farris/ui-vue/components/common';
-import { DesignerHostService } from '../../../designer-canvas/src/composition/types';
 
 export default defineComponent({
     name: 'FSplitterPaneDesign',
diff --git a/packages/ui-vue/components/splitter/src/designer/splitter-use-designer-rules.ts b/packages/ui-vue/components/splitter/src/designer/splitter-use-designer-rules.ts
index fe77113b364..d703549b3a8 100644
--- a/packages/ui-vue/components/splitter/src/designer/splitter-use-designer-rules.ts
+++ b/packages/ui-vue/components/splitter/src/designer/splitter-use-designer-rules.ts
@@ -1,6 +1,4 @@
-import { DesignerHostService, UseDesignerRules } from "../../../designer-canvas/src/composition/types";
-import { DesignerItemContext } from "../../../designer-canvas/src/types";
-import { UseTemplateDragAndDropRules } from "../../../designer-canvas/src/composition/rule/use-template-rule";
+import { DesignerHostService, UseDesignerRules, DesignerItemContext, UseTemplateDragAndDropRules } from "@farris/ui-vue/components/designer-canvas";
 
 export function useDesignerRules(designItemContext: DesignerItemContext, designerHostService?: DesignerHostService): UseDesignerRules {
     const dragAndDropRules = new UseTemplateDragAndDropRules();
diff --git a/packages/ui-vue/components/splitter/src/designer/splitter.design.component.tsx b/packages/ui-vue/components/splitter/src/designer/splitter.design.component.tsx
index 72d45522c5a..437ea0f94cf 100644
--- a/packages/ui-vue/components/splitter/src/designer/splitter.design.component.tsx
+++ b/packages/ui-vue/components/splitter/src/designer/splitter.design.component.tsx
@@ -1,13 +1,11 @@
-import { SetupContext, computed, defineComponent, inject, onMounted, provide, ref } from 'vue';
+import { computed, defineComponent, inject, onMounted, provide, ref } from 'vue';
 import { SplitterPropsType, splitterProps } from '../splitter.props';
-import '../splitter.css';
 import { useResizeHandle } from '../composition/use-resize-handle';
 import { SplitterContext } from '../composition/types';
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
+import { DesignerItemContext, useDesignerComponent, DesignerHostService } from '@farris/ui-vue/components/designer-canvas';
 import { useDesignerRules } from './splitter-use-designer-rules';
 import { getCustomClass, getCustomStyle } from '@farris/ui-vue/components/common';
-import { DesignerHostService } from '../../../designer-canvas/src/composition/types';
+import '../splitter.css';
 
 export default defineComponent({
     name: 'FSplitterDesign',
diff --git a/packages/ui-vue/components/splitter/src/schema/splitter-schema-resolver.ts b/packages/ui-vue/components/splitter/src/schema/splitter-schema-resolver.ts
index 2f221d9fe49..49462bde598 100644
--- a/packages/ui-vue/components/splitter/src/schema/splitter-schema-resolver.ts
+++ b/packages/ui-vue/components/splitter/src/schema/splitter-schema-resolver.ts
@@ -1,5 +1,5 @@
  
-import { ComponentSchema, DesignerComponentInstance } from "../../../designer-canvas/src/types";
+import { ComponentSchema, DesignerComponentInstance } from "@farris/ui-vue/components/designer-canvas";
 import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 function wrapContentContainerForDataGrid(resolver: DynamicResolver, schema: ComponentSchema, context: Record<string, any>): ComponentSchema {
diff --git a/packages/ui-vue/components/step/src/designer/step.design.component.tsx b/packages/ui-vue/components/step/src/designer/step.design.component.tsx
index 2d10cdab778..05850c76a0b 100644
--- a/packages/ui-vue/components/step/src/designer/step.design.component.tsx
+++ b/packages/ui-vue/components/step/src/designer/step.design.component.tsx
@@ -1,8 +1,7 @@
 import { SetupContext, computed, defineComponent, inject, onMounted, ref } from 'vue';
 import { Step, StepProps, stepProps } from '../step.props';
 
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
+import { DesignerItemContext, useDesignerComponent } from '@farris/ui-vue/components/designer-canvas';
 
 export default defineComponent({
     name: 'FStepDesign',
diff --git a/packages/ui-vue/components/tags/src/designer/tags.design.component.tsx b/packages/ui-vue/components/tags/src/designer/tags.design.component.tsx
index fc16478c75b..d5bf979a675 100644
--- a/packages/ui-vue/components/tags/src/designer/tags.design.component.tsx
+++ b/packages/ui-vue/components/tags/src/designer/tags.design.component.tsx
@@ -2,8 +2,7 @@ import { computed, defineComponent, inject, nextTick, onMounted, ref, SetupConte
 import { Tag, TagsProps, tagsProps } from '../tags.props';
 import { useDraggable } from '../composition/use-draggable';
 import { TagsInnerElement } from '../composition/types';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
+import { DesignerItemContext, useDesignerComponent } from '@farris/ui-vue/components/designer-canvas';
 
 export default defineComponent({
     name: 'FTagsDesign',
diff --git a/packages/ui-vue/components/text/src/designer/text.design.component.tsx b/packages/ui-vue/components/text/src/designer/text.design.component.tsx
index f6dd3a894ba..8b3e34aed59 100644
--- a/packages/ui-vue/components/text/src/designer/text.design.component.tsx
+++ b/packages/ui-vue/components/text/src/designer/text.design.component.tsx
@@ -15,8 +15,7 @@
  */
 import { computed, defineComponent, inject, onMounted, ref, SetupContext } from 'vue';
 import { TextProps, textProps } from '../text.props';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
+import { DesignerItemContext, useDesignerComponent } from '@farris/ui-vue/components/designer-canvas';
 
 export default defineComponent({
     name: 'FTextDesign',
diff --git a/packages/ui-vue/components/time-picker/src/designer/use-design-rules.ts b/packages/ui-vue/components/time-picker/src/designer/use-design-rules.ts
index 4d1bd0dcb1a..cedd1236065 100644
--- a/packages/ui-vue/components/time-picker/src/designer/use-design-rules.ts
+++ b/packages/ui-vue/components/time-picker/src/designer/use-design-rules.ts
@@ -1,7 +1,6 @@
  
  
-import { ComponentSchema, DesignerComponentInstance, DesignerItemContext } from "../../../designer-canvas/src/types";
-import { UseDesignerRules } from "../../../designer-canvas/src/composition/types";
+import { ComponentSchema, DesignerComponentInstance, DesignerItemContext, UseDesignerRules } from "@farris/ui-vue/components/designer-canvas";
 import { TimePickerProperty } from "../property-config/time-picker.property-config";
 export function useTimePickerDesignerRules(designItemContext: DesignerItemContext, designerHostService): UseDesignerRules {
     const schema = designItemContext.schema as ComponentSchema;
diff --git a/packages/ui-vue/components/transfer/src/designer/transfer.design.component.tsx b/packages/ui-vue/components/transfer/src/designer/transfer.design.component.tsx
index 28bf6e7355e..2a3ebddf3d7 100644
--- a/packages/ui-vue/components/transfer/src/designer/transfer.design.component.tsx
+++ b/packages/ui-vue/components/transfer/src/designer/transfer.design.component.tsx
@@ -1,8 +1,7 @@
-import { SetupContext, computed, defineComponent, inject, onMounted, ref } from "vue";
+import { computed, defineComponent, inject, onMounted, ref } from "vue";
 import { TransferProps, transferProps } from "../transfer.props";
 import FListView from '../../../list-view/src/list-view.component';
-import { useDesignerComponent } from "../../../designer-canvas/src/composition/function/use-designer-component";
-import { DesignerItemContext } from "../../../designer-canvas/src/types";
+import { DesignerItemContext, useDesignerComponent } from "@farris/ui-vue/components/designer-canvas";
 
 export default defineComponent({
     name: 'FTransferDesign',
diff --git a/packages/ui-vue/components/uploader/src/designer/uploader.design.component.tsx b/packages/ui-vue/components/uploader/src/designer/uploader.design.component.tsx
index 28ef40e0448..65b4dfb190f 100644
--- a/packages/ui-vue/components/uploader/src/designer/uploader.design.component.tsx
+++ b/packages/ui-vue/components/uploader/src/designer/uploader.design.component.tsx
@@ -1,14 +1,12 @@
  
-import { Ref, SetupContext, defineComponent, inject, onBeforeMount, onMounted, ref } from 'vue';
-import FUploadProgress from '../components/upload-progress.component';
+import { SetupContext, defineComponent, inject, onBeforeMount, onMounted, ref } from 'vue';
 import FPreviewCheckbox from '../components/preview-checkbox.component';
 import FFileSelect from '../components/file-select.component';
 import { uploaderProps, UploaderProps } from '../uploader.props';
 import { useUploader } from '../composition/use-uploader';
 import { FUploadFileExtend, FUploadPreviewColumn } from '../composition/type';
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
-import { formatUploadOpts, getFileTypeClassName, getRealFileSize, judegeFileSizeLimit, judgeContentTypeLimit } from '../composition/utils';
+import { DesignerItemContext, useDesignerComponent } from '@farris/ui-vue/components/designer-canvas';
+import { formatUploadOpts, judegeFileSizeLimit, judgeContentTypeLimit } from '../composition/utils';
 
 import './uploader.scss';
 
diff --git a/packages/ui-vue/components/verify-detail/src/designer/verify-detail.design.component.tsx b/packages/ui-vue/components/verify-detail/src/designer/verify-detail.design.component.tsx
index e75d7f3bf5a..cd4c3c83a76 100644
--- a/packages/ui-vue/components/verify-detail/src/designer/verify-detail.design.component.tsx
+++ b/packages/ui-vue/components/verify-detail/src/designer/verify-detail.design.component.tsx
@@ -1,8 +1,7 @@
  
 import { SetupContext, computed, defineComponent, inject, onBeforeMount, onMounted, ref } from 'vue';
 import { verifyDetailProps, VerifyDetailProps } from '../verify-detail.props';
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
+import { DesignerItemContext, useDesignerComponent } from '@farris/ui-vue/components/designer-canvas';
 
 export default defineComponent({
     name: 'FVerifyDetailDesign',
-- 
Gitee


From e4748e7c4d5c145ee2c5cc3ac31e2e999c2c51fe Mon Sep 17 00:00:00 2001
From: hyygzds <m15966339253@163.com>
Date: Fri, 8 Aug 2025 17:14:39 +0800
Subject: [PATCH 58/62] fix: split rate design

---
 .../designer-canvas/src/components/maps.ts    |  2 +-
 .../dynamic-view/src/components/maps.ts       |  2 +-
 packages/ui-vue/components/rate/designer.ts   | 38 +++++++++++++++++++
 packages/ui-vue/components/rate/index.ts      | 11 ------
 .../ui-vue/components/rate/src/rate.props.ts  |  6 ---
 5 files changed, 40 insertions(+), 19 deletions(-)
 create mode 100644 packages/ui-vue/components/rate/designer.ts

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 4e752b83171..32562fac3e8 100644
--- a/packages/ui-vue/components/designer-canvas/src/components/maps.ts
+++ b/packages/ui-vue/components/designer-canvas/src/components/maps.ts
@@ -31,7 +31,7 @@ import FPagination from '@farris/ui-vue/components/pagination';
 import FProgress from '@farris/ui-vue/components/progress';
 import FQuerySolution from '@farris/ui-vue/components/query-solution';
 import FRadioGroup from '@farris/ui-vue/components/radio-group/designer';
-import FRate from '@farris/ui-vue/components/rate';
+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';
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 da2061f6fe0..60e7246aeb6 100644
--- a/packages/ui-vue/components/dynamic-view/src/components/maps.ts
+++ b/packages/ui-vue/components/dynamic-view/src/components/maps.ts
@@ -36,7 +36,7 @@ import FPagination from '@farris/ui-vue/components/pagination';
 import FProgress from '@farris/ui-vue/components/progress';
 import FQuerySolution from '@farris/ui-vue/components/query-solution';
 import FRadioGroup from '@farris/ui-vue/components/radio-group/designer';
-import FRate from '@farris/ui-vue/components/rate';
+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';
diff --git a/packages/ui-vue/components/rate/designer.ts b/packages/ui-vue/components/rate/designer.ts
new file mode 100644
index 00000000000..e9367fd9e0f
--- /dev/null
+++ b/packages/ui-vue/components/rate/designer.ts
@@ -0,0 +1,38 @@
+ 
+/**
+ * Copyright (c) 2020 - present, Inspur Genersoft Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import FRate, { RateProps, rateProps } from '@farris/ui-vue/components/rate';
+import { withInstall } from '@farris/ui-vue/components/common';
+import FRateDesign from './src/designer/rate.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 rateSchema from './src/schema/rate.schema.json';
+import propertyConfig from './src/property-config/rate.property-config.json';
+
+export const propsResolver = createPropsResolver<RateProps>(rateProps, rateSchema, schemaMapper, schemaResolver, propertyConfig);
+
+FRateDesign.register = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>, resolverMap: Record<string, any>) => {
+    componentMap.rate = FRate;
+    propsResolverMap.rate = propsResolver;
+};
+FRateDesign.registerDesigner = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>) => {
+    componentMap.rate = FRateDesign;
+    propsResolverMap.rate = propsResolver;
+};
+
+export { FRateDesign };
+export default withInstall(FRateDesign);
diff --git a/packages/ui-vue/components/rate/index.ts b/packages/ui-vue/components/rate/index.ts
index 51b621dc498..a6ef28f7235 100644
--- a/packages/ui-vue/components/rate/index.ts
+++ b/packages/ui-vue/components/rate/index.ts
@@ -14,22 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { App } from 'vue';
 import FRate from './src/rate.component';
-import FRateDesign from './src/designer/rate.design.component';
-import { propsResolver } from './src/rate.props';
 import { withInstall } from '@farris/ui-vue/components/common';
 
 export * from './src/rate.props';
 
-FRate.register = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>, resolverMap: Record<string, any>) => {
-    componentMap.rate = FRate;
-    propsResolverMap.rate = propsResolver;
-};
-FRate.registerDesigner = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>) => {
-    componentMap.rate = FRateDesign;
-    propsResolverMap.rate = propsResolver;
-};
 
 export { FRate };
 export default withInstall(FRate);
diff --git a/packages/ui-vue/components/rate/src/rate.props.ts b/packages/ui-vue/components/rate/src/rate.props.ts
index c179016d1e0..36fec5488cd 100644
--- a/packages/ui-vue/components/rate/src/rate.props.ts
+++ b/packages/ui-vue/components/rate/src/rate.props.ts
@@ -14,11 +14,6 @@
  * limitations under the License.
  */
 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 rateSchema from './schema/rate.schema.json';
-import propertyConfig from './property-config/rate.property-config.json';
 
 const toolTipContents = ['很不满意', '不满意', '一般', '满意', '非常满意'];
 
@@ -57,4 +52,3 @@ export const rateProps = {
 } as Record<string, any>;
 
 export type RateProps = ExtractPropTypes<typeof rateProps>;
-export const propsResolver = createPropsResolver<RateProps>(rateProps, rateSchema, schemaMapper, schemaResolver, propertyConfig);
-- 
Gitee


From e579814e76e0562f9a7b742a263a8c9616c26715 Mon Sep 17 00:00:00 2001
From: hyygzds <m15966339253@163.com>
Date: Sat, 9 Aug 2025 10:43:31 +0800
Subject: [PATCH 59/62] fix: split radio button design

---
 .../components/radio-button/designer.ts       | 38 +++++++++++++++++++
 .../ui-vue/components/radio-button/index.ts   | 11 ------
 .../radio-button/src/radio-button.props.ts    | 10 +----
 3 files changed, 40 insertions(+), 19 deletions(-)
 create mode 100644 packages/ui-vue/components/radio-button/designer.ts

diff --git a/packages/ui-vue/components/radio-button/designer.ts b/packages/ui-vue/components/radio-button/designer.ts
new file mode 100644
index 00000000000..adba60c99ec
--- /dev/null
+++ b/packages/ui-vue/components/radio-button/designer.ts
@@ -0,0 +1,38 @@
+
+
+/**
+ * Copyright (c) 2020 - present, Inspur Genersoft Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
+import RadioButton, { RadioButtonProps, radioButtonProps } from '@farris/ui-vue/components/radio-button';
+import FRadioButtonDesign from './src/designer/radio-button.design.component';
+import { withInstall } from '@farris/ui-vue/components/common';
+import { schemaMapper } from './src/schema/schema-mapper';
+import { schemaResolver } from './src/schema/schema-resolver';
+import radioButtonSchema from './src/schema/radio-button.schema.json';
+import propertyConfig from './src/property-config/radio-button.property-config.json';
+
+export const propsResolver = createPropsResolver<RadioButtonProps>(radioButtonProps, radioButtonSchema, schemaMapper, schemaResolver, propertyConfig);
+FRadioButtonDesign.register = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>, resolverMap: Record<string, any>) => {
+    componentMap['radio-button'] = RadioButton;
+    propsResolverMap['radio-button'] = propsResolver;
+};
+FRadioButtonDesign.registerDesigner = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>) => {
+    componentMap['radio-button'] = FRadioButtonDesign;
+    propsResolverMap['radio-button'] = propsResolver;
+};
+
+export { FRadioButtonDesign };
+export default withInstall(FRadioButtonDesign);
diff --git a/packages/ui-vue/components/radio-button/index.ts b/packages/ui-vue/components/radio-button/index.ts
index dc8d1cd6de5..b716a955e09 100644
--- a/packages/ui-vue/components/radio-button/index.ts
+++ b/packages/ui-vue/components/radio-button/index.ts
@@ -16,20 +16,9 @@
  * limitations under the License.
  */
 import RadioButton from './src/radio-button.component';
-import FRadioButtonDesign from './src/designer/radio-button.design.component';
-import { propsResolver } from './src/radio-button.props';
 import { withInstall } from '@farris/ui-vue/components/common';
 
 export * from './src/radio-button.props';
 
-RadioButton.register = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>, resolverMap: Record<string, any>) => {
-    componentMap['radio-button'] = RadioButton;
-    propsResolverMap['radio-button'] = propsResolver;
-};
-RadioButton.registerDesigner = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>) => {
-    componentMap['radio-button'] = FRadioButtonDesign;
-    propsResolverMap['radio-button'] = propsResolver;
-};
-
 export { RadioButton };
 export default withInstall(RadioButton);
diff --git a/packages/ui-vue/components/radio-button/src/radio-button.props.ts b/packages/ui-vue/components/radio-button/src/radio-button.props.ts
index bec83a7b36f..0276dba2f21 100644
--- a/packages/ui-vue/components/radio-button/src/radio-button.props.ts
+++ b/packages/ui-vue/components/radio-button/src/radio-button.props.ts
@@ -14,12 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-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 radioButtonSchema from './schema/radio-button.schema.json';
-import propertyConfig from './property-config/radio-button.property-config.json';
+import { ExtractPropTypes } from 'vue';
 
 export const radioButtonProps = {
     /**
@@ -36,5 +31,4 @@ export const radioButtonProps = {
     onSelectedValueChanged: { type: Function, default: () => { } }
 } as Record<string, any>;
 
-export type RadioButtonProps = ExtractPropTypes<typeof radioButtonProps>;
-export const propsResolver = createPropsResolver<RadioButtonProps>(radioButtonProps, radioButtonSchema, schemaMapper, schemaResolver, propertyConfig);
+export type RadioButtonProps = ExtractPropTypes<typeof radioButtonProps>;
\ No newline at end of file
-- 
Gitee


From 658a2b6120493556f87b3ec541c0d5e7f0bf7210 Mon Sep 17 00:00:00 2001
From: hyygzds <m15966339253@163.com>
Date: Wed, 13 Aug 2025 19:29:35 +0800
Subject: [PATCH 60/62] fix: remove unused feature

---
 .../components/data-grid/src/data-grid.component.tsx     | 9 ---------
 .../ui-vue/components/data-grid/src/data-grid.props.ts   | 2 --
 .../ui-vue/components/data-view/composition/types.ts     | 2 --
 3 files changed, 13 deletions(-)

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 c984f63818c..37988a98fff 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 17222c12595..2b9ac7a5aaf 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> | boolean>, default: () => true },
-    /** 变更策略  默认主动更新 */
-    changePolicy: { type: String as PropType<'default' | 'push'>, default: 'push' },
     /** 列集合 */
     columns: { type: Array<DataGridColumn>, default: [] },
     /** 列配置 */
diff --git a/packages/ui-vue/components/data-view/composition/types.ts b/packages/ui-vue/components/data-view/composition/types.ts
index 1ee573484cb..eeed1ecbdd9 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> | boolean);
     /** 单元格高度 */
     cellHeight: number;
-    /** 变更策略 */
-    changePolicy: string;
     /** 列集合 */
     columns: DataColumn[];
     /** 列配置 */
-- 
Gitee


From a46a84c37c77a0c1c00f0d60210f07e2c56ab2b0 Mon Sep 17 00:00:00 2001
From: hyygzds <m15966339253@163.com>
Date: Mon, 18 Aug 2025 15:44:01 +0800
Subject: [PATCH 61/62] fix: split dynamic form design

---
 .../ui-vue/components/capsule/designer.ts     | 22 +++++++++
 packages/ui-vue/components/capsule/index.ts   | 13 +-----
 .../components/capsule/src/capsule.props.ts   | 11 +----
 .../src/designer/capsule.design.component.tsx |  2 +-
 .../components/designer-canvas/index.ts       |  5 +-
 .../designer-canvas/src/components/maps.ts    |  6 +--
 .../components/dynamic-form/designer.ts       | 46 +++++++++++++++++++
 .../ui-vue/components/dynamic-form/index.ts   | 41 ++++-------------
 .../dynamic-form-group.design.component.tsx   |  3 +-
 .../dynamic-form-group.props.ts               |  8 ----
 .../dynamic-form-input.component.tsx          |  2 +-
 .../dynamic-form-input.props.ts               |  6 ---
 .../form-binding-resolver-design.ts           |  2 +-
 .../use-response-form-layout-setting.ts       |  2 +-
 .../composition/use-type-resolver-design.ts   |  4 +-
 .../src/composition/use-type-resolver.ts      |  2 +-
 .../designer/form-group.design.component.tsx  |  8 ++--
 ...response-form-layout-setting.component.tsx |  2 +-
 .../response-form-layout-setting.props.ts     |  3 +-
 .../response-form-use-designer-rules.ts       |  2 +-
 .../response-form.design.component.tsx        |  4 +-
 .../response-form.property-config.ts          |  4 +-
 .../dynamic-form/src/response-form.props.ts   |  8 +---
 .../schema/response-form-schema-resolver.ts   |  5 +-
 .../dynamic-view/src/components/maps.ts       |  6 +--
 .../response-layout-editor/designer.ts        | 24 ++++++++++
 .../response-layout-editor/index.ts           | 31 +++++--------
 .../column-width-editor.component.tsx         |  4 +-
 .../field-list/field-list.component.tsx       |  4 +-
 .../screen-resolution-selector.component.tsx  |  5 +-
 .../response-layout-editor-setting.props.ts   |  6 ---
 ...layout-editor-setting.design.component.tsx |  4 +-
 ...sponse-layout-editor-setting.component.tsx |  6 +--
 33 files changed, 159 insertions(+), 142 deletions(-)
 create mode 100644 packages/ui-vue/components/capsule/designer.ts
 create mode 100644 packages/ui-vue/components/dynamic-form/designer.ts
 create mode 100644 packages/ui-vue/components/response-layout-editor/designer.ts

diff --git a/packages/ui-vue/components/capsule/designer.ts b/packages/ui-vue/components/capsule/designer.ts
new file mode 100644
index 00000000000..3a93914b775
--- /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>(capsuleProps, capsuleSchema, schemaMapper, schemaResolver, propertyConfig);
+
+CapsuleDesign.register = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>) => {
+    componentMap.capsule = FCapsule;
+    propsResolverMap.capsule = propsResolver;
+};
+CapsuleDesign.registerDesigner = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>) => {
+    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 e28da7a6f47..f2856f0f9b3 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<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>) => {
-    componentMap.capsule = FCapsule;
-    propsResolverMap.capsule = propsResolver;
-};
-FCapsule.registerDesigner = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>) => {
-    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 d87c5e5c20f..de93917d7c8 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<typeof capsuleProps>;
 
-export type CapsuleItemProps = ExtractPropTypes<typeof capsuleItemProps>;
-
-export const propsResolver = createPropsResolver<CapsuleProps>(capsuleProps, capsuleSchema, schemaMapper, schemaResolver, propertyConfig);
+export type CapsuleItemProps = ExtractPropTypes<typeof capsuleItemProps>;
\ 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 5e111984034..3aa072d1b08 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/designer-canvas/index.ts b/packages/ui-vue/components/designer-canvas/index.ts
index 359395edb2a..e491a324a12 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 32562fac3e8..5cb006431a1 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 00000000000..7d72cf9f09d
--- /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<ResponseFormPropsType>(responseFormProps, formSchema, schemaMapper, reponseFormSchemaResolver);
+export const formGroupPropsResolver = createPropsResolver<DynamicFormGroupPropsType>(
+    dynamicFormGroupProps, formGroupSchema, schemaMapper, undefined
+);
+
+export const editorResolver = createFormGroupEditorResolver();
+
+export const formInputPropsResolver = createPropsResolver<DynamicFormInputProps>(
+    dynamicFormInputProps, formGroupSchema, schemaMapper, undefined
+);
+export { FResponseFormDesign };
+
+
+FResponseFormDesign.register = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>, resolverMap: Record<string, any>) => {
+    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<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>) => {
+    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 0737c950150..f4f80771a9e 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<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>, resolverMap: Record<string, any>): 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<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>): 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 65135641cd2..362ba8cdefa 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 d793be5543d..eb3a3e17198 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<typeof dynamicFormGroupProps>;
 
-export const formGroupPropsResolver = createPropsResolver<DynamicFormGroupPropsType>(
-    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 c1eebf79fcc..fa9f10dcbbb 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 ca1e683748b..59a5f9a1cf1 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<typeof dynamicFormInputProps>;
 
-export const formInputPropsResolver = createPropsResolver<DynamicFormInputProps>(
-    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 0a9ca047534..2927dc119f6 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 ee959f03bf4..b6ff72639e3 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 5a8aa7649eb..a84ab3488eb 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 be414bf64bd..9bb44af91e4 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 9b9a3d0e795..8a177b3b0dc 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 803bf3fe0ee..292f07ba640 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 e128c3fbd03..9f99fd617f9 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 982bd14f099..4b5bbdfaae0 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 d2656703b5a..d720bf27a7b 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 d46be9d044f..ec45320b6a4 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 22e5b011ad5..ac461ba7f50 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<string, any>;
 
-export type ResponseFormPropsType = ExtractPropTypes<typeof responseFormProps>;
-
-export const formPropsResolver = createPropsResolver<ResponseFormPropsType>(responseFormProps, formSchema, schemaMapper, reponseFormSchemaResolver);
+export type ResponseFormPropsType = ExtractPropTypes<typeof responseFormProps>;
\ 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 9f94324b052..6e2e1822f02 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 60e7246aeb6..220757e5bd8 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 00000000000..4c15bb8a791
--- /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>(responseLayoutEditorSettingProps, responseLayoutEditorSettingSchema, schemaMapper, schemaResolver, propertyConfig);
+
+export { useResponseLayoutEditorSetting };
+ResponseLayoutEditorSettingDesign.register = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>, resolverMap: Record<string, any>): void => {
+    componentMap['response-layout-editor-setting'] = ResponseLayoutEditorSetting;
+    propsResolverMap['response-layout-editor-setting'] = propsResolver;
+};
+ResponseLayoutEditorSettingDesign.registerDesigner = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>): 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 9a4232c0305..8e475bb072b 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<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>, resolverMap: Record<string, any>): void {
-        componentMap['response-layout-editor-setting'] = ResponseLayoutEditorSetting;
-        propsResolverMap['response-layout-editor-setting'] = propsResolver;
-    },
-    registerDesigner(componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>): 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 e1237dcfce3..26fe1b2bbf9 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 e668009895d..20e4ac0532b 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 49861f7e557..790f0f856f5 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 c5bddd848bc..19a17d16feb 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<string, any>;
 
 export type ResponseLayoutEditorSettingProps = ExtractPropTypes<typeof responseLayoutEditorSettingProps>;
-export const propsResolver = createPropsResolver<ResponseLayoutEditorSettingProps>(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 513856f7a59..1325e55f1c8 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 cc6711ff016..32d13141774 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';
 
-- 
Gitee


From a6e8d05e597d6156be0288f4f26211a015096684 Mon Sep 17 00:00:00 2001
From: hyygzds <m15966339253@163.com>
Date: Tue, 26 Aug 2025 11:55:07 +0800
Subject: [PATCH 62/62] build: split modal design

---
 .../dynamic-view/src/components/maps.ts       |  2 +-
 packages/ui-vue/components/modal/designer.ts  | 32 +++++++++++++++++++
 packages/ui-vue/components/modal/index.ts     |  7 ----
 .../modal/src/composition/modal.service.tsx   |  2 +-
 .../components/modal/src/modal.props.ts       |  9 ------
 .../property-config/modal.property-config.ts  |  2 +-
 6 files changed, 35 insertions(+), 19 deletions(-)
 create mode 100644 packages/ui-vue/components/modal/designer.ts

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 56d23617566..44d6bf5b360 100644
--- a/packages/ui-vue/components/dynamic-view/src/components/maps.ts
+++ b/packages/ui-vue/components/dynamic-view/src/components/maps.ts
@@ -70,7 +70,7 @@ import FExpressionEditor from '@farris/ui-vue/components/expression-editor';
 import FCodeEditor from '@farris/ui-vue/components/code-editor';
 import FHtmlTemplate from '@farris/ui-vue/components/html-template';
 import FCollectionPropertyEditor from '@farris/ui-vue/components/collection-property-editor';
-import FModal from '@farris/ui-vue/components/modal';
+import FModal from '@farris/ui-vue/components/modal/designer';
 import FExternalContainer from '@farris/ui-vue/components/external-container';
 import FLanguageTextbox from '@farris/ui-vue/components/language-textbox';
 
diff --git a/packages/ui-vue/components/modal/designer.ts b/packages/ui-vue/components/modal/designer.ts
new file mode 100644
index 00000000000..8af388bab50
--- /dev/null
+++ b/packages/ui-vue/components/modal/designer.ts
@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) 2020 - present, Inspur Genersoft Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import FModal, { ModalProps, modalProps } from '@farris/ui-vue/components/modal';
+import { createPropsResolver } from "@farris/ui-vue/components/dynamic-resolver";
+import modalSchema from './src/schema/modal.schema.json';
+import { schemaMapper } from './src/schema/schema-mapper';
+import { schemaResolver } from './src/schema/schema-resolver';
+import { createModalCallbackResolver } from './src/schema/callback-resolvers';
+export const propsResolver = createPropsResolver<ModalProps>(modalProps as any, modalSchema, schemaMapper, schemaResolver);
+export const callbackResolver = createModalCallbackResolver();
+
+export default {
+    register: (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>, resolverMap: Record<string, any>) => {
+        componentMap.modal = FModal;
+        propsResolverMap.modal = propsResolver;
+        resolverMap.modal = { callbackResolver };
+    }
+};
+
diff --git a/packages/ui-vue/components/modal/index.ts b/packages/ui-vue/components/modal/index.ts
index 3fd1ce1beaa..61109136b82 100644
--- a/packages/ui-vue/components/modal/index.ts
+++ b/packages/ui-vue/components/modal/index.ts
@@ -16,7 +16,6 @@
 import type { App, Plugin } from 'vue';
 import FModal from './src/modal.component';
 import FModalService from './src/composition/modal.service';
-import { propsResolver, callbackResolver } from './src/modal.props';
 import { ModalProperty } from './src/property-config/modal.property-config';
 
 export * from './src/composition/type';
@@ -33,11 +32,5 @@ FModal.install = (app: App) => {
     app.provide('FModalService', modalInstance);
 };
 
-FModal.register = (componentMap: Record<string, any>, propsResolverMap: Record<string, any>, configResolverMap: Record<string, any>, resolverMap: Record<string, any>) => {
-    componentMap.modal = FModal;
-    propsResolverMap.modal = propsResolver;
-    resolverMap.modal = { callbackResolver };
-};
-
 export { FModal, FModalService, ModalProperty };
 export default FModal as typeof FModal & Plugin;
diff --git a/packages/ui-vue/components/modal/src/composition/modal.service.tsx b/packages/ui-vue/components/modal/src/composition/modal.service.tsx
index 710d76204ba..5c1a03610e5 100644
--- a/packages/ui-vue/components/modal/src/composition/modal.service.tsx
+++ b/packages/ui-vue/components/modal/src/composition/modal.service.tsx
@@ -1,7 +1,7 @@
 import { ref, h, render, VNode, cloneVNode, shallowRef, nextTick, App, AppContext, createApp, onUnmounted, onMounted, computed } from "vue";
+import { LocaleService } from "@farris/ui-vue/components/locale";
 import { ModalFunctions, ModalOptions } from "./type";
 import FModal from '../modal.component';
-import { LocaleService } from "@farris/ui-vue/components/locale";
 // import FarrisPlugin from '../../../plugin';
 
 function getContentRender(props: ModalOptions) {
diff --git a/packages/ui-vue/components/modal/src/modal.props.ts b/packages/ui-vue/components/modal/src/modal.props.ts
index 281645a4273..92272db8460 100644
--- a/packages/ui-vue/components/modal/src/modal.props.ts
+++ b/packages/ui-vue/components/modal/src/modal.props.ts
@@ -14,12 +14,7 @@
  * limitations under the License.
  */
 import { ExtractPropTypes, PropType } from 'vue';
-import { createPropsResolver } from "@farris/ui-vue/components/dynamic-resolver";
 import { ModalButton } from './composition/type';
-import modalSchema from './schema/modal.schema.json';
-import { schemaMapper } from './schema/schema-mapper';
-import { schemaResolver } from './schema/schema-resolver';
-import { createModalCallbackResolver } from './schema/callback-resolvers';
 
 export type DragHandleType = HTMLElement | string;
 
@@ -106,7 +101,3 @@ export const modalProps = {
 };
 
 export type ModalProps = Partial<ExtractPropTypes<typeof modalProps>>;
-
-export const propsResolver = createPropsResolver<ModalProps>(modalProps as any, modalSchema, schemaMapper, schemaResolver);
-
-export const callbackResolver = createModalCallbackResolver();
diff --git a/packages/ui-vue/components/modal/src/property-config/modal.property-config.ts b/packages/ui-vue/components/modal/src/property-config/modal.property-config.ts
index d4669ba1188..4d61c8bca67 100644
--- a/packages/ui-vue/components/modal/src/property-config/modal.property-config.ts
+++ b/packages/ui-vue/components/modal/src/property-config/modal.property-config.ts
@@ -1,4 +1,4 @@
-import { BaseControlProperty } from "../../../property-panel";
+import { BaseControlProperty } from "@farris/ui-vue/components/property-panel";
 import { ModalEvents } from "./modal-events";
 export class ModalProperty extends BaseControlProperty {
     private numberEditor = {
-- 
Gitee