diff --git a/packages/ui-vue/components/binding-selector/src/composition/use-field-selection.ts b/packages/ui-vue/components/binding-selector/src/composition/use-field-selection.ts
index 5cc84ebc9b2f924c0bbfe2bcce21f2ed8274805a..e091e10caf810d089c401516fd1ec37c08faea3e 100644
--- a/packages/ui-vue/components/binding-selector/src/composition/use-field-selection.ts
+++ b/packages/ui-vue/components/binding-selector/src/composition/use-field-selection.ts
@@ -2,7 +2,7 @@ import { FNotifyService } from "../../../notify";
 import { FormBindingType, SchemaDOMMapping } from "@farris/ui-vue/components/property-panel";
 import { merge } from "lodash-es";
 import { BindingSelectorProps } from "../binding-selector.props";
-import { FormSchemaEntityField$Type } from "../../../common";
+import { FormSchemaEntityField$Type } from "@farris/ui-vue/components/common";
 
 export function useFieldSelection(props: BindingSelectorProps) {
 
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 b0edd56c4673e68ec59bef22c9a452f29e1283ac..ceac70d854348295c41135de578ca6596ced7d46 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
@@ -15,7 +15,7 @@
  */
 import { ExtractPropTypes, PropType } from 'vue';
 import { Checkbox } from './composition/types';
-import { radioCheckboxCommonProps } from '../../common/radio-checkbox/radio-checkbox.props';
+import { radioCheckboxCommonProps } from '@farris/ui-vue/components/common';
 
 export const checkboxGroupProps = {
     ...radioCheckboxCommonProps,
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 62e087adc00c5357c96b795b06f2791551c96b1a..32016168b81d519576a22a3bffe0e00c5c0033d2 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,4 +1,4 @@
-import { FormSchemaEntityFieldType$Type } from "../../../common";
+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";
 export class ComboListProperty extends InputBaseProperty {
diff --git a/packages/ui-vue/components/common/index.ts b/packages/ui-vue/components/common/index.ts
index a5da58679e298d197d977aa7144ac0112ba3e6a7..52829d9466fad891951208a16b5af1725c3a9afb 100644
--- a/packages/ui-vue/components/common/index.ts
+++ b/packages/ui-vue/components/common/index.ts
@@ -22,6 +22,7 @@ export * from './entity/entity-schema';
 export * from './utils/use-array-processor';
 export * from './utils/use-common-utils';
 export * from './utils/use-delayed-ref';
+export { default as areaResponseDirective } from './directive/area-response';
 
 export default {
     install(app: App): void {
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 69fe4e9974db2541b99ad5150359d2a81e68b793..ed1d952f43cc903c552d6480cea2faa8387c8103 100644
--- a/packages/ui-vue/components/common/radio-checkbox/use-check.ts
+++ b/packages/ui-vue/components/common/radio-checkbox/use-check.ts
@@ -1,15 +1,11 @@
-import { computed, ref, SetupContext, watch } from 'vue';
+import { computed, ExtractPropTypes, ref, SetupContext, watch } from 'vue';
 import { isUndefined } from 'lodash-es';
-import { useGuid } from '@farris/ui-vue/components/common';
-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';
+import { useGuid } from '../utils/use-guid';
 
 export function useCheck(
-    props: CheckboxProps | RadioProps,
+    props: any,
     context: SetupContext,
-    parentProps: CheckboxGroupProps | RadioGroupProps,
+    parentProps: any,
     parentContext: SetupContext,
 ) {
     const { guid } = useGuid();
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 567cb056c45e35c450b4150e6bfa6a1bd1091363..0ee33d3f022ae57322a11f32c2b7ab0c1c1480d5 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,4 +1,4 @@
-import { DesignViewModelField } from "../../../common";
+import { DesignViewModelField } from "@farris/ui-vue/components/common";
 import { DesignerHostService, DgControl } from "../../../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 879dc40a2cb8f103bff5907ef23680ebe7548790..e3270aae32d66dc58efbb1505b76dd434d142fba 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,4 +1,4 @@
-import { FormSchemaEntity } from "../../../common/entity/entity-schema";
+import { FormSchemaEntity } from "@farris/ui-vue/components/common";
 import { DesignerComponentInstance } from "../../../designer-canvas";
 
 
diff --git a/packages/ui-vue/components/condition/src/condition-fields.design.component.tsx b/packages/ui-vue/components/condition/src/condition-fields.design.component.tsx
index f3e851e269a01cc53833ef52c16f0366e436e3dd..0378f43341e8accb98e8b80d86253a8615cc27c7 100644
--- a/packages/ui-vue/components/condition/src/condition-fields.design.component.tsx
+++ b/packages/ui-vue/components/condition/src/condition-fields.design.component.tsx
@@ -20,7 +20,7 @@
  import FFormGroupDesign from '../../dynamic-form/src/designer/form-group.design.component';
  import { useFieldConfig } from './composition/use-field-config';
  import { useSize } from './composition/use-size';
- import areaResponseDirective from '../../common/directive/area-response';
+ import { areaResponseDirective } from '@farris/ui-vue/components/common';
  
  export default defineComponent({
      name: 'FConditionFieldsDesign',
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 57608c8c45b9ff2266f0d3e063cd36609b524f77..308f7d2ce29861b950290a5ff87bace796ac0ba4 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
@@ -3,7 +3,7 @@ import { ContentContainerPropsType, contentContainerProps } from '../content-con
 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 '../../../common';
+import { getCustomClass } from '@farris/ui-vue/components/common';
 import { DesignerHostService } from '../../../designer-canvas/src/composition/types';
 export default defineComponent({
     name: 'FContentContainerDesign',
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 887da02505867363f058287bc20481711e31bb69..99db8e05f1e0e3ff6b4c25a059ca1f9ba8b541e0 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
@@ -2,10 +2,10 @@ import { DesignerHostService } from '../../../designer-canvas/src/composition/ty
 import { DynamicResolver } from '../../../../components/dynamic-resolver';
 import { ComponentBuildInfo } from '../../../component/src/composition/inner-component-build-info';
 import { ComponentSchema } from '../../../../components/designer-canvas';
-import { FormSchemaEntityField$Type, FormSchemaEntityFieldTypeName } from '../../../common/entity/entity-schema';
+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 '../../../common';
+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/data-grid.component.tsx b/packages/ui-vue/components/data-grid/src/data-grid.component.tsx
index 2023748dc74ac727966a3e05f57afe4afce40a92..266beab2ce07e19e8a124f7f0578940fc1237c04 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
@@ -304,7 +304,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,
@@ -314,7 +314,7 @@ export default defineComponent({
                                 previousRow
                             );
                     } else {
-                        // 修改单元格对象
+                        // update visual cell
                         useVisualDataCellComposition.updateCellByColumn(
                             visibleData.data[column.field], column, previousRow, visibleData.raw);
                     }
@@ -340,8 +340,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();
                 }
@@ -427,7 +427,7 @@ export default defineComponent({
         }
 
         function scrollToRowById() {
-            
+
         }
 
         const dataGridComponentInstance = {
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 a288ac5b5fb1857ffdfc8b531283ae7a7fb27a12..4f8845325fc502f0bcdefc3f53fb94b2c311ae47 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
@@ -93,6 +93,7 @@ export default function (
             <div
                 class="fv-grid-header-cell"
                 style={headerCellPosition(headerCell, columnIndex)}>
+                {headerCell.column?.editor?.required && <span class="text-danger">*</span>}
                 <FDesignerItem v-model={columnSchema.value} customClass={getHeaderClass(headerCell)}
                     canAdd={false}
                     canDelete={false}
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 33b179ce9b49b53ec2d32f7b3a700b37fb5979d4..aef1a053147260a21fd39f4dd12f09bf8c19cfab 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
@@ -35,7 +35,9 @@ export default defineComponent({
             const titleStyle = isValidBinding ? '' : 'color:red';
             return <>
                 {isValidBinding ? '' : <span class="f-icon f-icon-warning mr-1" style="color: red; min-width: 16px;" title={inValidTip}></span>}
-                <span class="fv-column-title" style={titleStyle} ref={columnRef} onClick={(event) => clickHandler(event)}>{props.title}</span>
+                <span class="fv-column-title" style={titleStyle} ref={columnRef} onClick={(event) => clickHandler(event)}>
+                    {props.title}
+                </span>
             </>;
         };
     }
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 c655fab9f21aa7ee7ab23255e9d4695cf296dbc2..cc5494e8ddda137717976dc53eeb0e86c5864bda 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
@@ -15,7 +15,7 @@ import { RadioGroupProperty } from '../../../radio-group/src/property-config/rad
 import { SwitchProperty } from '../../../switch/src/property-config/switch.property-config';
 import { TimePickerProperty } from '../../../time-picker/src/property-config/time-picker.property-config';
 import { SchemaDOMMapping } from '../../../property-panel/src/composition/entity/schema-dom-mapping';
-import { FormSchemaEntityField$Type } from '../../../common';
+import { FormSchemaEntityField$Type } from '@farris/ui-vue/components/common';
 
 export class DataGriColumnProperty extends BaseControlProperty {
     constructor(componentId: string, designerHostService: any) {
@@ -30,6 +30,7 @@ export class DataGriColumnProperty extends BaseControlProperty {
         this.propertyConfig.categories['behavior'] = this.getBehaviorConfig(propertyData, 'gridFieldEditor');
         // 编辑器
         this.getFieldEditorProperties(propertyData, gridData);
+        this.propertyConfig.categories['template'] = this.getTemplateProperties(propertyData);
 
         return this.propertyConfig;
     }
@@ -107,6 +108,25 @@ export class DataGriColumnProperty extends BaseControlProperty {
             this.getFieldEditorProp(propertyData);
         }
     }
+
+    private getTemplateProperties(propertyData: any) {
+        return {
+            title: '模板',
+            description: '',
+            properties: {
+                formatter: {
+                    title: 'column formatter',
+                    type: 'string',
+                    description: '自定义模板',
+                    refreshPanelAfterChanged: true,
+                    editor: {
+                        type: "code-editor",
+                        language: "html",
+                    },
+                },
+            }
+        };
+    }
     /**
      * 列编辑器属性
      * @param propertyData 列属性值
diff --git a/packages/ui-vue/components/data-grid/src/property-config/data-grid.property-config.ts b/packages/ui-vue/components/data-grid/src/property-config/data-grid.property-config.ts
index a78d8d4744198253fea3fcca0aa378e871835a4b..3dfde33f80c8c7cba522c1528de5eab8158443e1 100644
--- a/packages/ui-vue/components/data-grid/src/property-config/data-grid.property-config.ts
+++ b/packages/ui-vue/components/data-grid/src/property-config/data-grid.property-config.ts
@@ -1,6 +1,6 @@
 import { PropertyChangeObject } from "../../../property-panel/src/composition/entity/property-entity";
 import { BaseControlProperty } from "../../../property-panel/src/composition/entity/base-property";
-import { FormSchemaEntity } from "../../../common/entity/entity-schema";
+import { FormSchemaEntity } from "@farris/ui-vue/components/common";
 
 export class DataGridProperty extends BaseControlProperty {
 
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 f99306cfbbefec993e8eb8e88ee5b096ed94d9db..1b393904a187152211592c1623459d9390dcc5b7 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
@@ -71,8 +71,16 @@ export default function (
         toggleTreeNode(visualData);
     }
 
+    function onDblclick(payload: MouseEvent) {
+        payload.stopPropagation();
+    }
+
     function renderTreeNodeCellToggleIcon(visualData: VisualData, cell: VisualDataCell) {
-        return <div class={treeNodeIconClass(visualData, cell)} onClick={(payload: MouseEvent) => onClickToggleIcon(payload, visualData)}></div>;
+        return <div 
+                    class={treeNodeIconClass(visualData, cell)} 
+                    onClick={(payload: MouseEvent) => onClickToggleIcon(payload, visualData)}
+                    onDblclick={onDblclick}
+                ></div>;
     }
 
     function renderTreeNodeCellIcon(visualData: VisualData, cell: VisualDataCell) {
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 6f00d78236ac6265f65d0ca6fa6c9201c601fbe7..4e7b1752bde772a265b0716122587e6dee932d2e 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
@@ -96,7 +96,7 @@ export function useDataView(
         if (shouldGroupingData.value) {
             totalData.value = generateGroupData(groupFields.value, originalData.value, columnMaps);
         }
-        totalItems.value = totalData.value.length;
+        // totalItems.value = totalData.value.length;
         summaries = groupSummaryFields.value.reduce((sumaries: Map<string, number>, summaryField: string) => {
             sumaries.set(summaryField, 0);
             return sumaries;
diff --git a/packages/ui-vue/components/data-view/composition/use-edit.tsx b/packages/ui-vue/components/data-view/composition/use-edit.tsx
index 1a9bc3bef1cd78bafb1301508f13e095af956a1b..c36400fb9274cc4b922dd97176543926e07ff406 100644
--- a/packages/ui-vue/components/data-view/composition/use-edit.tsx
+++ b/packages/ui-vue/components/data-view/composition/use-edit.tsx
@@ -158,7 +158,7 @@ export function useEdit(
     }
 
 
-    function allowBeginEditCell(row: VisualData, cell: VisualDataCell, column: DataColumn) {
+    function allowBeginEditCell(row: VisualData, cell: VisualDataCell, column: DataColumn): Promise<void> {
         return Promise.resolve()
             .then(() => {
                 if (isUndefined(props.beforeEditCell)) {
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 dc7d7bc26783f1ca964c3722ffaa9a257814d883..215c8157ed94fd9d3bf1f0483d8d35ca398bba69 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
@@ -116,6 +116,7 @@ export function useVisualDataCell(
         targetCell.column = column;
         targetCell.align = column.align || 'left';
         targetCell.valign = column.valign || 'middle';
+        targetCell.mode = column.readonly ? CellMode.readonly : CellMode.editable;
     }
 
     function updateCellByColumn(cell: VisualDataCell, column: DataColumn, preVisualData: VisualData, dataItem: any): void {
diff --git a/packages/ui-vue/components/data-view/composition/visualization/use-visual-data-row.ts b/packages/ui-vue/components/data-view/composition/visualization/use-visual-data-row.ts
index 091ba80f91dbb5657fb84800184b729bf6b10da0..2fe09578118fe899dafce4127eb190bbcc1592ac 100644
--- a/packages/ui-vue/components/data-view/composition/visualization/use-visual-data-row.ts
+++ b/packages/ui-vue/components/data-view/composition/visualization/use-visual-data-row.ts
@@ -101,7 +101,7 @@ export function useVisualDataRow(
     function createNewRowFromDataItem(columns: DataColumn[], dataItem: any, preDataItem: any, preRow: VisualData, rowIndex: number, top: number) {
         const currentRow = createEmptyRow(VisualDataType.data, rowIndex, dataItem, preDataItem, preRow, top);
         columns.forEach((column: DataColumn, columnIndex: number) => {
-            currentRow.data[column.field] = createCellByColumn(column, rowIndex, dataItem, currentRow, preRow);
+            currentRow.data[column.field] = createCellByColumn(column, columnIndex, dataItem, currentRow, preRow);
         });
         return currentRow;
     }
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 f6465e7bbe99f5fbf52b984cacdb63b92a2291b7..fcbf74198ee81673039d2a70480704c70b0c8725 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
@@ -31,7 +31,7 @@ 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 { useDateFormat } from '@farris/ui-vue/components/common';
 import { CalenderDayItem } from "../../types/calendar";
 import { cloneDeep } from "lodash-es";
 
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 56b51448daca79c81494b3eff91e49b91afd4b15..0bfbd908b11c07e21607a74040986c5ac7b79e37 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
@@ -4,7 +4,7 @@ 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";
+import { useDateFormat } from "@farris/ui-vue/components/common";
 
 export default defineComponent({
     name: 'FDateRange',
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 edb255b2ad8b66a6e79af36d106ef2937e00d016..5ad1e9602985209eec5ef32b1c099d25c87b7c05 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,5 +1,3 @@
-import { FormSchemaEntityFieldTypeName } from "../../../common";
-import { FormPropertyChangeObject } from "../../../property-panel";
 import { InputBaseProperty } from "../../../property-panel/src/composition/entity/input-base-property";
 import { DATE_FORMATS } from "./date-format";
 
diff --git a/packages/ui-vue/components/designer-canvas/index.ts b/packages/ui-vue/components/designer-canvas/index.ts
index c9a29f5d7a6f2aa5ee5c7235f0acba408544ab61..6dffa2af98907bb959f8fec6b270ea26d10652c4 100644
--- a/packages/ui-vue/components/designer-canvas/index.ts
+++ b/packages/ui-vue/components/designer-canvas/index.ts
@@ -6,6 +6,9 @@ import type { DesignerHostService, UseDesignerRules, DesignerHTMLElement } from
 export * from './src/composition/props/designer-canvas.props';
 export * from './src/composition/function/use-designer-component';
 export * from './src/composition/function/use-designer-inner-component';
+export * from './src/composition/rule/use-template-rule';
+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 };
diff --git a/packages/ui-vue/components/designer-canvas/src/composition/function/drag-resolve.tsx b/packages/ui-vue/components/designer-canvas/src/composition/function/drag-resolve.tsx
index 37ff92c7332123eb0b59e55c6e1d1a17e2a2db1d..4ead40183e4be989919063444bff989f8b0d2788 100644
--- a/packages/ui-vue/components/designer-canvas/src/composition/function/drag-resolve.tsx
+++ b/packages/ui-vue/components/designer-canvas/src/composition/function/drag-resolve.tsx
@@ -2,7 +2,7 @@ import { ModalFunctions } from "../../../../modal/src/composition/type";
 import { ComponentBindingSourceContext, DesignerHostService, DesignerHTMLElement, DraggingResolveContext } from "../types";
 import EntityBindingSelectorComponent from '../../../../entity-binding-selector/entity-binding-selector.component';
 import { FBindingSelectorContainer as BindingSelectorComponent } from "@farris/ui-vue/components/binding-selector";
-import { DesignViewModelField, FormVariable } from "../../../../common/entity/entity-schema";
+import { DesignViewModelField, FormVariable } from "@farris/ui-vue/components/common";
 import { merge } from "lodash-es";
 import { DesignerComponentInstance } from "../../types";
 import { DgControl } from "../dg-control";
diff --git a/packages/ui-vue/components/designer-canvas/src/composition/types.ts b/packages/ui-vue/components/designer-canvas/src/composition/types.ts
index 40b21754443b9bf27223ab894865b169a70df00b..4861b5b0acab3259faf2d94f85b8d5097c3d07a0 100644
--- a/packages/ui-vue/components/designer-canvas/src/composition/types.ts
+++ b/packages/ui-vue/components/designer-canvas/src/composition/types.ts
@@ -1,4 +1,4 @@
-import { DesignFormVariable, DesignViewModelField, FormSchemaEntity, FormSchemaEntityField } from "../../../common/entity/entity-schema";
+import { DesignFormVariable, DesignViewModelField, FormSchemaEntity, FormSchemaEntityField } from "@farris/ui-vue/components/common";
 import { Ref } from "vue";
 import { ComponentSchema, DesignerComponentButton, DesignerComponentInstance, DesignerItemContext } from "../types";
 
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 f2631120d74d0b52a5788092fc63ed58d11cc5d1..66860ea7b2ca50d3a425acd4c9f8156731c49232 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
@@ -13,8 +13,8 @@ export const dynamicFormGroupProps = {
     /** 筛选组件配置器，具体配置项可查看各组件文档 */
     editor: { type: Object as PropType<EditorConfig>, default: {} },
     label: { type: String, default: '' },
-    /** 组件值 */
-    modelValue: { type: [String, Boolean, Array, Number], default: '' },
+    /** value is uncertain because type is uncertain, default value should not be set */ 
+    modelValue: { type: [String, Boolean, Array, Number] },
     // readonly: { type: Boolean, default: false },
     visible: { type: Boolean, default: true },
     required: { type: Boolean, default: false },
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 296ef9ed7657279978d3ede36021c65900dc636e..1a4dcd986fa0f382dda1b9777eee730209a65c0a 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
@@ -3,7 +3,7 @@ import { DesignerHostService } from '../../../designer-canvas/src/composition/ty
 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 '../../../common/entity/entity-schema';
+import { FormSchemaEntityFieldTypeName } from '@farris/ui-vue/components/common';
 import { cloneDeep } from 'lodash-es';
 
 const ROOT_VIEW_MODEL_ID = 'root-viewmodel';
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 7974a306dcf016188a0c4c3d4cd453244e83ea01..a7ca0c430ff2a80f4e906fea403d884b0750cf48 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
@@ -3,7 +3,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 { useDesignerRules } from './response-form-use-designer-rules';
-import areaResponseDirective from '../../../common/directive/area-response';
+import { areaResponseDirective } from '@farris/ui-vue/components/common';
 import { DesignerHostService } from '../../../designer-canvas/src/composition/types';
 
 export default defineComponent({
diff --git a/packages/ui-vue/components/entity-binding-selector/composition/use-entity-tree.ts b/packages/ui-vue/components/entity-binding-selector/composition/use-entity-tree.ts
index 55abe69d2aa4e7703cfb45d535fbba0d7e6cdce3..37183ac33772ee1dd890d6dbd956aae64a518233 100644
--- a/packages/ui-vue/components/entity-binding-selector/composition/use-entity-tree.ts
+++ b/packages/ui-vue/components/entity-binding-selector/composition/use-entity-tree.ts
@@ -1,4 +1,4 @@
-import { FormSchemaEntity } from "../../common/entity/entity-schema";
+import { FormSchemaEntity } from "@farris/ui-vue/components/common";
 import { cloneDeep } from "lodash-es";
 import { EntityBindingSelectorProps } from "../entity-binding-selector.props";
 import { ref } from "vue";
diff --git a/packages/ui-vue/components/entity-binding-selector/composition/use-field-tree.ts b/packages/ui-vue/components/entity-binding-selector/composition/use-field-tree.ts
index 765cb81070e80b16c365edb45e028f8610cd1d9e..f33dec453151a6ed98c766827184c1512cf58bec 100644
--- a/packages/ui-vue/components/entity-binding-selector/composition/use-field-tree.ts
+++ b/packages/ui-vue/components/entity-binding-selector/composition/use-field-tree.ts
@@ -1,4 +1,4 @@
-import { FormSchemaEntity, FormSchemaEntityField } from "../../common/entity/entity-schema";
+import { FormSchemaEntity, FormSchemaEntityField } from "@farris/ui-vue/components/common";
 import { cloneDeep } from "lodash-es";
 import { EntityBindingSelectorProps } from "../entity-binding-selector.props";
 import { ref } from "vue";
diff --git a/packages/ui-vue/components/events-editor/src/components/combine-form/select-parameter.component.tsx b/packages/ui-vue/components/events-editor/src/components/combine-form/select-parameter.component.tsx
index c15445adaaf16c4900ae343b08cd326ad8223f3b..c732e4efdd30e72f5dfbca1deac0d59dc42a2d40 100644
--- a/packages/ui-vue/components/events-editor/src/components/combine-form/select-parameter.component.tsx
+++ b/packages/ui-vue/components/events-editor/src/components/combine-form/select-parameter.component.tsx
@@ -1,7 +1,7 @@
 import { FDynamicFormGroup } from "../../../../dynamic-form";
 import { SetupContext, defineComponent, ref, inject, computed, onMounted, watch, Ref } from "vue";
 import { combineFormProps, CombineFormProps } from './combine-form.props';
-import { useGuid } from "../../../../common";
+import { useGuid } from "@farris/ui-vue/components/common";
 import { VisualData } from "../../../../data-view";
 import { Communication } from "../../types";
 
diff --git a/packages/ui-vue/components/events-editor/src/components/combine-form/use-communication.ts b/packages/ui-vue/components/events-editor/src/components/combine-form/use-communication.ts
index 3fd5675fa8617acd4b0b114094cd002e04348811..19964998eb4dd44393a6e7ceadd30d4769889cc1 100644
--- a/packages/ui-vue/components/events-editor/src/components/combine-form/use-communication.ts
+++ b/packages/ui-vue/components/events-editor/src/components/combine-form/use-communication.ts
@@ -1,4 +1,4 @@
-import { useGuid } from "../../../../common";
+import { useGuid } from "@farris/ui-vue/components/common";
 import { ref } from "vue";
 import { Communication, InteractionItem } from "../../types";
 import { CombineFormProps } from "./combine-form.props";
diff --git a/packages/ui-vue/components/external-container/src/designer/external-container.design.component.tsx b/packages/ui-vue/components/external-container/src/designer/external-container.design.component.tsx
index 2c06d7d1f6f3d965e6d7f0818fe8cfb14b4d466e..9cc280f98baddd36d96fc4732d01f3175f7143c9 100644
--- a/packages/ui-vue/components/external-container/src/designer/external-container.design.component.tsx
+++ b/packages/ui-vue/components/external-container/src/designer/external-container.design.component.tsx
@@ -1,12 +1,9 @@
-import { defineComponent, inject, ref, onMounted, computed, watch, createApp } from 'vue';
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
-import FDesignerItem from '../../../designer-canvas/src/components/designer-item.component';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
+import { defineComponent, inject, ref, onMounted, computed, watch } from 'vue';
+import { FDesignerItem, DesignerItemContext, DesignerHostService, useDesignerComponent } from '@farris/ui-vue/components/designer-canvas';
+import { FLoadingService } from '@farris/ui-vue/components/loading';
 import { externalContainerProps, ExteranlContainerPropsType } from '../external-container.props';
 import { useDesignerRules } from './use-designer-rules';
 import FImportExternalSchema from './import-external-schema.component';
-import { DesignerHostService } from '../../../designer-canvas/src/composition/types';
-import { FLoadingService } from '../../../loading';
 
 export default defineComponent({
     name: 'FExternalContainerDesign',
diff --git a/packages/ui-vue/components/external-container/src/designer/import-external-schema.component.tsx b/packages/ui-vue/components/external-container/src/designer/import-external-schema.component.tsx
index 04537c96d5d06ae4582fa9297d7a2f5db41c8704..996e0f09649b6773ff2f38bb3546e9694f3da419 100644
--- a/packages/ui-vue/components/external-container/src/designer/import-external-schema.component.tsx
+++ b/packages/ui-vue/components/external-container/src/designer/import-external-schema.component.tsx
@@ -1,10 +1,10 @@
 import { defineComponent, inject, ref } from 'vue';
+import { ModalFunctions } from "@farris/ui-vue/components/modal";
+import { DesignerHostService } from "@farris/ui-vue/components/designer-canvas";
+import { FSchemaSelector } from '@farris/ui-vue/components/schema-selector';
+import { FormSchemaRepositorySymbol } from '@farris/ui-vue/components/common';
+import { FNotifyService } from '@farris/ui-vue/components/notify';
 import './import-external-schema.css';
-import { ModalFunctions } from "../../../modal/src/composition/type";
-import { DesignerHostService } from "../../../designer-canvas/src/composition/types";
-import { FSchemaSelector } from '../../../schema-selector';
-import { FormSchemaRepositorySymbol } from '../../../common';
-import { FNotifyService } from '../../../notify';
 
 export default defineComponent({
     name: 'FImportExteranlSchema',
diff --git a/packages/ui-vue/components/external-container/src/designer/use-designer-rules.ts b/packages/ui-vue/components/external-container/src/designer/use-designer-rules.ts
index 292b869906111c920fe42315a16b24efb5b88865..7f65a60b65dbd33939b469f9c25a462e359d56f6 100644
--- a/packages/ui-vue/components/external-container/src/designer/use-designer-rules.ts
+++ b/packages/ui-vue/components/external-container/src/designer/use-designer-rules.ts
@@ -1,5 +1,4 @@
-import { DesignerHostService, UseDesignerRules } from "../../../designer-canvas/src/composition/types";
-import { ComponentSchema, DesignerItemContext } from "../../../designer-canvas/src/types";
+import { DesignerHostService, UseDesignerRules, ComponentSchema, DesignerItemContext } from "@farris/ui-vue/components/designer-canvas";
 import { ExternalContainerProperty } from "../property-config/external-container.property-config";
 
 export function useDesignerRules(designItemContext: DesignerItemContext, designerHostService?: DesignerHostService): UseDesignerRules {
diff --git a/packages/ui-vue/components/external-container/src/external-container.props.ts b/packages/ui-vue/components/external-container/src/external-container.props.ts
index 22ae54f12c175b34cf67e472380f5c7f1647b2ac..989e624e9c18ea56d794e62db07f4345b8c60fa3 100644
--- a/packages/ui-vue/components/external-container/src/external-container.props.ts
+++ b/packages/ui-vue/components/external-container/src/external-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 { schemaResolver } from './schema/schema-resolver';
 import externalContainerSchema from './schema/external-container.schema.json';
diff --git a/packages/ui-vue/components/external-container/src/property-config/external-container.property-config.ts b/packages/ui-vue/components/external-container/src/property-config/external-container.property-config.ts
index cbbc25c53c65bf6f189c8fb523f5eb411e0ae465..3e711af4009644277eb40e8c7051eabfc998325e 100644
--- a/packages/ui-vue/components/external-container/src/property-config/external-container.property-config.ts
+++ b/packages/ui-vue/components/external-container/src/property-config/external-container.property-config.ts
@@ -1,10 +1,10 @@
 
-import { FormSchemaRepositorySymbol } from "../../../../components/common";
+import { inject } from "vue";
+import { FormSchemaRepositorySymbol } from "@farris/ui-vue/components/common";
 import { DesignerComponentInstance } from "@farris/ui-vue/components/designer-canvas";
-import { BaseControlProperty } from "../../../../components/property-panel/src/composition/entity/base-property";
+import { BaseControlProperty } from "@farris/ui-vue/components/property-panel";
+import { FLoadingService } from "@farris/ui-vue/components/loading";
 import { externalContainerConverter } from "./external-container.converter";
-import { inject } from "vue";
-import { FLoadingService } from "../../../../components/loading";
 
 export class ExternalContainerProperty extends BaseControlProperty {
 
diff --git a/packages/ui-vue/components/external-container/src/schema/schema-mapper.ts b/packages/ui-vue/components/external-container/src/schema/schema-mapper.ts
index bc768d5bab9395cbd5d4faa5f1d2f86552f57980..bbc05c95ac2e8512ba07d52b13837a16aa16a60c 100644
--- a/packages/ui-vue/components/external-container/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/external-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/external-container/src/schema/schema-resolver.ts b/packages/ui-vue/components/external-container/src/schema/schema-resolver.ts
index 6bc4ed7217fbb7d5cf7b7a4ed8e1c84e1adf1852..e4854b4da0e6e5ebb6218ef0ca1a3f2531f97755 100644
--- a/packages/ui-vue/components/external-container/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/external-container/src/schema/schema-resolver.ts
@@ -1,5 +1,5 @@
-import { DesignerComponentInstance, DesignerHostService, DgControl } from "../../../designer-canvas";
-import { DynamicResolver } from "../../../dynamic-resolver";
+import { DesignerComponentInstance, DesignerHostService, DgControl } from "@farris/ui-vue/components/designer-canvas";
+import { type DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver";
 
 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/field-selector/src/components/field-selector-container.component.tsx b/packages/ui-vue/components/field-selector/src/components/field-selector-container.component.tsx
index 43570b59193cf15ea6726e98001d69f331021ef0..bb2752dbd52fb4c6e5def3d43a77767254094632 100644
--- a/packages/ui-vue/components/field-selector/src/components/field-selector-container.component.tsx
+++ b/packages/ui-vue/components/field-selector/src/components/field-selector-container.component.tsx
@@ -1,8 +1,8 @@
 import { defineComponent, ref, watch } from "vue";
+import { FTreeGrid } from '@farris/ui-vue/components/tree-grid';
+import { RowOptions, VisualData } from "@farris/ui-vue/components/data-view";
+import { FormSchemaEntityField$Type } from "@farris/ui-vue/components/common";
 import { FieldSelectorProps, fieldSelectorProps } from "../field-selector.props";
-import { FTreeGrid } from '../../../tree-grid';
-import { RowOptions, VisualData } from "../../../data-view";
-import { FormSchemaEntityField$Type } from "../../../common/entity/entity-schema";
 
 export default defineComponent({
     name: 'FFieldSelectorContainer',
diff --git a/packages/ui-vue/components/field-selector/src/field-selector.component.tsx b/packages/ui-vue/components/field-selector/src/field-selector.component.tsx
index cdc6cd93070081bb17f9bd07d3355d3af12f166d..d84c047b8551c21e1656060efce971cbba9039a8 100644
--- a/packages/ui-vue/components/field-selector/src/field-selector.component.tsx
+++ b/packages/ui-vue/components/field-selector/src/field-selector.component.tsx
@@ -1,8 +1,8 @@
-import { SetupContext, ref, defineComponent, computed, watch, onMounted, inject } from "vue";
-import FButtonEdit from '../../button-edit/src/button-edit.component';
+import { ref, defineComponent, watch, inject } from "vue";
+import FButtonEdit from '@farris/ui-vue/components/button-edit';
+import { F_NOTIFY_SERVICE_TOKEN, FNotifyService } from "@farris/ui-vue/components/notify";
 import FieldSelectorComponent from './components/field-selector-container.component';
 import { FieldSelectorProps, fieldSelectorProps, FieldSelectorService } from "./field-selector.props";
-import { F_NOTIFY_SERVICE_TOKEN, FNotifyService } from "../../notify";
 
 
 export default defineComponent({
diff --git a/packages/ui-vue/components/field-selector/src/field-selector.props.ts b/packages/ui-vue/components/field-selector/src/field-selector.props.ts
index 4f3255fa205b09a8fcaf99300f3e0bcd408f933a..a338194c9c3815efad52495cfc47766b16f9613b 100644
--- a/packages/ui-vue/components/field-selector/src/field-selector.props.ts
+++ b/packages/ui-vue/components/field-selector/src/field-selector.props.ts
@@ -1,6 +1,6 @@
 import { ExtractPropTypes } from "vue";
-import { DataColumn } from '../../../components/data-view';
-import { createPropsResolver } from "../../dynamic-resolver";
+import { DataColumn } from '@farris/ui-vue/components/data-view';
+import { createPropsResolver } from "@farris/ui-vue/components/dynamic-resolver";
 import fieldSelectorSchema from './schema/field-selector.schema.json';
 
 const defaultColumns = [
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 87da04acc853332442d125924fba9b2ef1dd9eec..03e5dabeeadc620fb63fd267847d02210d7f510f 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,9 @@
 import { computed, defineComponent, inject, onMounted, ref } from 'vue';
 import { FieldsetDesignerProps, fieldsetDesignerProps } from '../fieldset.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 { DesignerItemContext } from '../../../designer-canvas/src/types';
 import { useDesignerRules } from './use-designer-rules';
-import { DesignerHostService } from '../../../designer-canvas';
+// import { DesignerHostService } from '../../../designer-canvas';
 
 export default defineComponent({
     name: 'FFieldsetDesign',
diff --git a/packages/ui-vue/components/fieldset/src/designer/use-designer-rules.ts b/packages/ui-vue/components/fieldset/src/designer/use-designer-rules.ts
index 843cf7be707c7dce551ba6efbb396c807cce01f5..01b4c346f1fe35ad630ad76bbf25cbaad639fe7d 100644
--- a/packages/ui-vue/components/fieldset/src/designer/use-designer-rules.ts
+++ b/packages/ui-vue/components/fieldset/src/designer/use-designer-rules.ts
@@ -1,12 +1,9 @@
-import { DgControl } from "../../../designer-canvas";
-import { FormBindingType } from "../../../property-panel";
-import { useDragulaCommonRule } from "../../../designer-canvas/src/composition/rule/use-dragula-common-rule";
-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 { DgControl, useDragulaCommonRule, UseTemplateDragAndDropRules, 
+    DesignerHostService, DesignerHTMLElement, DraggingResolveContext, UseDesignerRules, ComponentSchema, DesignerItemContext } from "@farris/ui-vue/components/designer-canvas";
+import { FormBindingType } from "@farris/ui-vue/components/property-panel";
 import { FieldsetProperty } from '../property-config/fieldset.property-config';
-import { useDesignerRules as formUseDesignerRules } from "../../../dynamic-form/src/designer/response-form-use-designer-rules";
-import { getSchemaByType } from "../../../dynamic-resolver";
+import { useDesignerRules as formUseDesignerRules } from "@farris/ui-vue/components/dynamic-form";
+import { getSchemaByType } from "@farris/ui-vue/components/dynamic-resolver";
 
 export function useDesignerRules(designItemContext: DesignerItemContext, designerHostService?: DesignerHostService): UseDesignerRules {
     const dragAndDropRules = new UseTemplateDragAndDropRules();
diff --git a/packages/ui-vue/components/layout/src/layout.component.tsx b/packages/ui-vue/components/layout/src/layout.component.tsx
index d968e5102965fb6cbdf8f05ba12b717a820985ae..024ce347a2820bb4eb66f240211ea0c3d9b97d2e 100644
--- a/packages/ui-vue/components/layout/src/layout.component.tsx
+++ b/packages/ui-vue/components/layout/src/layout.component.tsx
@@ -2,7 +2,7 @@ import { computed, defineComponent, provide, ref } from 'vue';
 import { LayoutProps, layoutProps } from './layout.props';
 import { LayoutContext } from './composition/types';
 import { useResizeHandle } from './composition/use-resize-handle';
-import { getCustomClass, getCustomStyle } from '../../common';
+import { getCustomClass, getCustomStyle } from '@farris/ui-vue/components/common';
 
 export default defineComponent({
     name: 'FLayout',
diff --git a/packages/ui-vue/components/lookup/src/components/cascade/tree-cascade.component.tsx b/packages/ui-vue/components/lookup/src/components/cascade/tree-cascade.component.tsx
index 9c338ec2a8e374e3efe77129fbe0e500a21bbfa2..9c5031095c652b4c3412dae63ca2b33f17602ac0 100644
--- a/packages/ui-vue/components/lookup/src/components/cascade/tree-cascade.component.tsx
+++ b/packages/ui-vue/components/lookup/src/components/cascade/tree-cascade.component.tsx
@@ -1,6 +1,6 @@
 import { defineComponent, ref } from "vue";
 
-import { FComboList } from "../../../../combo-list";
+import { FComboList } from "@farris/ui-vue/components/combo-list";
 import { cascadeItems } from "../../composition/types";
 
 export default defineComponent({
diff --git a/packages/ui-vue/components/lookup/src/components/lookup-container.component.tsx b/packages/ui-vue/components/lookup/src/components/lookup-container.component.tsx
index dc0f927d455fdfee382216580bd56eff30cc7593..aa8f5628c2ad15bcc991dcabb20461cb88eb50b7 100644
--- a/packages/ui-vue/components/lookup/src/components/lookup-container.component.tsx
+++ b/packages/ui-vue/components/lookup/src/components/lookup-container.component.tsx
@@ -1,5 +1,5 @@
 import { defineComponent, ref, inject, watch, onMounted, onUnmounted, Ref } from "vue";
-import { FLayout, FLayoutPane } from "../../../../components/layout";
+import { FLayout, FLayoutPane } from "@farris/ui-vue/components/layout";
 
 import { LookupProps, lookupProps } from "../lookup.props";
 
diff --git a/packages/ui-vue/components/lookup/src/components/search-bar/search-bar.component.tsx b/packages/ui-vue/components/lookup/src/components/search-bar/search-bar.component.tsx
index 1ac46ffbcb74315dfdacdca2d6a2141cc149df61..7c019acd9a35d0c0cf08380ee627fbbd377ad977 100644
--- a/packages/ui-vue/components/lookup/src/components/search-bar/search-bar.component.tsx
+++ b/packages/ui-vue/components/lookup/src/components/search-bar/search-bar.component.tsx
@@ -1,6 +1,6 @@
 import { computed, defineComponent, inject, onMounted, Ref, ref, watch } from "vue";
 import { FButtonEdit } from "@farris/ui-vue/components/button-edit";
-import { FComboList } from "../../../../combo-list";
+import { FComboList } from "@farris/ui-vue/components/combo-list";
 import { searchBarProps, SearchBarProps } from "./search-bar.props";
 import { SearchField } from "../../composition/types";
 import { LOOKUP_HTTP_COMPOSITION, UseHttpComposition } from "../../composition/use-http";
diff --git a/packages/ui-vue/components/lookup/src/designer/lookup.design.component.tsx b/packages/ui-vue/components/lookup/src/designer/lookup.design.component.tsx
index 7003cfa2151875b30c43069474768030164fea67..87220d0c39fcc304881d861e50390ec23e1cb8fb 100644
--- a/packages/ui-vue/components/lookup/src/designer/lookup.design.component.tsx
+++ b/packages/ui-vue/components/lookup/src/designer/lookup.design.component.tsx
@@ -15,8 +15,7 @@
  */
 import { defineComponent, inject, onMounted, Ref, ref, SetupContext } from 'vue';
 import FButtonEditDesign from '@farris/ui-vue/components/button-edit/designer';
-import { DesignerItemContext } from '../../../designer-canvas/src/types';
-import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
+import { useDesignerComponent, DesignerItemContext } from '@farris/ui-vue/components/designer-canvas';
 import { lookupProps, LookupProps } from '../lookup.props';
 import { useLookupDesignerRules } from './use-lookup-rules';
 
diff --git a/packages/ui-vue/components/lookup/src/designer/use-lookup-rules.ts b/packages/ui-vue/components/lookup/src/designer/use-lookup-rules.ts
index 93149438fb6ed95715dfe46f23f252953e3af2b7..57c68e625c08634e2e2bd9ef028e101642dbb318 100644
--- a/packages/ui-vue/components/lookup/src/designer/use-lookup-rules.ts
+++ b/packages/ui-vue/components/lookup/src/designer/use-lookup-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 { LookupPropertyConfig } from "../property-config/lookup.property-config";
 
 export function useLookupDesignerRules(designItemContext: DesignerItemContext, designerHostService): UseDesignerRules {
diff --git a/packages/ui-vue/components/lookup/src/lookup.props.ts b/packages/ui-vue/components/lookup/src/lookup.props.ts
index a0d2e763e055c1b943fa161713ced697aa52e65a..7f7f943281fdd2db04f168ab050af0082ee1b463 100644
--- a/packages/ui-vue/components/lookup/src/lookup.props.ts
+++ b/packages/ui-vue/components/lookup/src/lookup.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 lookupDefaultConfig from './property-config/lookup.property-config.json';
 import { schemaMapper } from './schema/schema-mapper';
diff --git a/packages/ui-vue/components/lookup/src/property-config/lookup.property-config.ts b/packages/ui-vue/components/lookup/src/property-config/lookup.property-config.ts
index b33d97003aa40302508633acf116ee9f42efefe9..474aa68545165f0a7464a7c8d036c64e1d77c1ac 100644
--- a/packages/ui-vue/components/lookup/src/property-config/lookup.property-config.ts
+++ b/packages/ui-vue/components/lookup/src/property-config/lookup.property-config.ts
@@ -1,5 +1,5 @@
 import { InputBaseProperty } from "@farris/ui-vue/components/property-panel";
-import { FieldSelectorRepositoryToken } from "../../../field-selector";
+import { FieldSelectorRepositoryToken } from "@farris/ui-vue/components/field-selector";
 import {
     lookupDataSourceConverter, lookupDisplayTypeConverter,
     lookupIdFieldConverter, lookupDefaultConverter,
@@ -8,7 +8,7 @@ import {
     lookupPaginationConverter,
     getPageList
 } from "./converters/lookup-property.converter";
-import { DesignerComponentInstance } from "../../../designer-canvas/src/types";
+import { DesignerComponentInstance } from "@farris/ui-vue/components/designer-canvas";
 import { LookupEvents } from "./lookup-events";
 import { cascadeItems } from "../composition/types";
 import { ExpressionProperty } from "@farris/ui-vue/components/property-panel";
diff --git a/packages/ui-vue/components/lookup/src/schema/callback-resolvers.ts b/packages/ui-vue/components/lookup/src/schema/callback-resolvers.ts
index e8e5de48684296afe21316d3cf7c89a4396fecbc..2d2b18bd6c330767e0ab0b8413204bb75434cd13 100644
--- a/packages/ui-vue/components/lookup/src/schema/callback-resolvers.ts
+++ b/packages/ui-vue/components/lookup/src/schema/callback-resolvers.ts
@@ -1,4 +1,4 @@
-import { Caller } from "../../../dynamic-resolver";
+import { Caller } from "@farris/ui-vue/components/dynamic-resolver";
 import { LookupHttpResult } from "../composition/types";
 
 export function createLookupCallbackResolver() {
diff --git a/packages/ui-vue/components/lookup/src/schema/schema-mapper.ts b/packages/ui-vue/components/lookup/src/schema/schema-mapper.ts
index 1edbf85731d17b9d6c4125fad65928ce1a828e56..441e061cba861ac667bd1e33852076c0123e7d34 100644
--- a/packages/ui-vue/components/lookup/src/schema/schema-mapper.ts
+++ b/packages/ui-vue/components/lookup/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';
 
 function converMappingFieldsToObject(mappingFields: any) {
     if (typeof mappingFields == 'string' && mappingFields.startsWith('{') && mappingFields.endsWith('}')) {
diff --git a/packages/ui-vue/components/lookup/src/schema/schema-resolver.ts b/packages/ui-vue/components/lookup/src/schema/schema-resolver.ts
index b02bdf93eec9060948f579c53aa81e3963a7d706..d36ae7457434b7381b796814e9926d352feacff6 100644
--- a/packages/ui-vue/components/lookup/src/schema/schema-resolver.ts
+++ b/packages/ui-vue/components/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/message-box/src/message-box.props.ts b/packages/ui-vue/components/message-box/src/message-box.props.ts
index d6455dbf2fa166855450c1fe67a6246d0a17c64a..90e93ab3f72cb92810423af183aed13788404128 100644
--- a/packages/ui-vue/components/message-box/src/message-box.props.ts
+++ b/packages/ui-vue/components/message-box/src/message-box.props.ts
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ModalButton } from '@farris/ui-vue/components/modal/src/composition/type';
+import { ModalButton } from '@farris/ui-vue/components/modal';
 import { ExtractPropTypes, PropType } from 'vue';
 
 export interface ExceptionInfo {
diff --git a/packages/ui-vue/components/modal/index.ts b/packages/ui-vue/components/modal/index.ts
index cea142d232b19523b0d4a2dbd5b440257b5ef68c..a884c987dba86d258f54e08c4b1b7e7dd66de524 100644
--- a/packages/ui-vue/components/modal/index.ts
+++ b/packages/ui-vue/components/modal/index.ts
@@ -17,6 +17,7 @@ import type { App, Plugin } from 'vue';
 import FModal from './src/modal.component';
 import FModalService from './src/composition/modal.service';
 
+export * from './src/composition/type';
 export * from './src/modal.props';
 
 export const F_MODAL_SERVICE_TOKEN = Symbol('FModalService');
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 b8c72d47ade76187ea4ac997a21928f78cf13162..d47b9d55945c358cc6fd2d16f3709366869d5247 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,4 +1,4 @@
-import { FormSchemaEntityFieldTypeName } from "../../../common";
+import { FormSchemaEntityFieldTypeName } from "@farris/ui-vue/components/common";
 import { FormPropertyChangeObject } from "../../../property-panel";
 import { InputBaseProperty } from "../../../property-panel/src/composition/entity/input-base-property";
 
diff --git a/packages/ui-vue/components/popover/src/popover.component.tsx b/packages/ui-vue/components/popover/src/popover.component.tsx
index 2f44f51453141dcc074d71bada66df8b6e08c6e8..afbf0f80da83835d66a741237d3fc433afe85682 100644
--- a/packages/ui-vue/components/popover/src/popover.component.tsx
+++ b/packages/ui-vue/components/popover/src/popover.component.tsx
@@ -20,7 +20,7 @@ import { useHost } from './composition/use-host';
 import { usePosition } from './composition/use-position';
 import { usePopup } from './composition/use-popup';
 import { useResize } from './composition/use-resize';
-import { useDelayedRef } from '../../common/utils/use-delayed-ref';
+import { useDelayedRef } from '@farris/ui-vue/components/common';
 
 export default defineComponent({
     name: 'FPopover',
diff --git a/packages/ui-vue/components/query-solution/src/composition/build-solution.ts b/packages/ui-vue/components/query-solution/src/composition/build-solution.ts
index 21828996a40252b5a6ceffd807244dd861a0fd14..c17209612c018666a3d17279af14a443c8cd7b46 100644
--- a/packages/ui-vue/components/query-solution/src/composition/build-solution.ts
+++ b/packages/ui-vue/components/query-solution/src/composition/build-solution.ts
@@ -1,4 +1,4 @@
-import { useGuid } from "../.../../../../common";
+import { useGuid } from "@farris/ui-vue/components/common";
 import { DesignerHostService, DgControl } from "../.../../../../designer-canvas";
 import { getSchemaByType } from "../.../../../../dynamic-resolver";
 
diff --git a/packages/ui-vue/components/query-solution/src/designer/composition/use-validation.ts b/packages/ui-vue/components/query-solution/src/designer/composition/use-validation.ts
index 522837a17635b458dfaaf653aca03c35e450cbe5..93c3bf8dc0a16c4933e73534c5590e5478a9de29 100644
--- a/packages/ui-vue/components/query-solution/src/designer/composition/use-validation.ts
+++ b/packages/ui-vue/components/query-solution/src/designer/composition/use-validation.ts
@@ -1,4 +1,4 @@
-import { FormSchemaEntityField$Type } from "../../../../common";
+import { FormSchemaEntityField$Type } from "@farris/ui-vue/components/common";
 import { ref } from "vue";
 import { cloneDeep } from "lodash-es";
 import { useUtil } from "../query-solution-config/composition/use-util";
diff --git a/packages/ui-vue/components/query-solution/src/designer/solution-preset-config/solution-preset.props.ts b/packages/ui-vue/components/query-solution/src/designer/solution-preset-config/solution-preset.props.ts
index 0e27ee7aeb58227f555ae6e1e774ad7830ea3ec3..18b66987169dc8c870240b1e591c21b5091c3f98 100644
--- a/packages/ui-vue/components/query-solution/src/designer/solution-preset-config/solution-preset.props.ts
+++ b/packages/ui-vue/components/query-solution/src/designer/solution-preset-config/solution-preset.props.ts
@@ -4,7 +4,6 @@ import { schemaMapper } from './schema/schema-mapper';
 import { schemaResolver } from './schema/schema-resolver';
 import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver';
 import solutionPresetSchema from './schema/query-solution-config.schema.json';
-import { ModalOptions } from "@farris/ui-vue/components/modal/src/composition/type";
 import { FieldConfig } from "@farris/ui-vue/components/condition";
 
 export const solutionPresetProps = {
diff --git a/packages/ui-vue/components/radio-group/src/radio-group.props.ts b/packages/ui-vue/components/radio-group/src/radio-group.props.ts
index bcb9f81d7823f8793b922082717b295ecd5093b9..b7330103c66e7431874ff17a0b9aa4cea1c1518d 100644
--- a/packages/ui-vue/components/radio-group/src/radio-group.props.ts
+++ b/packages/ui-vue/components/radio-group/src/radio-group.props.ts
@@ -15,7 +15,7 @@
  */
 import { ExtractPropTypes, PropType } from 'vue';
 import { Radio } from './composition/types';
-import { radioCheckboxCommonProps } from '../../common/radio-checkbox/radio-checkbox.props';
+import { radioCheckboxCommonProps } from '@farris/ui-vue/components/common';
 
 export const radioGroupProps = {
     ...radioCheckboxCommonProps,
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 7b35fa268c2583d99df0070ece4140120b3c89a3..d3577e064fa04915feb8dd289f47da2407df86fb 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
@@ -21,7 +21,7 @@ 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 '../../../common';
+import { getCustomClass } from '@farris/ui-vue/components/common';
 import { DesignerHostService } from '../../../designer-canvas/src/composition/types';
 
 export default defineComponent({
diff --git a/packages/ui-vue/components/section/src/section.component.tsx b/packages/ui-vue/components/section/src/section.component.tsx
index ea129a6ea0056b8975a95aee4ae0e936159c0a85..47ec2b27b91406694b397db91047ade8c4c5322a 100644
--- a/packages/ui-vue/components/section/src/section.component.tsx
+++ b/packages/ui-vue/components/section/src/section.component.tsx
@@ -18,7 +18,7 @@ import { computed, defineComponent, onMounted, ref, SetupContext, watch } from '
 import { SectionProps, sectionProps } from './section.props';
 import getSectionHeaderRender from './components/header.component';
 import getSectionToolbar from './components/toolbar.component';
-import { getCustomClass } from '../../common';
+import { getCustomClass } from '@farris/ui-vue/components/common';
 
 export default defineComponent({
     name: 'FSection',
diff --git a/packages/ui-vue/components/splitter/src/components/splitter-pane.component.tsx b/packages/ui-vue/components/splitter/src/components/splitter-pane.component.tsx
index 94fa8f89d9315634a9ce6eb7f545f2611b7461ee..defe6216b163d858a30ac0187ef4666898b24a19 100644
--- a/packages/ui-vue/components/splitter/src/components/splitter-pane.component.tsx
+++ b/packages/ui-vue/components/splitter/src/components/splitter-pane.component.tsx
@@ -2,7 +2,7 @@ import { SetupContext, computed, defineComponent, inject, ref } from 'vue';
 import { SplitterPanePropsType, splitterPaneProps } from './splitter-pane.props';
 import { SplitterContext } from '../composition/types';
 import { useResizePane } from '../composition/use-resize-pane';
-import { getCustomClass, getCustomStyle } from '../../../common';
+import { getCustomClass, getCustomStyle } from '@farris/ui-vue/components/common';
 
 export default defineComponent({
     name: 'FSplitterPane',
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 4cb92f0760e735bab716eb8c1efa467e5bb60ea5..7825b1aa8be331113df0141aa87a8bc398d0d28a 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
@@ -5,7 +5,7 @@ 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 { useDesignerRules } from './splitter-pane-use-designer-rules';
-import { getCustomClass, getCustomStyle } from '../../../common';
+import { getCustomClass, getCustomStyle } from '@farris/ui-vue/components/common';
 import { DesignerHostService } from '../../../designer-canvas/src/composition/types';
 
 export default defineComponent({
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 191a8799331c2569e5e5ac4637a4aadef8677c84..72d45522c5a6e4747df21a48ca50842c02ee49c3 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
@@ -6,7 +6,7 @@ import { SplitterContext } from '../composition/types';
 import { DesignerItemContext } from '../../../designer-canvas/src/types';
 import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component';
 import { useDesignerRules } from './splitter-use-designer-rules';
-import { getCustomClass, getCustomStyle } from '../../../common';
+import { getCustomClass, getCustomStyle } from '@farris/ui-vue/components/common';
 import { DesignerHostService } from '../../../designer-canvas/src/composition/types';
 
 export default defineComponent({
diff --git a/packages/ui-vue/components/splitter/src/splitter.component.tsx b/packages/ui-vue/components/splitter/src/splitter.component.tsx
index c509c402fcbf5bc2479179907ad01e00615d1548..d976626d4c2b2e213e1c34c7f9d812d219895059 100644
--- a/packages/ui-vue/components/splitter/src/splitter.component.tsx
+++ b/packages/ui-vue/components/splitter/src/splitter.component.tsx
@@ -2,7 +2,7 @@ import { SetupContext, computed, defineComponent, provide, ref } from 'vue';
 import { SplitterPropsType, splitterProps } from './splitter.props';
 import { useResizeHandle } from './composition/use-resize-handle';
 import { SplitterContext } from './composition/types';
-import { getCustomClass, getCustomStyle } from '../../common';
+import { getCustomClass, getCustomStyle } from '@farris/ui-vue/components/common';
 
 export default defineComponent({
     name: 'FSplitter',
diff --git a/packages/ui-vue/components/switch/src/switch.component.tsx b/packages/ui-vue/components/switch/src/switch.component.tsx
index 47e2cee36ff8066c974b071dee63d2699232ea3d..63e80fae3e28710dfdc7852c30d361b0107fb70b 100644
--- a/packages/ui-vue/components/switch/src/switch.component.tsx
+++ b/packages/ui-vue/components/switch/src/switch.component.tsx
@@ -23,7 +23,7 @@ export default defineComponent({
     emits: ['update:modelValue', 'modelValueChanged'] as (string[] & ThisType<void>) | undefined,
     setup(props: SwitchProps, context: SetupContext) {
         const { disabled, size, onLabel, offLabel, onBackground, offBackground, onColor, offColor,readonly } = toRefs(props);
-        const modelValue = ref(props.modelValue);
+        const modelValue = ref(!!props.modelValue);
         const switchRef = ref();
         function getSwitchColor() {
             return '';
diff --git a/packages/ui-vue/components/switch/src/switch.props.ts b/packages/ui-vue/components/switch/src/switch.props.ts
index 083536a460cd8935e4ee30676508cc7ff1f0cfee..dbf1414cab3ffb091b2113e07f98299f12dae8d4 100644
--- a/packages/ui-vue/components/switch/src/switch.props.ts
+++ b/packages/ui-vue/components/switch/src/switch.props.ts
@@ -22,14 +22,13 @@ import { schemaResolver } from './schema/schema-resolver';
 export type SwitchType = 'small' | 'medium' | 'large';
 
 export const switchProps = {
-    /** 组件值*/
     modelValue: { type: Boolean, default: false },
     /** 禁用 */
-    disabled: { type: Boolean,default:false },
+    disabled: { type: Boolean, default: false },
     /**
      * 同disabled 
      */
-    readonly: { type: Boolean,default:false },
+    readonly: { type: Boolean, default: false },
     onBackground: { type: String },
     offBackground: { type: String },
     onColor: { type: String },
diff --git a/packages/ui-vue/components/text/src/composition/utils.ts b/packages/ui-vue/components/text/src/composition/utils.ts
index 4a6d55f8fab63736f52bb5c6f0c724dfab8ca3df..5dc1a405ec03f54437a64240a058d7b1b6fe4f23 100644
--- a/packages/ui-vue/components/text/src/composition/utils.ts
+++ b/packages/ui-vue/components/text/src/composition/utils.ts
@@ -1,4 +1,4 @@
-import { useDateFormat, useNumberFormat, useTimeAgo } from "../../../common";
+import { useDateFormat, useNumberFormat, useTimeAgo } from "@farris/ui-vue/components/common";
 import { FormNumberOptions } from "./types";
 
 /**
diff --git a/packages/ui-vue/components/time-picker/src/composition/use-scroll-to-selected.ts b/packages/ui-vue/components/time-picker/src/composition/use-scroll-to-selected.ts
index ca7310398549deb4f927f1fe4b8515b0bb8aa730..b83c8056b3f2c0cc0f4ed4383cd8641964836335 100644
--- a/packages/ui-vue/components/time-picker/src/composition/use-scroll-to-selected.ts
+++ b/packages/ui-vue/components/time-picker/src/composition/use-scroll-to-selected.ts
@@ -3,7 +3,7 @@
  
 import { Ref, SetupContext, ref } from "vue";
 import { TimeProps } from "../components/time.props";
-import { useReqAnimationFrame } from "../../../common";
+import { useReqAnimationFrame } from "@farris/ui-vue/components/common";
 import { TimePickerUnit } from "./types";
 import { TimeHolder } from "./time-holder";
 
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 728dc1aae0f9e088ad20de4697e139a04436e5e7..dd0746d5b5a6dbb10c72d0060ab7a87775eec41f 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,6 +1,6 @@
 import { PropertyChangeObject } from "../../../property-panel/src/composition/entity/property-entity";
 import { BaseControlProperty } from "../../../property-panel/src/composition/entity/base-property";
-import { FormSchemaEntity } from "../../../common/entity/entity-schema";
+import { FormSchemaEntity } from "@farris/ui-vue/components/common";
 
 export class TreeGridProperty extends BaseControlProperty {
 
diff --git a/packages/ui-vue/components/uploader/src/composition/utils.ts b/packages/ui-vue/components/uploader/src/composition/utils.ts
index e3d092b97458e029de7ca3e1ec10f44feac4231d..ef994c9a680a3e5516eeec2247ce306a83f18bd9 100644
--- a/packages/ui-vue/components/uploader/src/composition/utils.ts
+++ b/packages/ui-vue/components/uploader/src/composition/utils.ts
@@ -1,7 +1,7 @@
  
  
 /* eslint-disable no-prototype-builtins */
-import { useDateFormat } from "../../../common";
+import { useDateFormat } from "@farris/ui-vue/components/common";
 import { UploaderOptions, UploadFile, UploadStatus, FUploadFileExtend, UploadOutput } from "./type";
 
 export function formateDateTo(dateValue: string | Date, dateFormat: string) {