diff --git a/packages/ui-vue/components/accordion/src/accordion.props.ts b/packages/ui-vue/components/accordion/src/accordion.props.ts index 34ec4227798c8f1f3b9a11777698b56b66e105f4..535c80d527f929c30125a2a9845aad00eccae2b8 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 edddcc443eaac19bae91f533ff18e8e4d47e8a9a..d9037bd40a4ffe89c3538691353e538aa6257ae5 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/avatar/src/designer/use-rules.ts b/packages/ui-vue/components/avatar/src/designer/use-rules.ts index b19c36c5e4c5ed242a7f5c5913bfc883768693fd..0996f3c78ccd0bf9a23db2b18b1376059b183c40 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/border-editor/src/border-editor.props.ts b/packages/ui-vue/components/border-editor/src/border-editor.props.ts index dad9807b490d72001313d28ce674dc039ef1872c..3ba6d4498a3f23c0aa9dea270483f44752dcf569 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 9d03f1d00d595594b17897b025ac3c41f0f3a6b0..88421962ffb8e1afba7f9d34379c3466a1cec9f4 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/calendar/src/designer/calendar.design.component.tsx b/packages/ui-vue/components/calendar/src/designer/calendar.design.component.tsx index f51d1afc4796866ec3a9ce70be2e7280dcf0bc1b..caf089c6b512c23a6245f584d77c613c4ca4756a 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/capsule.props.ts b/packages/ui-vue/components/capsule/src/capsule.props.ts index 45481882f89604e9261fe87a0a56368cc436d762..d87c5e5c20f3ac097efe32cfde7f9aee1be38edb 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/capsule/src/designer/capsule.design.component.tsx b/packages/ui-vue/components/capsule/src/designer/capsule.design.component.tsx index 3c88256124eae22cf96a9d1cba4334dbbf4d36c9..5e1119840343e2cd28e067d3c84bfd3fcb7ee8bc 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/color-picker.props.ts b/packages/ui-vue/components/color-picker/src/color-picker.props.ts index a72bc06e12e13ecb17e00f843158800527985b23..ae65eea20a523a87975bf7a1f1b487164a0fa9d4 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/color-picker/src/designer/color-picker.design.component.tsx b/packages/ui-vue/components/color-picker/src/designer/color-picker.design.component.tsx index 43ff463acd858c9ba9569b0e8d5382d1258d2d0b..94e476ba72dee23a780d9c49e46efa6dee546684 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/component-ref.props.ts b/packages/ui-vue/components/component/src/component-ref.props.ts index 54059432325b93b08271ba80e8474258462dd18c..a6997b575380c7d2fb60f2056be89b78221e8abf 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 d681b0fcf664272e269ae89516ce1076abe8db78..6a44cd4353142ec87bb4c4e06604fe0e7cc85d09 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/component/src/composition/field-tree-builder.ts b/packages/ui-vue/components/component/src/composition/field-tree-builder.ts index 0ee33d3f022ae57322a11f32c2b7ab0c1c1480d5..cc0137442807423fd7770fc565e28914f3c966f7 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 e3270aae32d66dc58efbb1505b76dd434d142fba..b94ea1f416bc5485fa4e135b03911c9925445d13 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 54a575f789c83a0d57890faf32355541f0fbdce2..f25879cd1c91333f81f3e49c942167b4d1d02c9f 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 ea85eb2d70b47f93fe533d2f995dec5c93d7a8d1..5c7cf2f29f16373430d07b58b0b9a6ce99396cb4 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 e5764d1801373fe29bd824cba62eb8cd647dfa1f..2cb79e241e1313f6a2a2e495d253a1675c9b5bf9 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 2bbc428dfd8a92700210ccc296035887a37744f9..cc4e813dec40119c22ed18e970626909e0e6f55b 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/content-container.props.ts b/packages/ui-vue/components/content-container/src/content-container.props.ts index c14b8b295078dc5409e2ae57f76153f31fbcce7a..38cd8bf2698a5ed7af837a6d2d6abbc8f1ec4aba 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/content-container/src/designer/content-container.design.component.tsx b/packages/ui-vue/components/content-container/src/designer/content-container.design.component.tsx index 308f7d2ce29861b950290a5ff87bace796ac0ba4..cf57c8cd951fb8b4ad4dee05894d8b37130a19c2 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 c912399ddef6cb93c63ae0b214472c6f079d4940..bb54ae6876e1bd77db740b2f948dea9fcd560205 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 0bacebc89773d4c68aa65aa3717efbd576c8e636..4a479bef29168fc9e64ade43c8d9373080641b1e 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 a288ac5b5fb1857ffdfc8b531283ae7a7fb27a12..b7e4fa64fbd63eba7fab858a893c43c3bed7b034 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 9902f93a8f375fdd82632db6d164541bc8d590d8..43e8554dd11c92c7d426f6d83a447a3e5dac9fb6 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 bda59a8f1537390cf6daec9481b7f54e6df0827d..b47d13bbdcc367c0643067bd2ea80f428d79e351 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 4abe19de7abca1c9798a5b3ef37a55b344561183..124fc71b3593fad1060ceb6ae8498b672c9a0e50 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 0f730c481d5b1c34ea5b0beb717115d68df3bc37..72a70ea8a01a57be612cde5978f0c44e28bc9efc 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 c436907b71cfe124ae1a7bd132a93dca373e3f01..8f6bf489ce223076d5bad1a1ed15f62becdacd46 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 5513623b42c4939aec85f97ccf38834cfcabf438..5e5c73ad49b510b493cd23ea2a20ee9c9d59e489 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, context: Record, designerHostService?: DesignerHostService): Record { diff --git a/packages/ui-vue/components/designer-canvas/index.ts b/packages/ui-vue/components/designer-canvas/index.ts index f4ecd9e79d8875a019e946fddb8dadee7308fc7b..359395edb2a24f55d21bb9dd82dae452fe57a1dd 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/designer-outline/src/composition/use-outline-node.ts b/packages/ui-vue/components/designer-outline/src/composition/use-outline-node.ts index 1204c1088e4d8a9abeb3052654ed7441018ae3fe..faf841c69274de4b26ac7c9c691d385e2846542f 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 ae1efe3667bd17897d748c04d1026c2cff9e43b3..9b9a3d0e795dc9d7cd4a5a3580d7537374982d33 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 8492f9b69bb9ca077ca008e0bac6f29b49c2ccea..982bd14f099b217a1f8c8da7f1b7acc61c4e6638 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 a7ca0c430ff2a80f4e906fea403d884b0750cf48..d2656703b5abfef9134ceb699d05514a082cd9dc 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 c24abde5c82c786ffffeb840f1246626c8033c4d..d46be9d044f99f8ba640197c9a9d91597b4573f4 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/response-form.props.ts b/packages/ui-vue/components/dynamic-form/src/response-form.props.ts index c376d9e5a05782f115d55aee478ff37d3ad8e0fb..22e5b011ad590c57a23d443b97fb7252e737a533 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-form/src/schema/response-form-schema-resolver.ts b/packages/ui-vue/components/dynamic-form/src/schema/response-form-schema-resolver.ts index 747d56aa51ccf626c4c314a6483091f936defabb..9f94324b0522a1314d7bebcc06d0ce3097365d3a 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/dynamic-resolver/index.ts b/packages/ui-vue/components/dynamic-resolver/index.ts index 2500f1c640b379624595da03ef41d4e872cc7251..e2e5e17f374d490400b0c6b35c716cd72a05d3ff 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 77070fdc522f73b513252f17b2807c0723ed3b6b..547241e14bc743a2ff587e199968495dd562e89b 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 f654b4c4120db6fd61d112f2e663960bd05c6bbd..b3ac431f090a947635e3fa0d7dae97ccf0dd7b56 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 058df419d88c6dc02af972896f9be7ab7b7dcbf7..6c0e833fb66d2329ed4ec0f65c641400511fa041 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): EventDispatcher { function dispatch(token: string, eventName: string, type: string, payloads: any[]) { 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 104f9f8dd9e6ef9fca4967e7b36120935dddc2a0..14590b282902db5200b3d928627075e191c474c5 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/events-editor/src/events-editor.props.ts b/packages/ui-vue/components/events-editor/src/events-editor.props.ts index 9f255bbfd14d2703a73eff92cab2312404adc1cb..e595480523b39fb25af73ed0797eb5e4691d6bb7 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 afde95bc56b21feb683af9053a202c7808b8a67c..2546e7ac42b95d839f80b3ced93db0a626042565 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/designer/fieldset.design.component.tsx b/packages/ui-vue/components/fieldset/src/designer/fieldset.design.component.tsx index 03e5dabeeadc620fb63fd267847d02210d7f510f..47b2b1811522c388e031178e7ad10b51be5712f4 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/fieldset/src/fieldset.props.ts b/packages/ui-vue/components/fieldset/src/fieldset.props.ts index 03323c18298936d0c4410dd073d000bb010844fb..4a7e3696f1d90b67b951d7391d50a2769fb33776 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 881cda0f17065c20151e385d853c0199494250c7..a9a8ddc3a232d2378316585c510282c334f024d1 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 bab437b2a0db9820380c98362433a3493c45b843..df23f5d1c2b2d51404bf802c283501fcb2ec050f 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-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 9b3482eba5b9c005e70302945b30fa59048f763a..5d85c07c9226c4c25a5748e3b3cf5f5c5af35bfd 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/filter-condition-editor/src/filter-condition-editor.props.ts b/packages/ui-vue/components/filter-condition-editor/src/filter-condition-editor.props.ts index 69c124fb8ce54ba3f3074ade8ff17b2a5ed98023..bafd5cb1abe073bfcaa25b8c1e93ec4e8d8a952d 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/flow-canvas/src/components/flow-node-item.component.tsx b/packages/ui-vue/components/flow-canvas/src/components/flow-node-item.component.tsx index fda81f34e0375c228bc80bfd8f213e5f8bcc6059..8e3997102d2c5b606ca63a2590cb0b6d31442ea2 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 3ef64883dc977ae085b9ba618d0c15dea02020ce..756071340a0b0def0d3fc306ffccee1c1c45b9e0 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 517fa091ee156ab05fa77e4aea217548272ea608..36247467e02de360de8cb0258c43ae0b8c393844 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/html-template/src/html-template.props.ts b/packages/ui-vue/components/html-template/src/html-template.props.ts index acd0d17086d0bca29d5ddc76aae25006736d1039..10e199333da8a6c939fb56c028852195398cbc11 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/designer/image-cropper.design.component.tsx b/packages/ui-vue/components/image-cropper/src/designer/image-cropper.design.component.tsx index e42169ed304ed29b3d40072e71c3e4674a08135f..5b2c6caa77227b3847dd6b794b872a4f90c063f2 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/image-cropper/src/image-cropper.props.ts b/packages/ui-vue/components/image-cropper/src/image-cropper.props.ts index 142d9a27baa982b6fa81296349aa5d82bf8616f1..e261fe9a1bd1d499234c756654e20d62c16ca7c9 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 93c2b1c8bfa8ab0a2050a591ac74039097c218c1..4acd9e57fb8c73161ab26c1c5ae29ed3fa21dfc4 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 49ab61a5d0e104c4deefd648307e12c630407c22..34773db057080c520810cd065f829d90aa135d3d 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/designer/layout-pane-use-designer-rules.ts b/packages/ui-vue/components/layout/src/designer/layout-pane-use-designer-rules.ts index 10104e81ee69ab983dff68fda9c9c7ed384630f2..2500e319165eaa415a663b5742dca20e4c3f1504 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 47e961783581680fa99f7f53119caf66cc0e0fb3..8a52966731cca77a8eeaccfab1ce18b33242a120 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 aa1d9785a7724606e369ae2f450d3816818314d4..8a17a08069d11d3e91e7bf83430bb614941436c2 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 6b3e29a720bb059287ce4db9cdac0769270282ed..9e326302af268281d223e1f533739ea6925ed947 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/layout/src/layout.props.ts b/packages/ui-vue/components/layout/src/layout.props.ts index d80f6b57070fd69e613efaa268444f4c6f9f842c..458baf45deaeab54af3a132ea30b01d284bc8bd9 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/designer/list-nav.design.component.tsx b/packages/ui-vue/components/list-nav/src/designer/list-nav.design.component.tsx index 837298a80d7d65b51e5c751446ceea7d3101921d..23a2ae27e8aecd1f3d0049279e2a7d4741ef4662 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 e9f2211d1a506122f0c0b0716945b0fd71b6f285..a442d88ffbba52c690d35d3f3bf8bc55cb621230 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/list-nav/src/list-nav.props.ts b/packages/ui-vue/components/list-nav/src/list-nav.props.ts index 10f0a99d931e7a97b90b3867ef6893bd8f8b50a5..33cabd8edec8131942edbf33d0c7fac94f2bd4a8 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 7065c9e048e9dfe8c50f184482403f7ad27c9e3c..bee7fb9d47757d6116dad4b5bc488f6d1a963ea9 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 d00c84c08390ec6624dca0a0ec750aea5cffa176..993fd8ffdd8b6bddfa0bc9ba40fe8632907f4bab 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/designer/number-range.design.component.tsx b/packages/ui-vue/components/number-range/src/designer/number-range.design.component.tsx index c0ebf177382286d1fc5b06ccea8d9e14afdedc9e..036dfb28445e98e42002282223c6efc5b27b984e 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 ce1491dc2be85b0b852ee0deac3b8b851c5c922c..c765f2335af38e7d53ecead68e22b8fa6dec7b0d 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-range/src/number-range.props.ts b/packages/ui-vue/components/number-range/src/number-range.props.ts index 8e8b91abe9e5c5dbba9ee5b2d5f2640880f4817e..ff52d80d559ffac217a881530cbf0ae7d820d4e8 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/number-spinner/src/composition/use-design-rules.ts b/packages/ui-vue/components/number-spinner/src/composition/use-design-rules.ts index 1cea29185a1d5d9c7bcaf7b909bde7865f311306..662df81924f18b9d81ea9c5d6b7c5c48bcf9639e 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 a40950ddd69c2965a09774d720dd490beaa9c465..ebf8fb56e052fa0ed5d7cf2305cafeffe8be8ec8 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 b33b9de468cc9eaeb192ed61f76d1f04e09f3434..3f5bb00c45751471afc9a4365ac7bce2a6ee23f4 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/order/src/order.props.ts b/packages/ui-vue/components/order/src/order.props.ts index 360ab36e7a2869510b737aecf0cef4935370d6a5..c89f01d765b187d035c315b11e4aef39319ac830 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/designer/page-footer.design.component.tsx b/packages/ui-vue/components/page-footer/src/designer/page-footer.design.component.tsx index a6933707d8463216f25833b924830daef674b579..4362e062bb49629cde60025377bc9c9803bc3125 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-footer/src/page-footer.props.ts b/packages/ui-vue/components/page-footer/src/page-footer.props.ts index ca48fcfdf405886ded2d6078e8e07f667613abdd..c1dbf6a0b7125f220f6791bb298494d317c9fdee 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/designer/page-header.design.component.tsx b/packages/ui-vue/components/page-header/src/designer/page-header.design.component.tsx index 8a7f37ed7357c9c7d833039e768de7fd8bb5a71b..abe29b3d351a7af4fd258112305277ef9dc78cec 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 bd432617e610d7a44a0a664c8814d4363fd7d796..3cee9ecc68d101ffc79efc804112ceeadb27c2eb 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/page-header/src/page-header.props.ts b/packages/ui-vue/components/page-header/src/page-header.props.ts index 8aa61ab03145408667e3ba109e82507e42195ba6..fce62efec6ebfc8cbb404fdf40217f198960f510 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/designer/pagination.design.components.tsx b/packages/ui-vue/components/pagination/src/designer/pagination.design.components.tsx index 93361806d72ca0a8f9469c24d6e4fe9525c8a0c9..d5ede09f9bc4f5697e5ef274b4a83e2c6bfe2711 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/pagination/src/pagination.props.ts b/packages/ui-vue/components/pagination/src/pagination.props.ts index 2ac62eb901b3788f9355dd69a685f007a7681d01..63d8a7756537966e4cb812e8de1f2e5502fd52e8 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/designer/progress.design.component.tsx b/packages/ui-vue/components/progress/src/designer/progress.design.component.tsx index aa44e815872136bc78e7bc084308218c19f6fef2..2e4566dd454a225b2ad38eb9d37d510ce32af9f3 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/progress/src/progress.props.ts b/packages/ui-vue/components/progress/src/progress.props.ts index e9dd81bde4cf559ae8573fc1b73c57eb1ebc5267..f78cc1723f43c4ba367fe278c64ddcb5d018e41c 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 9ba44286bef8fb49191591af4f16e49b262e704e..8f96bba4fe0395c1b730615f843c5f82e7c18f61 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 82749a19d040275817d52d4f84e119976d6f9827..8d0f2f4a717eeb8739ec13ae569f297e63c9a864 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 527b57264302f1d1fffb14c28e419ece825ed1c9..0899afddcdc398ab10fd9c00a424daf850495326 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 7900e2ea6a161cb7b2ea5233d9765414a53ab46a..99f60e8a3ec84700e2c8ca1160e1412c35021668 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 dda534127e24bde24251736e405ef21e42359bd6..c6b74119d4e30c19523f1028867ba764fac35434 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 9b4131f398b2492a5935b9303b986ce587ead5ea..d37e4904f92539c666f0302c788f9356a52acacb 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 97830c11f3221ade366b4d9fb13e7b36cad9aa80..578818962cb9f7b8a5cc85a8897b82fcfd14a8a9 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/query-solution/src/schema/schema-resolver.ts b/packages/ui-vue/components/query-solution/src/schema/schema-resolver.ts index c9b083dee41be844c31211602c6fc78f3d71ce87..7158be02d0561b935638189e8aca69113853be9b 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 e334d8077432eb2620065c5b78eaf8a35f630017..294fb97404c94977ac731d2861d03c2eedea40ca 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-button/src/radio-button.props.ts b/packages/ui-vue/components/radio-button/src/radio-button.props.ts index 10f8f38f76be530f58dbca38623e43c3a8774c28..bec83a7b36fce922ca3370712b5358226a59ca97 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/radio-group/src/designer/radio-group.design.component.tsx b/packages/ui-vue/components/radio-group/src/designer/radio-group.design.component.tsx index 9d94faea7b5adaba5ae3666dff7a3284efcf46d0..979733f54c7cf44751749709eb31422754159352 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 c1fd77c50c8546fa6dae2c14163a3324401eb716..e9d3dfdfcf0ac3135473bb18b8f84a6f2d97eb79 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 3bf4142b77c8bf33cb415bab98434c7fb0b1a1e8..d0da8f8944af9de7af93bdb9d8fba5d6e18dc3f9 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/rate/src/rate.props.ts b/packages/ui-vue/components/rate/src/rate.props.ts index a10474f564390f7e9fec5ab7ada8e2d0fe667bed..c179016d1e05f5b92c3f9a7ca864ab95120f69c8 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/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 0625f19301aeb20b5b1776b31ddf332f49adff8b..513856f7a59d773b0b63a5878904a331ddcf41ca 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 ea67474b2010ce3cf1f1795f11e0d1b71bdd2aaa..b8b5c87dd7dbb5c08fdd47b0cab878c92c5830ef 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, 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 8281e830813486f277ff2f1c25046870edaa143b..550a8d359a4197ee223a33efe79e1ad69db15ba0 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/schema-selector/src/schema-selector-editor.props.ts b/packages/ui-vue/components/schema-selector/src/schema-selector-editor.props.ts index 67d954e85bf0e761c4f31f6859b840db3c26f0ea..fe00dca2aa118a1fb130ece2855119504cdc3cb5 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/designer/search-box.design.component.tsx b/packages/ui-vue/components/search-box/src/designer/search-box.design.component.tsx index d16b5efd2d3929cde84c40c8f08536c8beadeb03..212af8d171aad55be1b69dabf31c4101b2c5e3dd 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/search-box/src/search-box.props.ts b/packages/ui-vue/components/search-box/src/search-box.props.ts index a732dce5764313f331960a894be454432a6f1318..9f1efd1100892e5d1afce9857091d6051fb64a7b 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/designer/smoke-detector.design.component.tsx b/packages/ui-vue/components/smoke-detector/src/designer/smoke-detector.design.component.tsx index 42e04714b7f4554fea461dd9a871ecf9f2ad6b23..9b1a874f4d2db709a8b7a174c57fee355c277f33 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/smoke-detector/src/smoke-detector.props.ts b/packages/ui-vue/components/smoke-detector/src/smoke-detector.props.ts index 900abaf4210b84ad7d5227e8e44af8c939e76255..49e5faf9c18c3970d08c807e397a4a5ec9752e39 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 b4bda7507ce9b8904bc3d7830035ff1c60ab446a..41c2faafd411c8f7be1febdcf1f5cabfb839658e 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 9d8968001d7666d32714808e2d57d5b989ef4f10..7ffba918c27827fdd2709c19853132495b57ff5b 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/designer/splitter-pane-use-designer-rules.ts b/packages/ui-vue/components/splitter/src/designer/splitter-pane-use-designer-rules.ts index 5153addc0dc80d2102134947220ead0cb5b56d26..1b0f247d367dc629bdb92081147d846787b428a6 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 7825b1aa8be331113df0141aa87a8bc398d0d28a..f7b6657cf02e720117614d2b5829ea19f467e424 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 fe77113b364bb9f7f202795600ef5107cddd7ac3..d703549b3a8332898075b9bba51aa90d081cbdd4 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 72d45522c5a6e4747df21a48ca50842c02ee49c3..437ea0f94cfcc9d58a3758602e0f34587d512f82 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 2f221d9fe49c89c9d76d78052987b08e0a6755d9..49462bde59849c2c770839de9db48751f16fc4e2 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): ComponentSchema { diff --git a/packages/ui-vue/components/splitter/src/splitter.props.ts b/packages/ui-vue/components/splitter/src/splitter.props.ts index 74d18f9a892a720df028079f6bfa763a041b57a7..6cc1d21ce6d9be231b7a4338d6a87a930ff45656 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/designer/step.design.component.tsx b/packages/ui-vue/components/step/src/designer/step.design.component.tsx index 2d10cdab77876232696470595609957c1a83f5ae..05850c76a0b93dbeed7715f5c72568dc0091585a 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/step/src/step.props.ts b/packages/ui-vue/components/step/src/step.props.ts index e8a424e2cd59bbfd0891f2c9a4b36df5cca1f432..9f4431e39a2abcf7ce2b4a9c7d9b8a5f8867b360 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/tags/src/designer/tags.design.component.tsx b/packages/ui-vue/components/tags/src/designer/tags.design.component.tsx index fc16478c75b36c6c285249d8a327f2bfe133210a..d5bf979a675b3378cea44b6cf031430c32ca62ed 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 f6dd3a894babdf0a70e317dd74a66bb2439ac771..8b3e34aed59e8b7d74dbdbf3b4397ecc5252ca07 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/text/src/text.props.ts b/packages/ui-vue/components/text/src/text.props.ts index a24630fe30e293920bdcbf6cb081cbd827018b03..f6f11439227f678a5a5a16f2dc72d1371ae90fb6 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/time-picker/src/designer/use-design-rules.ts b/packages/ui-vue/components/time-picker/src/designer/use-design-rules.ts index 4d1bd0dcb1a1593581f2800f5453ea009c2d0636..cedd1236065dbf2f84f2cf639aa5bd92a0dc587d 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 28bf6e7355e24ee64d9180c458ffa69087e58fc6..2a3ebddf3d7dec3195a752f9ddaa26bb29f59eb1 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/transfer/src/transfer.props.ts b/packages/ui-vue/components/transfer/src/transfer.props.ts index a1d66f963ca3012b8d8fc22ed4935e631fbc6821..e741765f6fb2052ea6c69379ab836b3be57e274f 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 7b3f3a6d204f28991c7d3dca37a994571992bdfa..9dcc870dcf31270f84f36d066f3def655a6de2f8 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/designer/uploader.design.component.tsx b/packages/ui-vue/components/uploader/src/designer/uploader.design.component.tsx index 28ef40e04487a65edbeeb843625bdbc023d2dc9a..65b4dfb190f7571f91b46a0c708e459e245b341b 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/uploader/src/uploader.props.ts b/packages/ui-vue/components/uploader/src/uploader.props.ts index f3a3f25fb0d6420eae34c181b45797e769a0ed07..d23c82e1257b413d6b28c5f13e972f482583de18 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/designer/verify-detail.design.component.tsx b/packages/ui-vue/components/verify-detail/src/designer/verify-detail.design.component.tsx index e75d7f3bf5a0acd00fb99bcc3c480ba08160f8ad..cd4c3c83a76e3bbdc83c2f58a39fa45dcfafe2fb 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', 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 78ddf51bd5ecb9443da5a139d4ffb86300f35e5f..ccc0124e09f348a924439e94c3b7fbbd216b6a57 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';