diff --git a/packages/ui-vue/components/avatar/src/avatar.props.ts b/packages/ui-vue/components/avatar/src/avatar.props.ts index 95f2ced7b8c5e32bc50f9207fe0f04d98b12c64f..edddcc443eaac19bae91f533ff18e8e4d47e8a9a 100644 --- a/packages/ui-vue/components/avatar/src/avatar.props.ts +++ b/packages/ui-vue/components/avatar/src/avatar.props.ts @@ -15,7 +15,7 @@ * limitations under the License. */ import { ExtractPropTypes, PropType } from 'vue'; -import { createPropsResolver } from '../../dynamic-resolver/src/props-resolver'; +import { createPropsResolver } from '../../dynamic-resolver'; import { schemaResolver } from './schema/schema-resolver'; import { schemaMapper } from './schema/schema-mapper'; import avatarSchema from './schema/avatar.schema.json'; diff --git a/packages/ui-vue/components/button-group/src/schema/schema-resolver.ts b/packages/ui-vue/components/button-group/src/schema/schema-resolver.ts index b02bdf93eec9060948f579c53aa81e3963a7d706..d36ae7457434b7381b796814e9926d352feacff6 100644 --- a/packages/ui-vue/components/button-group/src/schema/schema-resolver.ts +++ b/packages/ui-vue/components/button-group/src/schema/schema-resolver.ts @@ -1,4 +1,4 @@ -import { DynamicResolver } from "../../../dynamic-resolver"; +import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver"; export function schemaResolver(resolver: DynamicResolver, schema: Record, context: Record): Record { return schema; diff --git a/packages/ui-vue/components/calendar/src/schema/schema-mapper.ts b/packages/ui-vue/components/calendar/src/schema/schema-mapper.ts index 97964aee23bbb8b523c7692723ea02db00d4f4c0..2ca33ca080647b9edc66a133396282d6a3b1698f 100644 --- a/packages/ui-vue/components/calendar/src/schema/schema-mapper.ts +++ b/packages/ui-vue/components/calendar/src/schema/schema-mapper.ts @@ -1,4 +1,4 @@ -import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver'; +import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver'; export const schemaMapper = new Map([ ['appearance', resolveAppearance] diff --git a/packages/ui-vue/components/calendar/src/schema/schema-resolver.ts b/packages/ui-vue/components/calendar/src/schema/schema-resolver.ts index b02bdf93eec9060948f579c53aa81e3963a7d706..d36ae7457434b7381b796814e9926d352feacff6 100644 --- a/packages/ui-vue/components/calendar/src/schema/schema-resolver.ts +++ b/packages/ui-vue/components/calendar/src/schema/schema-resolver.ts @@ -1,4 +1,4 @@ -import { DynamicResolver } from "../../../dynamic-resolver"; +import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver"; export function schemaResolver(resolver: DynamicResolver, schema: Record, context: Record): Record { return schema; diff --git a/packages/ui-vue/components/capsule/src/schema/schema-mapper.ts b/packages/ui-vue/components/capsule/src/schema/schema-mapper.ts index 97964aee23bbb8b523c7692723ea02db00d4f4c0..2ca33ca080647b9edc66a133396282d6a3b1698f 100644 --- a/packages/ui-vue/components/capsule/src/schema/schema-mapper.ts +++ b/packages/ui-vue/components/capsule/src/schema/schema-mapper.ts @@ -1,4 +1,4 @@ -import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver'; +import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver'; export const schemaMapper = new Map([ ['appearance', resolveAppearance] diff --git a/packages/ui-vue/components/capsule/src/schema/schema-resolver.ts b/packages/ui-vue/components/capsule/src/schema/schema-resolver.ts index b02bdf93eec9060948f579c53aa81e3963a7d706..d36ae7457434b7381b796814e9926d352feacff6 100644 --- a/packages/ui-vue/components/capsule/src/schema/schema-resolver.ts +++ b/packages/ui-vue/components/capsule/src/schema/schema-resolver.ts @@ -1,4 +1,4 @@ -import { DynamicResolver } from "../../../dynamic-resolver"; +import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver"; export function schemaResolver(resolver: DynamicResolver, schema: Record, context: Record): Record { return schema; 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 2f714ffd430643d449daa2f3093aa66446a2c7a7..a72bc06e12e13ecb17e00f843158800527985b23 100644 --- a/packages/ui-vue/components/color-picker/src/color-picker.props.ts +++ b/packages/ui-vue/components/color-picker/src/color-picker.props.ts @@ -16,7 +16,7 @@ * limitations under the License. */ import { ExtractPropTypes } from 'vue'; -import { createPropsResolver } from '../../dynamic-resolver/src/props-resolver'; +import { createPropsResolver } from '../../dynamic-resolver'; import colorPickerSchema from './schema/color-picker.schema.json'; import { schemaResolver } from './schema/schema-resolver'; import { schemaMapper } from './schema/schema-mapper'; diff --git a/packages/ui-vue/components/color-picker/src/schema/schema-mapper.ts b/packages/ui-vue/components/color-picker/src/schema/schema-mapper.ts index 97964aee23bbb8b523c7692723ea02db00d4f4c0..2ca33ca080647b9edc66a133396282d6a3b1698f 100644 --- a/packages/ui-vue/components/color-picker/src/schema/schema-mapper.ts +++ b/packages/ui-vue/components/color-picker/src/schema/schema-mapper.ts @@ -1,4 +1,4 @@ -import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver'; +import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver'; export const schemaMapper = new Map([ ['appearance', resolveAppearance] diff --git a/packages/ui-vue/components/color-picker/src/schema/schema-resolver.ts b/packages/ui-vue/components/color-picker/src/schema/schema-resolver.ts index b02bdf93eec9060948f579c53aa81e3963a7d706..d36ae7457434b7381b796814e9926d352feacff6 100644 --- a/packages/ui-vue/components/color-picker/src/schema/schema-resolver.ts +++ b/packages/ui-vue/components/color-picker/src/schema/schema-resolver.ts @@ -1,4 +1,4 @@ -import { DynamicResolver } from "../../../dynamic-resolver"; +import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver"; export function schemaResolver(resolver: DynamicResolver, schema: Record, context: Record): Record { return schema; 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 9061df624661b8dadbce21d301295f99aba58407..ea85eb2d70b47f93fe533d2f995dec5c93d7a8d1 100644 --- a/packages/ui-vue/components/component/src/composition/use-split-component.tsx +++ b/packages/ui-vue/components/component/src/composition/use-split-component.tsx @@ -3,7 +3,7 @@ import { DesignerHostService } from "../../../designer-canvas/src/composition/ty import { ComponentSchema, DesignerItemContext, DgControl } from "@farris/ui-vue/components/designer-canvas"; import { ModalFunctions } from "../../../modal/src/composition/type"; import SplitterFormComponent from '../components/split-form-component.component'; -import { getSchemaByType, schemaMap } from "../../../dynamic-resolver"; +import { getSchemaByType, schemaMap } from "@farris/ui-vue/components/dynamic-resolver"; import { useGuid } from "../../../common"; import { canvasChanged } from "../../../designer-canvas/src/composition/designer-canvas-changed"; import { refreshCanvas } from "../../../designer-canvas/src/composition/update-cancas"; diff --git a/packages/ui-vue/components/component/src/schema/schema-mapper.ts b/packages/ui-vue/components/component/src/schema/schema-mapper.ts index bc768d5bab9395cbd5d4faa5f1d2f86552f57980..bbc05c95ac2e8512ba07d52b13837a16aa16a60c 100644 --- a/packages/ui-vue/components/component/src/schema/schema-mapper.ts +++ b/packages/ui-vue/components/component/src/schema/schema-mapper.ts @@ -1,4 +1,4 @@ -import { resolveAppearance, MapperFunction } from '../../../dynamic-resolver'; +import { resolveAppearance, MapperFunction } from '@farris/ui-vue/components/dynamic-resolver'; export const schemaMapper = new Map([ ['appearance', resolveAppearance] diff --git a/packages/ui-vue/components/component/src/schema/schema-resolver.ts b/packages/ui-vue/components/component/src/schema/schema-resolver.ts index b02bdf93eec9060948f579c53aa81e3963a7d706..d36ae7457434b7381b796814e9926d352feacff6 100644 --- a/packages/ui-vue/components/component/src/schema/schema-resolver.ts +++ b/packages/ui-vue/components/component/src/schema/schema-resolver.ts @@ -1,4 +1,4 @@ -import { DynamicResolver } from "../../../dynamic-resolver"; +import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver"; export function schemaResolver(resolver: DynamicResolver, schema: Record, context: Record): Record { return schema; diff --git a/packages/ui-vue/components/content-container/src/schema/schema-mapper.ts b/packages/ui-vue/components/content-container/src/schema/schema-mapper.ts index bc768d5bab9395cbd5d4faa5f1d2f86552f57980..bbc05c95ac2e8512ba07d52b13837a16aa16a60c 100644 --- a/packages/ui-vue/components/content-container/src/schema/schema-mapper.ts +++ b/packages/ui-vue/components/content-container/src/schema/schema-mapper.ts @@ -1,4 +1,4 @@ -import { resolveAppearance, MapperFunction } from '../../../dynamic-resolver'; +import { resolveAppearance, MapperFunction } from '@farris/ui-vue/components/dynamic-resolver'; export const schemaMapper = new Map([ ['appearance', resolveAppearance] diff --git a/packages/ui-vue/components/content-container/src/schema/schema-resolver.ts b/packages/ui-vue/components/content-container/src/schema/schema-resolver.ts index b02bdf93eec9060948f579c53aa81e3963a7d706..d36ae7457434b7381b796814e9926d352feacff6 100644 --- a/packages/ui-vue/components/content-container/src/schema/schema-resolver.ts +++ b/packages/ui-vue/components/content-container/src/schema/schema-resolver.ts @@ -1,4 +1,4 @@ -import { DynamicResolver } from "../../../dynamic-resolver"; +import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver"; export function schemaResolver(resolver: DynamicResolver, schema: Record, context: Record): Record { return schema; 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 8d9a142f4646408c1c932cc89a9c10dfc955e9f7..0bacebc89773d4c68aa65aa3717efbd576c8e636 100644 --- a/packages/ui-vue/components/data-grid/src/composition/data-grid-component-creator.service.ts +++ b/packages/ui-vue/components/data-grid/src/composition/data-grid-component-creator.service.ts @@ -1,5 +1,5 @@ import { DesignerHostService } from '../../../designer-canvas/src/composition/types'; -import { DynamicResolver } from '../../../../components/dynamic-resolver'; +import { DynamicResolver } from '@farris/ui-vue/components/dynamic-resolver'; import { ComponentBuildInfo } from '../../../component/src/composition/inner-component-build-info'; import { ComponentSchema } from '../../../../components/designer-canvas'; import { FormSchemaEntityField$Type, FormSchemaEntityFieldTypeName } from '@farris/ui-vue/components/common'; diff --git a/packages/ui-vue/components/data-grid/src/designer/data-grid-column.props.ts b/packages/ui-vue/components/data-grid/src/designer/data-grid-column.props.ts index 7ac26ee91c1beceefa7bf84d52c31b3b30f46f31..b858152164f6a36918a8615f3835193d6d022b12 100644 --- a/packages/ui-vue/components/data-grid/src/designer/data-grid-column.props.ts +++ b/packages/ui-vue/components/data-grid/src/designer/data-grid-column.props.ts @@ -16,7 +16,7 @@ */ import { ExtractPropTypes, PropType, VNode } from 'vue'; import { EditorConfig } from '../../../dynamic-form'; -import { createPropsResolver } from '../../../dynamic-resolver'; +import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver'; import { columnSchemaMapper } from '../schema/schema-mapper'; import { columnSchemaResolver } from "../schema/schema-resolver"; import dataGridColumnSchema from '../schema/data-grid-column.schema.json'; diff --git a/packages/ui-vue/components/data-grid/src/designer/grid-field-editor.props.ts b/packages/ui-vue/components/data-grid/src/designer/grid-field-editor.props.ts index e5375b22297e3b124c14542f1f2f145d2ab213ab..92fd89e779659b3a196397c721cec4aff0df3a60 100644 --- a/packages/ui-vue/components/data-grid/src/designer/grid-field-editor.props.ts +++ b/packages/ui-vue/components/data-grid/src/designer/grid-field-editor.props.ts @@ -15,7 +15,7 @@ * limitations under the License. */ import { ExtractPropTypes } from 'vue'; -import { createPropsResolver } from '../../../dynamic-resolver'; +import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver'; import { schemaMapper } from '../schema/schema-mapper'; import { schemaResolver } from "../schema/schema-resolver"; import gridFieldEditorSchema from '../schema/grid-field-editor.schema.json'; diff --git a/packages/ui-vue/components/data-grid/src/schema/callback-resolvers.ts b/packages/ui-vue/components/data-grid/src/schema/callback-resolvers.ts index 70ef9e3582c677df3a2342e155a6128099099e10..9ea9b9ef78c553255213b951dedaef31c0707d36 100644 --- a/packages/ui-vue/components/data-grid/src/schema/callback-resolvers.ts +++ b/packages/ui-vue/components/data-grid/src/schema/callback-resolvers.ts @@ -1,5 +1,5 @@ import { DataColumn, VisualData, VisualDataCell } from "@/components/data-view"; -import { Caller } from "../../../dynamic-resolver"; +import { Caller } from "@farris/ui-vue/components/dynamic-resolver"; export function createDataGridCallbackResolver() { function resolve(viewSchema: Record, caller: Caller) { diff --git a/packages/ui-vue/components/data-grid/src/schema/schema-mapper.ts b/packages/ui-vue/components/data-grid/src/schema/schema-mapper.ts index cd9697fa1b699607adb3b48c48815c3a8071185d..549e56650c125e7c94843efe67dd62a3013220a1 100644 --- a/packages/ui-vue/components/data-grid/src/schema/schema-mapper.ts +++ b/packages/ui-vue/components/data-grid/src/schema/schema-mapper.ts @@ -1,4 +1,4 @@ -import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver'; +import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver'; import { resolveGridColumns } from './column-resolver'; export const schemaMapper = new Map([ 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 e74211489468e74c59f7b44f8f813fa206294df1..5513623b42c4939aec85f97ccf38834cfcabf438 100644 --- a/packages/ui-vue/components/data-grid/src/schema/schema-resolver.ts +++ b/packages/ui-vue/components/data-grid/src/schema/schema-resolver.ts @@ -1,7 +1,7 @@ import { ComponentBuildInfo } from "../../../component/src/composition/inner-component-build-info"; import { DesignerHostService } from "../../../designer-canvas/src/composition/types"; import { DesignerComponentInstance } from "../../../designer-canvas/src/types"; -import { DynamicResolver } from "../../../dynamic-resolver"; +import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver"; import { DataGridComponentCreatorService } from "../composition/data-grid-component-creator.service"; export function schemaResolver(resolver: DynamicResolver, schema: Record, context: Record, designerHostService?: DesignerHostService): Record { diff --git a/packages/ui-vue/components/date-picker/designer.ts b/packages/ui-vue/components/date-picker/designer.ts index 35097040c33ea01f68841696f67db90fa57b639d..048a43cd7f0a006483fa63f432d24e4e3a0c1527 100644 --- a/packages/ui-vue/components/date-picker/designer.ts +++ b/packages/ui-vue/components/date-picker/designer.ts @@ -2,8 +2,7 @@ import { withInstall } from '@farris/ui-vue/components/common'; import { DatePickerContainer, DatePicker, } from '@farris/ui-vue/components/date-picker'; import FDatePickerDesign from './src/designer/date-picker.design.component'; import FDateViewDesign from './src/designer/date-view.design.component'; -import { datePickerPropsResolver } from './src/designer/date-picker.design.props'; -import { dateViewPropsResolver } from './src/components/date-picker-container/date-picker-container.props'; +import { datePickerPropsResolver, dateViewPropsResolver } from './src/designer/date-picker.design.props'; FDatePickerDesign.register = (componentMap: Record, propsResolverMap: Record, configResolverMap: Record, resolverMap: Record) => { componentMap['date-picker'] = DatePicker; diff --git a/packages/ui-vue/components/date-picker/index.ts b/packages/ui-vue/components/date-picker/index.ts index 02a8633b078c96033f8c700881425b7626b4f22c..e149e2bf4cc8cabcec66b5279a9ffc7881e70af4 100644 --- a/packages/ui-vue/components/date-picker/index.ts +++ b/packages/ui-vue/components/date-picker/index.ts @@ -24,6 +24,7 @@ import DatePicker from './src/date-picker.component'; export * from './src/components/calendar/calendar.props'; export * from './src/date-picker.props'; +export * from './src/components/date-picker-container/date-picker-container.props'; export * from './src/types/calendar'; export * from './src/types/common'; diff --git a/packages/ui-vue/components/date-picker/src/components/date-picker-container/date-picker-container.component.tsx b/packages/ui-vue/components/date-picker/src/components/date-picker-container/date-picker-container.component.tsx index ebdad418a1d5b5c6befa4774d6c7a819b8755f3a..244eac9009d372b6d8fcdaaa641035e902174b3b 100644 --- a/packages/ui-vue/components/date-picker/src/components/date-picker-container/date-picker-container.component.tsx +++ b/packages/ui-vue/components/date-picker/src/components/date-picker-container/date-picker-container.component.tsx @@ -15,7 +15,8 @@ */ import { computed, defineComponent, onMounted, ref, SetupContext, watch, watchEffect } from "vue"; import { cloneDeep } from "lodash-es"; -import { FTimePickerTimeView, convertToDate, convertToString, TimeValueText } from '@farris/ui-vue/components/time-picker'; +import { useDateFormat, formatTime, getTimeObject } from '@farris/ui-vue/components/common'; +import { FTimePickerTimeView, TimeValueText } from '@farris/ui-vue/components/time-picker'; import { FButton } from "@farris/ui-vue/components/button"; import { datePickerContainerProps, DatePickerContainerProps, DisplayMode } from "./date-picker-container.props"; import FCalenderNavBar from '../calendar-navbar/calendar-navbar.component'; @@ -30,7 +31,6 @@ import { useDate } from "../../composition/use-date"; import { ActiveMonth } from "../../types/month"; import { useMonth } from "../../composition/use-month"; import { useYear } from "../../composition/use-year"; -import { useDateFormat, formatTime, getTimeObject } from '@farris/ui-vue/components/common'; import { CalenderDayItem } from "../../types/calendar"; import { useDisableMonth } from "../../composition/use-disable-month"; diff --git a/packages/ui-vue/components/date-picker/src/components/date-picker-container/date-picker-container.props.ts b/packages/ui-vue/components/date-picker/src/components/date-picker-container/date-picker-container.props.ts index 7e9205a40d21e96c948cec776b0e24dfbd83c24f..c2a40ec140f9fc5ddd4acdfc95987acb5c9127b9 100644 --- a/packages/ui-vue/components/date-picker/src/components/date-picker-container/date-picker-container.props.ts +++ b/packages/ui-vue/components/date-picker/src/components/date-picker-container/date-picker-container.props.ts @@ -15,15 +15,10 @@ * limitations under the License. */ import { ExtractPropTypes, PropType } from 'vue'; -import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver'; import { CalendarWeekItem } from '../../types/calendar'; import { DateObject, Period, SelectMode, weekDays } from '../../types/common'; import { defaultNameOfMonths, MonthViewItem } from '../../types/month'; import { YearViewItem } from '../../types/year'; -import { schemaMapper } from '../../schema/schema-mapper'; -import { schemaResolver } from '../../schema/schema-resolver'; -import dateViewSchema from '../../schema/date-view.schema.json'; -import propertyConfig from '../../property-config/date-view.property-config.json'; export type DisplayMode = 'Embedded' | 'Popup'; @@ -103,5 +98,3 @@ export const datePickerContainerProps = { } as Record; export type DatePickerContainerProps = ExtractPropTypes; - -export const dateViewPropsResolver = createPropsResolver(datePickerContainerProps, dateViewSchema, schemaMapper, schemaResolver, propertyConfig); diff --git a/packages/ui-vue/components/date-picker/src/designer/date-picker.design.props.ts b/packages/ui-vue/components/date-picker/src/designer/date-picker.design.props.ts index 792737f1d60fa2aa70202d13b8bf90e36b5302f7..986733ba4c422cb79bc4b7742a2716b3b17fcdf3 100644 --- a/packages/ui-vue/components/date-picker/src/designer/date-picker.design.props.ts +++ b/packages/ui-vue/components/date-picker/src/designer/date-picker.design.props.ts @@ -1,10 +1,12 @@ import { ExtractPropTypes } from 'vue'; import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver'; -import { datePickerProps, DatePickerProps } from '@farris/ui-vue/components/date-picker'; +import { datePickerProps, DatePickerProps, DatePickerContainerProps, datePickerContainerProps } from '@farris/ui-vue/components/date-picker'; import { schemaResolver } from '../schema/schema-resolver'; import { schemaMapper } from '../schema/schema-mapper'; import datePickerSchema from '../schema/date-picker.schema.json'; +import dateViewSchema from '../schema/date-view.schema.json'; +import propertyConfig from '../property-config/date-view.property-config.json'; export const MAX_DATE = { year: 9999, month: 12, day: 31, hour: 23, minute: 59, second: 59 }; export const MIN_DATE = { year: 1900, month: 1, day: 1, hour: 0, minute: 0, second: 0 }; @@ -16,3 +18,5 @@ export const datePickerDesignProps = Object.assign({}, datePickerProps, { export type DatePickerDesignProps = ExtractPropTypes; export const datePickerPropsResolver = createPropsResolver(datePickerProps, datePickerSchema, schemaMapper, schemaResolver); + +export const dateViewPropsResolver = createPropsResolver(datePickerContainerProps, dateViewSchema, schemaMapper, schemaResolver, propertyConfig); diff --git a/packages/ui-vue/components/designer-canvas/src/components/maps.ts b/packages/ui-vue/components/designer-canvas/src/components/maps.ts index 5e58ac5cd4a69652a3e6a574f22b1365b72541fd..4e752b831718f1de3d72f48149e9445c9764cc66 100644 --- a/packages/ui-vue/components/designer-canvas/src/components/maps.ts +++ b/packages/ui-vue/components/designer-canvas/src/components/maps.ts @@ -22,7 +22,7 @@ import FListNav from '@farris/ui-vue/components/list-nav'; import FListView from '@farris/ui-vue/components/list-view'; import FLookup from '@farris/ui-vue/components/lookup'; import FNav from '@farris/ui-vue/components/nav'; -import FNumberSpinner from '@farris/ui-vue/components/number-spinner'; +import FNumberSpinner from '@farris/ui-vue/components/number-spinner/designer'; import FNumberRange from '@farris/ui-vue/components/number-range'; import FOrder from '@farris/ui-vue/components/order'; import FPageHeader from '@farris/ui-vue/components/page-header'; @@ -40,11 +40,11 @@ import FSection from '@farris/ui-vue/components/section/designer'; import FSmokeDetector from '@farris/ui-vue/components/smoke-detector'; import FSplitter from '@farris/ui-vue/components/splitter'; import FStep from '@farris/ui-vue/components/step'; -import FSwitch from '@farris/ui-vue/components/switch'; +import FSwitch from '@farris/ui-vue/components/switch/designer'; import FTab from '@farris/ui-vue/components/tabs/designer'; -import FTags from '@farris/ui-vue/components/tags'; +import FTags from '@farris/ui-vue/components/tags/designer'; import FText from '@farris/ui-vue/components/text'; -import FTimePicker from '@farris/ui-vue/components/time-picker'; +import FTimePicker from '@farris/ui-vue/components/time-picker/designer'; import FTransfer from '@farris/ui-vue/components/transfer'; import FTreeview from '@farris/ui-vue/components/tree-view'; import FUploader from '@farris/ui-vue/components/uploader'; diff --git a/packages/ui-vue/components/designer-canvas/src/composition/function/use-designer-component.ts b/packages/ui-vue/components/designer-canvas/src/composition/function/use-designer-component.ts index e64ade5f6bc1ed2dbf2f01970e936320b24964f2..a9a9fddb936fc7d73cbaf8bee3da7fbbe5eac090 100644 --- a/packages/ui-vue/components/designer-canvas/src/composition/function/use-designer-component.ts +++ b/packages/ui-vue/components/designer-canvas/src/composition/function/use-designer-component.ts @@ -1,7 +1,7 @@ import { Ref, ref } from "vue"; import { DesignerHostService, DesignerHTMLElement, DraggingResolveContext, UseDesignerRules } from "../types"; import { ComponentSchema, DesignerComponentInstance, DesignerItemContext } from "../../types"; -import { getSchemaByType } from '../../../../dynamic-resolver/src/schema-resolver'; +import { getSchemaByType } from '@farris/ui-vue/components/dynamic-resolver'; export function useDesignerComponent( elementRef: Ref, diff --git a/packages/ui-vue/components/designer-canvas/src/composition/function/use-designer-inner-component.ts b/packages/ui-vue/components/designer-canvas/src/composition/function/use-designer-inner-component.ts index 07336537dc9a387694c1cc72443e44471bd62e1e..f7c9e1e5421eca2e5bf065b9544bec7321e48c9b 100644 --- a/packages/ui-vue/components/designer-canvas/src/composition/function/use-designer-inner-component.ts +++ b/packages/ui-vue/components/designer-canvas/src/composition/function/use-designer-inner-component.ts @@ -1,7 +1,7 @@ import { inject, Ref, ref } from "vue"; import { DesignerHostService, DesignerHTMLElement, DraggingResolveContext, UseDesignerRules } from "../types"; import { ComponentSchema, DesignerComponentInstance, DesignerItemContext } from "../../types"; -import { getSchemaByType } from '../../../../dynamic-resolver/src/schema-resolver'; +import { getSchemaByType } from '@farris/ui-vue/components/dynamic-resolver'; export function useDesignerInnerComponent( elementRef: Ref, 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 e793a606f28c08f6552fc9a12a3eb2c3104e279a..ae1efe3667bd17897d748c04d1026c2cff9e43b3 100644 --- a/packages/ui-vue/components/dynamic-form/src/designer/form-group.design.component.tsx +++ b/packages/ui-vue/components/dynamic-form/src/designer/form-group.design.component.tsx @@ -4,7 +4,7 @@ import { DynamicFormGroupPropsType, dynamicFormGroupProps } from '../component/d import { DesignerItemContext } from '../../../designer-canvas/src/types'; import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component'; import FDynamicFormGroupDesign from '../component/dynamic-form-group/dynamic-form-group.design.component'; -import { propertyConfigSchemaMap } from '../../../../components/dynamic-resolver/src/property-config-resolver'; +import { propertyConfigSchemaMap } from '@farris/ui-vue/components/dynamic-resolver'; import { DesignerHostService } from '../../../../components/designer-canvas/src/composition/types'; import { useDesignerRulesForFormGroup } from './form-group-use-designer-rules'; diff --git a/packages/ui-vue/components/dynamic-form/src/schema/response-form-schema-resolver.ts b/packages/ui-vue/components/dynamic-form/src/schema/response-form-schema-resolver.ts index 8c4c432523175ccb41f3e6b149591a0300f89056..747d56aa51ccf626c4c314a6483091f936defabb 100644 --- a/packages/ui-vue/components/dynamic-form/src/schema/response-form-schema-resolver.ts +++ b/packages/ui-vue/components/dynamic-form/src/schema/response-form-schema-resolver.ts @@ -2,7 +2,7 @@ import { ComponentBuildInfo } from "../../../component/src/composition/inner-component-build-info"; import { DesignerHostService } from "../../../designer-canvas/src/composition/types"; import { DesignerComponentInstance } from "../../../designer-canvas/src/types"; -import { DynamicResolver } from "../../../dynamic-resolver"; +import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver"; import { ResponseFormComponentCreatorService } from "../composition/response-form-component-creator.service"; export function reponseFormSchemaResolver(resolver: DynamicResolver, schema: Record, context: Record, designerHostService?: DesignerHostService): Record { diff --git a/packages/ui-vue/components/dynamic-form/src/schema/schema-mapper.ts b/packages/ui-vue/components/dynamic-form/src/schema/schema-mapper.ts index 2ceeed5d5dacae8be7703f18b43d5eeff55868a4..06f647cfb1020a75ca67d64756669c4be7e947b7 100644 --- a/packages/ui-vue/components/dynamic-form/src/schema/schema-mapper.ts +++ b/packages/ui-vue/components/dynamic-form/src/schema/schema-mapper.ts @@ -1,4 +1,4 @@ -import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver'; +import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver'; export const schemaMapper = new Map([ ['appearance', resolveAppearance] diff --git a/packages/ui-vue/components/dynamic-resolver/src/converter/appearance.converter.ts b/packages/ui-vue/components/dynamic-resolver/src/converter/appearance.converter.ts index b6ca97b8dff89c0bce1fd44020c8388e552d2428..7a2bb1b8459e979bfbd81141276b5aba911822e6 100644 --- a/packages/ui-vue/components/dynamic-resolver/src/converter/appearance.converter.ts +++ b/packages/ui-vue/components/dynamic-resolver/src/converter/appearance.converter.ts @@ -1,4 +1,4 @@ -import { ComponentSchema } from "../../../designer-canvas/src/types"; +import { ComponentSchema } from "@farris/ui-vue/components/designer-canvas"; import { PropertyConverter, SchemaService } from "../types"; export default { diff --git a/packages/ui-vue/components/dynamic-resolver/src/converter/buttons.converter.ts b/packages/ui-vue/components/dynamic-resolver/src/converter/buttons.converter.ts index abfb60a4d295ffa47437e918cd566e80e7908a4d..826258494c6d75dce1f984057f97db21be845f0f 100644 --- a/packages/ui-vue/components/dynamic-resolver/src/converter/buttons.converter.ts +++ b/packages/ui-vue/components/dynamic-resolver/src/converter/buttons.converter.ts @@ -1,4 +1,4 @@ -import { ComponentSchema } from "../../../designer-canvas/src/types"; +import { ComponentSchema } from "@farris/ui-vue/components/designer-canvas"; import { PropertyConverter, SchemaService } from "../types"; export default { diff --git a/packages/ui-vue/components/dynamic-resolver/src/converter/change-editor.converter.ts b/packages/ui-vue/components/dynamic-resolver/src/converter/change-editor.converter.ts index 61e5ef06b48fb0060091dc693d490bb44c31df24..dc92f1c600260ce0cae377cb24b8cd4b72fe3f2b 100644 --- a/packages/ui-vue/components/dynamic-resolver/src/converter/change-editor.converter.ts +++ b/packages/ui-vue/components/dynamic-resolver/src/converter/change-editor.converter.ts @@ -1,4 +1,4 @@ -import { ComponentSchema } from "../../../designer-canvas/src/types"; +import { ComponentSchema } from "@farris/ui-vue/components/designer-canvas"; import { PropertyConverter, SchemaService } from "../types"; export default { diff --git a/packages/ui-vue/components/dynamic-resolver/src/converter/grid-selection.converter.ts b/packages/ui-vue/components/dynamic-resolver/src/converter/grid-selection.converter.ts index b37faa1b46e3dd9b97dd5b8c7183e7202b03f226..5299a6a1b84fd2af2ba96d5e6059de445c1f33f1 100644 --- a/packages/ui-vue/components/dynamic-resolver/src/converter/grid-selection.converter.ts +++ b/packages/ui-vue/components/dynamic-resolver/src/converter/grid-selection.converter.ts @@ -1,4 +1,4 @@ -import { ComponentSchema } from "../../../designer-canvas/src/types"; +import { ComponentSchema } from "@farris/ui-vue/components/designer-canvas"; import { PropertyConverter, SchemaService } from "../types"; export default { convertTo: (schema: ComponentSchema, propertyKey: string, propertyValue: any, schemaService: SchemaService) => { diff --git a/packages/ui-vue/components/dynamic-resolver/src/converter/items-count.converter.ts b/packages/ui-vue/components/dynamic-resolver/src/converter/items-count.converter.ts index 288438ef0f2b17a5b63d26388c4f6ec65589a75e..c1871cc0344266894985823d840ac6c0664a4bba 100644 --- a/packages/ui-vue/components/dynamic-resolver/src/converter/items-count.converter.ts +++ b/packages/ui-vue/components/dynamic-resolver/src/converter/items-count.converter.ts @@ -1,4 +1,4 @@ -import { ComponentSchema } from "../../../designer-canvas/src/types"; +import { ComponentSchema } from "@farris/ui-vue/components/designer-canvas"; import { PropertyConverter, SchemaService } from "../types"; export default { diff --git a/packages/ui-vue/components/dynamic-resolver/src/converter/pagination.converter.ts b/packages/ui-vue/components/dynamic-resolver/src/converter/pagination.converter.ts index ebf0e2bb56a5c1011f6ff81f0dffdd9aebe1a5d4..949fd0402a7d7552cf2fc9810d24e7128fb87801 100644 --- a/packages/ui-vue/components/dynamic-resolver/src/converter/pagination.converter.ts +++ b/packages/ui-vue/components/dynamic-resolver/src/converter/pagination.converter.ts @@ -1,4 +1,4 @@ -import { ComponentSchema } from "../../../designer-canvas/src/types"; +import { ComponentSchema } from "@farris/ui-vue/components/designer-canvas"; import { PropertyConverter, SchemaService } from "../types"; /** * NG版,此处pagination类型是布尔 diff --git a/packages/ui-vue/components/dynamic-resolver/src/converter/property-editor.converter.ts b/packages/ui-vue/components/dynamic-resolver/src/converter/property-editor.converter.ts index e6e83cae987d6437ee8e7a1879641f845a0b9f0d..7c35de8510ada06b27ba8338f668b5cc66da2954 100644 --- a/packages/ui-vue/components/dynamic-resolver/src/converter/property-editor.converter.ts +++ b/packages/ui-vue/components/dynamic-resolver/src/converter/property-editor.converter.ts @@ -1,4 +1,4 @@ -import { ComponentSchema } from "../../../designer-canvas/src/types"; +import { ComponentSchema } from "@farris/ui-vue/components/designer-canvas"; import { PropertyConverter, SchemaService } from "../types"; export default { diff --git a/packages/ui-vue/components/dynamic-resolver/src/converter/row-number.converter.ts b/packages/ui-vue/components/dynamic-resolver/src/converter/row-number.converter.ts index 929fb4e037af6a0ecd1de5b07549c82212a7d849..f3ea8c962dbfa2ed3de1735abfebb3b1556cc52e 100644 --- a/packages/ui-vue/components/dynamic-resolver/src/converter/row-number.converter.ts +++ b/packages/ui-vue/components/dynamic-resolver/src/converter/row-number.converter.ts @@ -1,4 +1,4 @@ -import { ComponentSchema } from "../../../designer-canvas/src/types"; +import { ComponentSchema } from "@farris/ui-vue/components/designer-canvas"; import { PropertyConverter, SchemaService } from "../types"; export default { convertTo: (schema: ComponentSchema, propertyKey: string, propertyValue: any, schemaService: SchemaService) => { diff --git a/packages/ui-vue/components/dynamic-resolver/src/converter/type.converter.ts b/packages/ui-vue/components/dynamic-resolver/src/converter/type.converter.ts index f3e2f4c71f0671f8aca0b0dd26fba07948ed1648..774c240617edbba5f374c5090cbc7a33db95aba4 100644 --- a/packages/ui-vue/components/dynamic-resolver/src/converter/type.converter.ts +++ b/packages/ui-vue/components/dynamic-resolver/src/converter/type.converter.ts @@ -1,5 +1,4 @@ -import { ComponentSchema } from "../../../designer-canvas/src/types"; -import { DgControl } from "../../../designer-canvas/src/composition/dg-control"; +import { ComponentSchema, DgControl } from "@farris/ui-vue/components/designer-canvas"; import { PropertyConverter, SchemaService } from "../types"; export default { diff --git a/packages/ui-vue/components/dynamic-resolver/src/property-config-resolver.ts b/packages/ui-vue/components/dynamic-resolver/src/property-config-resolver.ts index 5ad10da4e6f8d3f93feb7e1d8df702ff31645cde..daf0bb93a785bdfa3528b3403ecf81595ddcb519 100644 --- a/packages/ui-vue/components/dynamic-resolver/src/property-config-resolver.ts +++ b/packages/ui-vue/components/dynamic-resolver/src/property-config-resolver.ts @@ -1,8 +1,9 @@ import { computed, ref } from "vue"; +import { EditorConfig } from "@farris/ui-vue/components/dynamic-form"; +import { ComponentSchema } from "@farris/ui-vue/components/designer-canvas"; +import { ElementPropertyConfig, PropertyEntity } from "@farris/ui-vue/components/property-panel"; import { EffectFunction, PropertyConverter, SchemaService } from './types'; -import { EditorConfig } from "../../dynamic-form"; import { useObjectExpression } from './object-expression'; -import { ComponentSchema } from "../../designer-canvas/src/types"; import { resolveSchemaWithDefaultValue } from "./schema-resolver"; import appearanceConverter from './converter/appearance.converter'; import buttonsConverter from "./converter/buttons.converter"; @@ -13,7 +14,6 @@ import fieldSelectorConverter from "./converter/field-selector.converter"; import paginationConverter from "./converter/pagination.converter"; import rowNumberConverter from "./converter/row-number.converter"; import gridSelectionConverter from "./converter/grid-selection.converter"; -import { ElementPropertyConfig, PropertyEntity } from "../../property-panel/src/composition/entity/property-entity"; import itemsCountConverter from "./converter/items-count.converter"; import formGroupLabelConverter from "./converter/form-group-label.converter"; diff --git a/packages/ui-vue/components/dynamic-resolver/src/props-resolver.ts b/packages/ui-vue/components/dynamic-resolver/src/props-resolver.ts index 8884abfc4391baa04395f2139a9e621e86fe3f4f..ccb91d3c4c91da7e22cdfb372d46e36b6b4de6f9 100644 --- a/packages/ui-vue/components/dynamic-resolver/src/props-resolver.ts +++ b/packages/ui-vue/components/dynamic-resolver/src/props-resolver.ts @@ -1,4 +1,4 @@ -import { DesignerHostService } from './../../designer-canvas/src/composition/types'; +import { DesignerHostService } from '@farris/ui-vue/components/designer-canvas'; import { mappingSchemaToProps, resolveSchemaToProps, schemaMap, schemaResolverMap } from './schema-resolver'; import { DynamicResolver, EffectFunction, MapperFunction, SchemaResolverFunction } from './types'; import { propertyConfigSchemaMap, propertyEffectMap } from './property-config-resolver'; diff --git a/packages/ui-vue/components/dynamic-resolver/src/schema-resolver.ts b/packages/ui-vue/components/dynamic-resolver/src/schema-resolver.ts index d9adc5dfc3560c0b31e2e2666fdd9c1a60e537fb..c770142db5d374156046fbc6c188fb6f2f4cf16e 100644 --- a/packages/ui-vue/components/dynamic-resolver/src/schema-resolver.ts +++ b/packages/ui-vue/components/dynamic-resolver/src/schema-resolver.ts @@ -1,5 +1,5 @@ import { cloneDeep, isPlainObject } from "lodash-es"; -import { DesignerHostService } from "../../designer-canvas/src/composition/types"; +import { DesignerHostService } from "@farris/ui-vue/components/designer-canvas"; import { MapperFunction, SchemaResolverFunction } from "./types"; const schemaMap = {} as Record; diff --git a/packages/ui-vue/components/dynamic-resolver/src/types.ts b/packages/ui-vue/components/dynamic-resolver/src/types.ts index 5c096dff439b022863b4fe4b12610e9338c55117..3b5d9e5add530ea39b7b0c7ce173b67e96f802f5 100644 --- a/packages/ui-vue/components/dynamic-resolver/src/types.ts +++ b/packages/ui-vue/components/dynamic-resolver/src/types.ts @@ -1,5 +1,5 @@ -import { DesignerHostService } from "../../designer-canvas/src/composition/types"; +import { DesignerHostService } from "@farris/ui-vue/components/designer-canvas"; export type MapperFunction = (key: string, value: any, resolvedSchema?: any) => Record; diff --git a/packages/ui-vue/components/dynamic-view/src/components/maps.ts b/packages/ui-vue/components/dynamic-view/src/components/maps.ts index 953b72299898b8858fa667db8f509b522bdd0c0b..da2061f6fe0020c42194bdcad08ae863787c9069 100644 --- a/packages/ui-vue/components/dynamic-view/src/components/maps.ts +++ b/packages/ui-vue/components/dynamic-view/src/components/maps.ts @@ -28,7 +28,7 @@ import FLookup from '@farris/ui-vue/components/lookup'; import FMappingEditor from '@farris/ui-vue/components/mapping-editor'; import FNav from '@farris/ui-vue/components/nav'; import FNumberRange from '@farris/ui-vue/components/number-range'; -import FNumberSpinner from '@farris/ui-vue/components/number-spinner'; +import FNumberSpinner from '@farris/ui-vue/components/number-spinner/designer'; import FOrder from '@farris/ui-vue/components/order'; import FPageHeader from '@farris/ui-vue/components/page-header'; import FPageFooter from '@farris/ui-vue/components/page-footer'; @@ -45,11 +45,11 @@ import FSection from '@farris/ui-vue/components/section/designer'; import FSmokeDetector from '@farris/ui-vue/components/smoke-detector'; import FSplitter from '@farris/ui-vue/components/splitter'; import FStep from '@farris/ui-vue/components/step'; -import FSwitch from '@farris/ui-vue/components/switch'; +import FSwitch from '@farris/ui-vue/components/switch/designer'; import FTabs from '@farris/ui-vue/components/tabs/designer'; -import FTags from '@farris/ui-vue/components/tags'; +import FTags from '@farris/ui-vue/components/tags/designer'; import FText from '@farris/ui-vue/components/text'; -import FTimePicker from '@farris/ui-vue/components/time-picker'; +import FTimePicker from '@farris/ui-vue/components/time-picker/designer'; import FTransfer from '@farris/ui-vue/components/transfer'; import FTreeview from '@farris/ui-vue/components/tree-view'; import FUploader from '@farris/ui-vue/components/uploader'; diff --git a/packages/ui-vue/components/dynamic-view/src/composition/use-binding-data.ts b/packages/ui-vue/components/dynamic-view/src/composition/use-binding-data.ts index f569b2703eed7ba4a3c62b6268058dd0ced1e0ff..01b08a288753e68cc0409de5fef738a1bece28dd 100644 --- a/packages/ui-vue/components/dynamic-view/src/composition/use-binding-data.ts +++ b/packages/ui-vue/components/dynamic-view/src/composition/use-binding-data.ts @@ -1,4 +1,4 @@ -import { BindingData } from "../../../dynamic-resolver"; +import { BindingData } from "@farris/ui-vue/components/dynamic-resolver"; import { Ref, SetupContext } from "vue"; export function useBindingData(modelValue: Ref>, setupContext: SetupContext): BindingData { diff --git a/packages/ui-vue/components/events-editor/src/schema/schema-mapper.ts b/packages/ui-vue/components/events-editor/src/schema/schema-mapper.ts index 97964aee23bbb8b523c7692723ea02db00d4f4c0..2ca33ca080647b9edc66a133396282d6a3b1698f 100644 --- a/packages/ui-vue/components/events-editor/src/schema/schema-mapper.ts +++ b/packages/ui-vue/components/events-editor/src/schema/schema-mapper.ts @@ -1,4 +1,4 @@ -import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver'; +import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver'; export const schemaMapper = new Map([ ['appearance', resolveAppearance] diff --git a/packages/ui-vue/components/events-editor/src/schema/schema-resolver.ts b/packages/ui-vue/components/events-editor/src/schema/schema-resolver.ts index b02bdf93eec9060948f579c53aa81e3963a7d706..d36ae7457434b7381b796814e9926d352feacff6 100644 --- a/packages/ui-vue/components/events-editor/src/schema/schema-resolver.ts +++ b/packages/ui-vue/components/events-editor/src/schema/schema-resolver.ts @@ -1,4 +1,4 @@ -import { DynamicResolver } from "../../../dynamic-resolver"; +import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver"; export function schemaResolver(resolver: DynamicResolver, schema: Record, context: Record): Record { return schema; diff --git a/packages/ui-vue/components/fieldset/src/schema/schema-mapper.ts b/packages/ui-vue/components/fieldset/src/schema/schema-mapper.ts index a12602b5b0e7624f873fdcce76f29a36eaf35992..c651ec91b1a9791c67433f968d580c0c9ffaaa38 100644 --- a/packages/ui-vue/components/fieldset/src/schema/schema-mapper.ts +++ b/packages/ui-vue/components/fieldset/src/schema/schema-mapper.ts @@ -1,4 +1,4 @@ -import { MapperFunction, resolveAppearance, resolveToolbar } from '../../../dynamic-resolver'; +import { MapperFunction, resolveAppearance, resolveToolbar } from '@farris/ui-vue/components/dynamic-resolver'; export const schemaMapper = new Map([ ['appearance', resolveAppearance] diff --git a/packages/ui-vue/components/fieldset/src/schema/schema-resolver.ts b/packages/ui-vue/components/fieldset/src/schema/schema-resolver.ts index bea2763338190f6a6701430c1b825259f8fa4c6a..0e0e1ff5df45a1b79bb433c4c29f17be72a30d47 100644 --- a/packages/ui-vue/components/fieldset/src/schema/schema-resolver.ts +++ b/packages/ui-vue/components/fieldset/src/schema/schema-resolver.ts @@ -1,4 +1,4 @@ -import { DynamicResolver } from "../../../dynamic-resolver"; +import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver"; export function schemaResolver(resolver: DynamicResolver, schema: Record, context: Record): Record { diff --git a/packages/ui-vue/components/filter-bar/src/designer/filter-bar-config/filter-bar-config.props.ts b/packages/ui-vue/components/filter-bar/src/designer/filter-bar-config/filter-bar-config.props.ts index ea8f4730c1b9f4b75340c8f9d4d2529fa1bef586..e21ffdb0f8b588542bd969227a34c5e3237e51a4 100644 --- a/packages/ui-vue/components/filter-bar/src/designer/filter-bar-config/filter-bar-config.props.ts +++ b/packages/ui-vue/components/filter-bar/src/designer/filter-bar-config/filter-bar-config.props.ts @@ -16,7 +16,7 @@ import { ExtractPropTypes, PropType } from 'vue'; import { FieldConfig } from '../../../../condition/src/types'; -import { createPropsResolver } from '../../../../dynamic-resolver'; +import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver'; import filterBarConfigSchema from './schema/filter-bar-config.schema.json'; import { schemaMapper } from './schema/schema-mapper'; import { schemaResolver } from './schema/schema-resolver'; diff --git a/packages/ui-vue/components/filter-bar/src/designer/filter-bar-config/schema/schema-mapper.ts b/packages/ui-vue/components/filter-bar/src/designer/filter-bar-config/schema/schema-mapper.ts index 90179d1bf1b123025ff1a5036cfad73b2f18e2d9..74c1e9dd6c759f4e28696f6891a9def5f31eee76 100644 --- a/packages/ui-vue/components/filter-bar/src/designer/filter-bar-config/schema/schema-mapper.ts +++ b/packages/ui-vue/components/filter-bar/src/designer/filter-bar-config/schema/schema-mapper.ts @@ -1,4 +1,4 @@ -import { MapperFunction, resolveAppearance } from '../../../../../dynamic-resolver'; +import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver'; // import {resolvePreset} from './preset-resolver'; export const schemaMapper = new Map([ diff --git a/packages/ui-vue/components/filter-bar/src/designer/filter-bar-config/schema/schema-resolver.ts b/packages/ui-vue/components/filter-bar/src/designer/filter-bar-config/schema/schema-resolver.ts index a07d8e91d22d18baaac9ea55ad0b9085c0d96976..d36ae7457434b7381b796814e9926d352feacff6 100644 --- a/packages/ui-vue/components/filter-bar/src/designer/filter-bar-config/schema/schema-resolver.ts +++ b/packages/ui-vue/components/filter-bar/src/designer/filter-bar-config/schema/schema-resolver.ts @@ -1,4 +1,4 @@ -import { DynamicResolver } from "../../../../../dynamic-resolver"; +import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver"; export function schemaResolver(resolver: DynamicResolver, schema: Record, context: Record): Record { return schema; diff --git a/packages/ui-vue/components/filter-bar/src/schema/schema-mapper.ts b/packages/ui-vue/components/filter-bar/src/schema/schema-mapper.ts index 97964aee23bbb8b523c7692723ea02db00d4f4c0..2ca33ca080647b9edc66a133396282d6a3b1698f 100644 --- a/packages/ui-vue/components/filter-bar/src/schema/schema-mapper.ts +++ b/packages/ui-vue/components/filter-bar/src/schema/schema-mapper.ts @@ -1,4 +1,4 @@ -import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver'; +import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver'; export const schemaMapper = new Map([ ['appearance', resolveAppearance] diff --git a/packages/ui-vue/components/filter-bar/src/schema/schema-resolver.ts b/packages/ui-vue/components/filter-bar/src/schema/schema-resolver.ts index b02bdf93eec9060948f579c53aa81e3963a7d706..d36ae7457434b7381b796814e9926d352feacff6 100644 --- a/packages/ui-vue/components/filter-bar/src/schema/schema-resolver.ts +++ b/packages/ui-vue/components/filter-bar/src/schema/schema-resolver.ts @@ -1,4 +1,4 @@ -import { DynamicResolver } from "../../../dynamic-resolver"; +import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver"; export function schemaResolver(resolver: DynamicResolver, schema: Record, context: Record): Record { return schema; diff --git a/packages/ui-vue/components/html-template/src/schema/schema-mapper.ts b/packages/ui-vue/components/html-template/src/schema/schema-mapper.ts index ec92a2a712f693a0b6d694d3475dcf191812651b..8e0bbfafa574bca386aab01db7d9596c4992e6b5 100644 --- a/packages/ui-vue/components/html-template/src/schema/schema-mapper.ts +++ b/packages/ui-vue/components/html-template/src/schema/schema-mapper.ts @@ -1,3 +1,3 @@ -import { MapperFunction } from '../../../dynamic-resolver'; +import { MapperFunction } from '@farris/ui-vue/components/dynamic-resolver'; export const schemaMapper = new Map([]); diff --git a/packages/ui-vue/components/html-template/src/schema/schema-resolver.ts b/packages/ui-vue/components/html-template/src/schema/schema-resolver.ts index b02bdf93eec9060948f579c53aa81e3963a7d706..d36ae7457434b7381b796814e9926d352feacff6 100644 --- a/packages/ui-vue/components/html-template/src/schema/schema-resolver.ts +++ b/packages/ui-vue/components/html-template/src/schema/schema-resolver.ts @@ -1,4 +1,4 @@ -import { DynamicResolver } from "../../../dynamic-resolver"; +import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver"; export function schemaResolver(resolver: DynamicResolver, schema: Record, context: Record): Record { return schema; diff --git a/packages/ui-vue/components/image-cropper/src/schema/schema-mapper.ts b/packages/ui-vue/components/image-cropper/src/schema/schema-mapper.ts index 97964aee23bbb8b523c7692723ea02db00d4f4c0..2ca33ca080647b9edc66a133396282d6a3b1698f 100644 --- a/packages/ui-vue/components/image-cropper/src/schema/schema-mapper.ts +++ b/packages/ui-vue/components/image-cropper/src/schema/schema-mapper.ts @@ -1,4 +1,4 @@ -import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver'; +import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver'; export const schemaMapper = new Map([ ['appearance', resolveAppearance] diff --git a/packages/ui-vue/components/image-cropper/src/schema/schema-resolver.ts b/packages/ui-vue/components/image-cropper/src/schema/schema-resolver.ts index b02bdf93eec9060948f579c53aa81e3963a7d706..d36ae7457434b7381b796814e9926d352feacff6 100644 --- a/packages/ui-vue/components/image-cropper/src/schema/schema-resolver.ts +++ b/packages/ui-vue/components/image-cropper/src/schema/schema-resolver.ts @@ -1,4 +1,4 @@ -import { DynamicResolver } from "../../../dynamic-resolver"; +import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver"; export function schemaResolver(resolver: DynamicResolver, schema: Record, context: Record): Record { return schema; diff --git a/packages/ui-vue/components/input-group/src/property-config/converter/input.converter.ts b/packages/ui-vue/components/input-group/src/property-config/converter/input.converter.ts index d6b9616f798e7be455ab74810fd928c58d8c308b..93c2b1c8bfa8ab0a2050a591ac74039097c218c1 100644 --- a/packages/ui-vue/components/input-group/src/property-config/converter/input.converter.ts +++ b/packages/ui-vue/components/input-group/src/property-config/converter/input.converter.ts @@ -1,5 +1,5 @@ import { ComponentSchema } from "../../../../designer-canvas/src/types"; -import { PropertyConverter, SchemaService } from "../../../../dynamic-resolver/src/types"; +import { PropertyConverter, SchemaService } from "@farris/ui-vue/components/dynamic-resolver"; const inputFormatValidationTypes = [ { key: 'none', value: '无' }, diff --git a/packages/ui-vue/components/input-group/src/schema/schema-mapper.ts b/packages/ui-vue/components/input-group/src/schema/schema-mapper.ts index 97964aee23bbb8b523c7692723ea02db00d4f4c0..2ca33ca080647b9edc66a133396282d6a3b1698f 100644 --- a/packages/ui-vue/components/input-group/src/schema/schema-mapper.ts +++ b/packages/ui-vue/components/input-group/src/schema/schema-mapper.ts @@ -1,4 +1,4 @@ -import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver'; +import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver'; export const schemaMapper = new Map([ ['appearance', resolveAppearance] diff --git a/packages/ui-vue/components/input-group/src/schema/schema-resolver.ts b/packages/ui-vue/components/input-group/src/schema/schema-resolver.ts index b02bdf93eec9060948f579c53aa81e3963a7d706..d36ae7457434b7381b796814e9926d352feacff6 100644 --- a/packages/ui-vue/components/input-group/src/schema/schema-resolver.ts +++ b/packages/ui-vue/components/input-group/src/schema/schema-resolver.ts @@ -1,4 +1,4 @@ -import { DynamicResolver } from "../../../dynamic-resolver"; +import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver"; export function schemaResolver(resolver: DynamicResolver, schema: Record, context: Record): Record { return schema; diff --git a/packages/ui-vue/components/json-editor/src/schema/schema-mapper.ts b/packages/ui-vue/components/json-editor/src/schema/schema-mapper.ts index ec92a2a712f693a0b6d694d3475dcf191812651b..8e0bbfafa574bca386aab01db7d9596c4992e6b5 100644 --- a/packages/ui-vue/components/json-editor/src/schema/schema-mapper.ts +++ b/packages/ui-vue/components/json-editor/src/schema/schema-mapper.ts @@ -1,3 +1,3 @@ -import { MapperFunction } from '../../../dynamic-resolver'; +import { MapperFunction } from '@farris/ui-vue/components/dynamic-resolver'; export const schemaMapper = new Map([]); diff --git a/packages/ui-vue/components/json-editor/src/schema/schema-resolver.ts b/packages/ui-vue/components/json-editor/src/schema/schema-resolver.ts index b02bdf93eec9060948f579c53aa81e3963a7d706..d36ae7457434b7381b796814e9926d352feacff6 100644 --- a/packages/ui-vue/components/json-editor/src/schema/schema-resolver.ts +++ b/packages/ui-vue/components/json-editor/src/schema/schema-resolver.ts @@ -1,4 +1,4 @@ -import { DynamicResolver } from "../../../dynamic-resolver"; +import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver"; export function schemaResolver(resolver: DynamicResolver, schema: Record, context: Record): Record { return schema; diff --git a/packages/ui-vue/components/layout/src/components/layout-pane.props.ts b/packages/ui-vue/components/layout/src/components/layout-pane.props.ts index e8280071f42ad8f2d85def587aaadbfaa782386c..df0a72a417c3c7153659c8c1f925ee49772a0caa 100644 --- a/packages/ui-vue/components/layout/src/components/layout-pane.props.ts +++ b/packages/ui-vue/components/layout/src/components/layout-pane.props.ts @@ -1,6 +1,6 @@ import { ExtractPropTypes, PropType } from "vue"; -import { createPropsResolver } from "../../../dynamic-resolver"; +import { createPropsResolver } from "@farris/ui-vue/components/dynamic-resolver"; import { schemaMapper } from "../schema/schema-mapper"; import { schemaResolver } from "../schema/schema-resolver"; import layoutPaneSchema from '../schema/layout-pane.schema.json'; diff --git a/packages/ui-vue/components/layout/src/schema/schema-mapper.ts b/packages/ui-vue/components/layout/src/schema/schema-mapper.ts index 97964aee23bbb8b523c7692723ea02db00d4f4c0..2ca33ca080647b9edc66a133396282d6a3b1698f 100644 --- a/packages/ui-vue/components/layout/src/schema/schema-mapper.ts +++ b/packages/ui-vue/components/layout/src/schema/schema-mapper.ts @@ -1,4 +1,4 @@ -import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver'; +import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver'; export const schemaMapper = new Map([ ['appearance', resolveAppearance] diff --git a/packages/ui-vue/components/layout/src/schema/schema-resolver.ts b/packages/ui-vue/components/layout/src/schema/schema-resolver.ts index b02bdf93eec9060948f579c53aa81e3963a7d706..d36ae7457434b7381b796814e9926d352feacff6 100644 --- a/packages/ui-vue/components/layout/src/schema/schema-resolver.ts +++ b/packages/ui-vue/components/layout/src/schema/schema-resolver.ts @@ -1,4 +1,4 @@ -import { DynamicResolver } from "../../../dynamic-resolver"; +import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver"; export function schemaResolver(resolver: DynamicResolver, schema: Record, context: Record): Record { return schema; diff --git a/packages/ui-vue/components/list-nav/src/schema/schema-mapper.ts b/packages/ui-vue/components/list-nav/src/schema/schema-mapper.ts index 97964aee23bbb8b523c7692723ea02db00d4f4c0..2ca33ca080647b9edc66a133396282d6a3b1698f 100644 --- a/packages/ui-vue/components/list-nav/src/schema/schema-mapper.ts +++ b/packages/ui-vue/components/list-nav/src/schema/schema-mapper.ts @@ -1,4 +1,4 @@ -import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver'; +import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver'; export const schemaMapper = new Map([ ['appearance', resolveAppearance] diff --git a/packages/ui-vue/components/list-nav/src/schema/schema-resolver.ts b/packages/ui-vue/components/list-nav/src/schema/schema-resolver.ts index b02bdf93eec9060948f579c53aa81e3963a7d706..d36ae7457434b7381b796814e9926d352feacff6 100644 --- a/packages/ui-vue/components/list-nav/src/schema/schema-resolver.ts +++ b/packages/ui-vue/components/list-nav/src/schema/schema-resolver.ts @@ -1,4 +1,4 @@ -import { DynamicResolver } from "../../../dynamic-resolver"; +import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver"; export function schemaResolver(resolver: DynamicResolver, schema: Record, context: Record): Record { return schema; diff --git a/packages/ui-vue/components/mapping-editor/src/schema/schema-mapper.ts b/packages/ui-vue/components/mapping-editor/src/schema/schema-mapper.ts index 97964aee23bbb8b523c7692723ea02db00d4f4c0..2ca33ca080647b9edc66a133396282d6a3b1698f 100644 --- a/packages/ui-vue/components/mapping-editor/src/schema/schema-mapper.ts +++ b/packages/ui-vue/components/mapping-editor/src/schema/schema-mapper.ts @@ -1,4 +1,4 @@ -import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver'; +import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver'; export const schemaMapper = new Map([ ['appearance', resolveAppearance] diff --git a/packages/ui-vue/components/mapping-editor/src/schema/schema-resolver.ts b/packages/ui-vue/components/mapping-editor/src/schema/schema-resolver.ts index b02bdf93eec9060948f579c53aa81e3963a7d706..d36ae7457434b7381b796814e9926d352feacff6 100644 --- a/packages/ui-vue/components/mapping-editor/src/schema/schema-resolver.ts +++ b/packages/ui-vue/components/mapping-editor/src/schema/schema-resolver.ts @@ -1,4 +1,4 @@ -import { DynamicResolver } from "../../../dynamic-resolver"; +import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver"; export function schemaResolver(resolver: DynamicResolver, schema: Record, context: Record): Record { return schema; diff --git a/packages/ui-vue/components/menu-lookup/src/schema/schema-mapper.ts b/packages/ui-vue/components/menu-lookup/src/schema/schema-mapper.ts index ec92a2a712f693a0b6d694d3475dcf191812651b..8e0bbfafa574bca386aab01db7d9596c4992e6b5 100644 --- a/packages/ui-vue/components/menu-lookup/src/schema/schema-mapper.ts +++ b/packages/ui-vue/components/menu-lookup/src/schema/schema-mapper.ts @@ -1,3 +1,3 @@ -import { MapperFunction } from '../../../dynamic-resolver'; +import { MapperFunction } from '@farris/ui-vue/components/dynamic-resolver'; export const schemaMapper = new Map([]); diff --git a/packages/ui-vue/components/menu-lookup/src/schema/schema-resolver.ts b/packages/ui-vue/components/menu-lookup/src/schema/schema-resolver.ts index b02bdf93eec9060948f579c53aa81e3963a7d706..d36ae7457434b7381b796814e9926d352feacff6 100644 --- a/packages/ui-vue/components/menu-lookup/src/schema/schema-resolver.ts +++ b/packages/ui-vue/components/menu-lookup/src/schema/schema-resolver.ts @@ -1,4 +1,4 @@ -import { DynamicResolver } from "../../../dynamic-resolver"; +import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver"; export function schemaResolver(resolver: DynamicResolver, schema: Record, context: Record): Record { return schema; diff --git a/packages/ui-vue/components/number-range/src/schema/schema-mapper.ts b/packages/ui-vue/components/number-range/src/schema/schema-mapper.ts index 97964aee23bbb8b523c7692723ea02db00d4f4c0..2ca33ca080647b9edc66a133396282d6a3b1698f 100644 --- a/packages/ui-vue/components/number-range/src/schema/schema-mapper.ts +++ b/packages/ui-vue/components/number-range/src/schema/schema-mapper.ts @@ -1,4 +1,4 @@ -import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver'; +import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver'; export const schemaMapper = new Map([ ['appearance', resolveAppearance] diff --git a/packages/ui-vue/components/number-range/src/schema/schema-resolver.ts b/packages/ui-vue/components/number-range/src/schema/schema-resolver.ts index b02bdf93eec9060948f579c53aa81e3963a7d706..d36ae7457434b7381b796814e9926d352feacff6 100644 --- a/packages/ui-vue/components/number-range/src/schema/schema-resolver.ts +++ b/packages/ui-vue/components/number-range/src/schema/schema-resolver.ts @@ -1,4 +1,4 @@ -import { DynamicResolver } from "../../../dynamic-resolver"; +import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver"; export function schemaResolver(resolver: DynamicResolver, schema: Record, context: Record): Record { return schema; diff --git a/packages/ui-vue/components/number-spinner/designer.ts b/packages/ui-vue/components/number-spinner/designer.ts new file mode 100644 index 0000000000000000000000000000000000000000..b85a560283bdad892864d74ec978255059ddeec1 --- /dev/null +++ b/packages/ui-vue/components/number-spinner/designer.ts @@ -0,0 +1,34 @@ + +/** + * Copyright (c) 2020 - present, Inspur Genersoft Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import { withInstall } from '@farris/ui-vue/components/common'; +import FNumberSpinner from '@farris/ui-vue/components/number-spinner'; +import FNumberSpinnerDesign from './src/designer/number-spinner.design.component'; +import { propsResolver } from './src/designer/number-spinner.design.props'; + +export * from './src/designer/number-spinner.design.props'; + +FNumberSpinnerDesign.register = (componentMap: Record, propsResolverMap: Record, configResolverMap: Record, resolverMap: Record) => { + componentMap['number-spinner'] = FNumberSpinner; + propsResolverMap['number-spinner'] = propsResolver; +}; +FNumberSpinnerDesign.registerDesigner = (componentMap: Record, propsResolverMap: Record, configResolverMap: Record) => { + componentMap['number-spinner'] = FNumberSpinnerDesign; + propsResolverMap['number-spinner'] = propsResolver; +}; + +export { FNumberSpinnerDesign }; +export default withInstall(FNumberSpinnerDesign); diff --git a/packages/ui-vue/components/number-spinner/index.ts b/packages/ui-vue/components/number-spinner/index.ts index f2a047541749bad7b356c08cbe8c497eb4b5b026..ec87d812717d0324cb1ff670b12cb2cf6779c760 100644 --- a/packages/ui-vue/components/number-spinner/index.ts +++ b/packages/ui-vue/components/number-spinner/index.ts @@ -16,8 +16,6 @@ */ import { withInstall } from '@farris/ui-vue/components/common'; import FNumberSpinner from './src/number-spinner.component'; -import FNumberSpinnerDesign from './src/designer/number-spinner.design.component'; -import { propsResolver } from './src/number-spinner.props'; export * from './src/number-spinner.props'; export * from './src/composition/use-format'; @@ -27,14 +25,5 @@ export * from './src/composition/use-text-box'; export { default as getNumberTextBoxRender } from './src/components/text-box.component'; export { default as getSpinnerRender } from './src/components/spinner.component'; -FNumberSpinner.register = (componentMap: Record, propsResolverMap: Record, configResolverMap: Record, resolverMap: Record) => { - componentMap['number-spinner'] = FNumberSpinner; - propsResolverMap['number-spinner'] = propsResolver; -}; -FNumberSpinner.registerDesigner = (componentMap: Record, propsResolverMap: Record, configResolverMap: Record) => { - componentMap['number-spinner'] = FNumberSpinnerDesign; - propsResolverMap['number-spinner'] = propsResolver; -}; - export { FNumberSpinner }; export default withInstall(FNumberSpinner); diff --git a/packages/ui-vue/components/number-spinner/src/designer/number-spinner.design.component.tsx b/packages/ui-vue/components/number-spinner/src/designer/number-spinner.design.component.tsx index e91d43ff532e74c51d171458176f22af28870408..a40950ddd69c2965a09774d720dd490beaa9c465 100644 --- a/packages/ui-vue/components/number-spinner/src/designer/number-spinner.design.component.tsx +++ b/packages/ui-vue/components/number-spinner/src/designer/number-spinner.design.component.tsx @@ -15,7 +15,7 @@ */ import { defineComponent, onMounted, ref, inject } from 'vue'; import type { SetupContext } from 'vue'; -import { numberSpinnerDesignProps, NumberSpinnerDesignProps } from '../number-spinner.props'; +import { numberSpinnerDesignProps, NumberSpinnerDesignProps } from './number-spinner.design.props'; import { useSpinner } from '../composition/use-spinner'; import { useFormat } from '../composition/use-format'; import { useNumber } from '../composition/use-number'; diff --git a/packages/ui-vue/components/number-spinner/src/designer/number-spinner.design.props.ts b/packages/ui-vue/components/number-spinner/src/designer/number-spinner.design.props.ts new file mode 100644 index 0000000000000000000000000000000000000000..d83aca43da8c982e59dbac2dd03afc662a685b34 --- /dev/null +++ b/packages/ui-vue/components/number-spinner/src/designer/number-spinner.design.props.ts @@ -0,0 +1,14 @@ +import { ExtractPropTypes } from 'vue'; +import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver'; +import { numberSpinnerProps } from '@farris/ui-vue/components/number-spinner'; +import { schemaMapper } from '../schema/schema-mapper'; +import numberSpinnerSchema from '../schema/number-spinner.schema.json'; +import { schemaResolver } from '../schema/schema-resolver'; + +export const numberSpinnerDesignProps = Object.assign({}, numberSpinnerProps, { + readonly: {} +}); + +export type NumberSpinnerDesignProps = ExtractPropTypes; + +export const propsResolver = createPropsResolver(numberSpinnerDesignProps, numberSpinnerSchema, schemaMapper, schemaResolver); \ No newline at end of file diff --git a/packages/ui-vue/components/number-spinner/src/number-spinner.props.ts b/packages/ui-vue/components/number-spinner/src/number-spinner.props.ts index 8bf68c6fcddd80658937871f2e8eac57cd3a19aa..6f47a744008084e624d9875ade122b2d6b8b7218 100644 --- a/packages/ui-vue/components/number-spinner/src/number-spinner.props.ts +++ b/packages/ui-vue/components/number-spinner/src/number-spinner.props.ts @@ -15,10 +15,6 @@ * limitations under the License. */ import { ExtractPropTypes, PropType } from 'vue'; -import { createPropsResolver } from '../../dynamic-resolver'; -import { schemaMapper } from './schema/schema-mapper'; -import numberSpinnerSchema from './schema/number-spinner.schema.json'; -import { schemaResolver } from './schema/schema-resolver'; type TextAlignType = 'left' | 'right' | 'center' | 'start' | 'end' | 'justify'; export const numberSpinnerProps = { @@ -138,11 +134,3 @@ export const numberSpinnerProps = { } as Record; export type NumberSpinnerProps = ExtractPropTypes; - -export const numberSpinnerDesignProps = Object.assign({}, numberSpinnerProps, { - readonly: {} -}); - -export type NumberSpinnerDesignProps = ExtractPropTypes; - -export const propsResolver = createPropsResolver(numberSpinnerProps, numberSpinnerSchema, schemaMapper, schemaResolver); diff --git a/packages/ui-vue/components/number-spinner/src/property-config/number-spinner.property-config.ts b/packages/ui-vue/components/number-spinner/src/property-config/number-spinner.property-config.ts index d47b9d55945c358cc6fd2d16f3709366869d5247..378b65fbd2290d05b70413cd3776343891b152d0 100644 --- a/packages/ui-vue/components/number-spinner/src/property-config/number-spinner.property-config.ts +++ b/packages/ui-vue/components/number-spinner/src/property-config/number-spinner.property-config.ts @@ -1,7 +1,5 @@ import { FormSchemaEntityFieldTypeName } from "@farris/ui-vue/components/common"; -import { FormPropertyChangeObject } from "../../../property-panel"; -import { InputBaseProperty } from "../../../property-panel/src/composition/entity/input-base-property"; - +import { FormPropertyChangeObject, InputBaseProperty } from "@farris/ui-vue/components/property-panel"; export class NumberSpinnerProperty extends InputBaseProperty { constructor(componentId: string, designerHostService: any) { diff --git a/packages/ui-vue/components/number-spinner/src/schema/schema-mapper.ts b/packages/ui-vue/components/number-spinner/src/schema/schema-mapper.ts index 97964aee23bbb8b523c7692723ea02db00d4f4c0..2ca33ca080647b9edc66a133396282d6a3b1698f 100644 --- a/packages/ui-vue/components/number-spinner/src/schema/schema-mapper.ts +++ b/packages/ui-vue/components/number-spinner/src/schema/schema-mapper.ts @@ -1,4 +1,4 @@ -import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver'; +import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver'; export const schemaMapper = new Map([ ['appearance', resolveAppearance] diff --git a/packages/ui-vue/components/number-spinner/src/schema/schema-resolver.ts b/packages/ui-vue/components/number-spinner/src/schema/schema-resolver.ts index b02bdf93eec9060948f579c53aa81e3963a7d706..d36ae7457434b7381b796814e9926d352feacff6 100644 --- a/packages/ui-vue/components/number-spinner/src/schema/schema-resolver.ts +++ b/packages/ui-vue/components/number-spinner/src/schema/schema-resolver.ts @@ -1,4 +1,4 @@ -import { DynamicResolver } from "../../../dynamic-resolver"; +import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver"; export function schemaResolver(resolver: DynamicResolver, schema: Record, context: Record): Record { return schema; diff --git a/packages/ui-vue/components/order/src/schema/schema-mapper.ts b/packages/ui-vue/components/order/src/schema/schema-mapper.ts index 97964aee23bbb8b523c7692723ea02db00d4f4c0..2ca33ca080647b9edc66a133396282d6a3b1698f 100644 --- a/packages/ui-vue/components/order/src/schema/schema-mapper.ts +++ b/packages/ui-vue/components/order/src/schema/schema-mapper.ts @@ -1,4 +1,4 @@ -import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver'; +import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver'; export const schemaMapper = new Map([ ['appearance', resolveAppearance] diff --git a/packages/ui-vue/components/order/src/schema/schema-resolver.ts b/packages/ui-vue/components/order/src/schema/schema-resolver.ts index b02bdf93eec9060948f579c53aa81e3963a7d706..d36ae7457434b7381b796814e9926d352feacff6 100644 --- a/packages/ui-vue/components/order/src/schema/schema-resolver.ts +++ b/packages/ui-vue/components/order/src/schema/schema-resolver.ts @@ -1,4 +1,4 @@ -import { DynamicResolver } from "../../../dynamic-resolver"; +import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver"; export function schemaResolver(resolver: DynamicResolver, schema: Record, context: Record): Record { return schema; diff --git a/packages/ui-vue/components/page-footer/src/schema/schema-mapper.ts b/packages/ui-vue/components/page-footer/src/schema/schema-mapper.ts index 97964aee23bbb8b523c7692723ea02db00d4f4c0..2ca33ca080647b9edc66a133396282d6a3b1698f 100644 --- a/packages/ui-vue/components/page-footer/src/schema/schema-mapper.ts +++ b/packages/ui-vue/components/page-footer/src/schema/schema-mapper.ts @@ -1,4 +1,4 @@ -import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver'; +import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver'; export const schemaMapper = new Map([ ['appearance', resolveAppearance] diff --git a/packages/ui-vue/components/page-footer/src/schema/schema-resolver.ts b/packages/ui-vue/components/page-footer/src/schema/schema-resolver.ts index b02bdf93eec9060948f579c53aa81e3963a7d706..d36ae7457434b7381b796814e9926d352feacff6 100644 --- a/packages/ui-vue/components/page-footer/src/schema/schema-resolver.ts +++ b/packages/ui-vue/components/page-footer/src/schema/schema-resolver.ts @@ -1,4 +1,4 @@ -import { DynamicResolver } from "../../../dynamic-resolver"; +import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver"; export function schemaResolver(resolver: DynamicResolver, schema: Record, context: Record): Record { return schema; diff --git a/packages/ui-vue/components/page-header/src/schema/schema-mapper.ts b/packages/ui-vue/components/page-header/src/schema/schema-mapper.ts index 47a7733d2ea4acfd0bfd96d2d0c5248ede9ed0e5..6c9057ca58797f357fd61816d6018b9ee28d3a57 100644 --- a/packages/ui-vue/components/page-header/src/schema/schema-mapper.ts +++ b/packages/ui-vue/components/page-header/src/schema/schema-mapper.ts @@ -1,4 +1,4 @@ -import { MapperFunction, resolveAppearance, resolveToolbar } from '../../../dynamic-resolver'; +import { MapperFunction, resolveAppearance, resolveToolbar } from '@farris/ui-vue/components/dynamic-resolver'; export const schemaMapper = new Map([ ['appearance', resolveAppearance], diff --git a/packages/ui-vue/components/page-header/src/schema/schema-resolver.ts b/packages/ui-vue/components/page-header/src/schema/schema-resolver.ts index b045f3598ba0fe090863a30cedcbb8d0de59c57f..2b57455ed8eac7473e440efa3382a30b73ec709c 100644 --- a/packages/ui-vue/components/page-header/src/schema/schema-resolver.ts +++ b/packages/ui-vue/components/page-header/src/schema/schema-resolver.ts @@ -1,4 +1,4 @@ -import { DynamicResolver } from "../../../dynamic-resolver"; +import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver"; export function schemaResolver(resolver: DynamicResolver, schema: Record, context: Record): Record { schema.title = "标题"; diff --git a/packages/ui-vue/components/pagination/src/schema/schema-mapper.ts b/packages/ui-vue/components/pagination/src/schema/schema-mapper.ts index 97964aee23bbb8b523c7692723ea02db00d4f4c0..2ca33ca080647b9edc66a133396282d6a3b1698f 100644 --- a/packages/ui-vue/components/pagination/src/schema/schema-mapper.ts +++ b/packages/ui-vue/components/pagination/src/schema/schema-mapper.ts @@ -1,4 +1,4 @@ -import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver'; +import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver'; export const schemaMapper = new Map([ ['appearance', resolveAppearance] diff --git a/packages/ui-vue/components/pagination/src/schema/schema-resolver.ts b/packages/ui-vue/components/pagination/src/schema/schema-resolver.ts index b02bdf93eec9060948f579c53aa81e3963a7d706..d36ae7457434b7381b796814e9926d352feacff6 100644 --- a/packages/ui-vue/components/pagination/src/schema/schema-resolver.ts +++ b/packages/ui-vue/components/pagination/src/schema/schema-resolver.ts @@ -1,4 +1,4 @@ -import { DynamicResolver } from "../../../dynamic-resolver"; +import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver"; export function schemaResolver(resolver: DynamicResolver, schema: Record, context: Record): Record { return schema; diff --git a/packages/ui-vue/components/progress/src/schema/schema-mapper.ts b/packages/ui-vue/components/progress/src/schema/schema-mapper.ts index 97964aee23bbb8b523c7692723ea02db00d4f4c0..2ca33ca080647b9edc66a133396282d6a3b1698f 100644 --- a/packages/ui-vue/components/progress/src/schema/schema-mapper.ts +++ b/packages/ui-vue/components/progress/src/schema/schema-mapper.ts @@ -1,4 +1,4 @@ -import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver'; +import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver'; export const schemaMapper = new Map([ ['appearance', resolveAppearance] diff --git a/packages/ui-vue/components/progress/src/schema/schema-resolver.ts b/packages/ui-vue/components/progress/src/schema/schema-resolver.ts index b02bdf93eec9060948f579c53aa81e3963a7d706..d36ae7457434b7381b796814e9926d352feacff6 100644 --- a/packages/ui-vue/components/progress/src/schema/schema-resolver.ts +++ b/packages/ui-vue/components/progress/src/schema/schema-resolver.ts @@ -1,4 +1,4 @@ -import { DynamicResolver } from "../../../dynamic-resolver"; +import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver"; export function schemaResolver(resolver: DynamicResolver, schema: Record, context: Record): Record { return schema; diff --git a/packages/ui-vue/components/property-editor/src/schema/schema-mapper.ts b/packages/ui-vue/components/property-editor/src/schema/schema-mapper.ts index 97964aee23bbb8b523c7692723ea02db00d4f4c0..2ca33ca080647b9edc66a133396282d6a3b1698f 100644 --- a/packages/ui-vue/components/property-editor/src/schema/schema-mapper.ts +++ b/packages/ui-vue/components/property-editor/src/schema/schema-mapper.ts @@ -1,4 +1,4 @@ -import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver'; +import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver'; export const schemaMapper = new Map([ ['appearance', resolveAppearance] diff --git a/packages/ui-vue/components/property-editor/src/schema/schema-resolver.ts b/packages/ui-vue/components/property-editor/src/schema/schema-resolver.ts index b02bdf93eec9060948f579c53aa81e3963a7d706..d36ae7457434b7381b796814e9926d352feacff6 100644 --- a/packages/ui-vue/components/property-editor/src/schema/schema-resolver.ts +++ b/packages/ui-vue/components/property-editor/src/schema/schema-resolver.ts @@ -1,4 +1,4 @@ -import { DynamicResolver } from "../../../dynamic-resolver"; +import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver"; export function schemaResolver(resolver: DynamicResolver, schema: Record, context: Record): Record { return schema; diff --git a/packages/ui-vue/components/query-solution/src/designer/query-solution-config/query-solution-config.props.ts b/packages/ui-vue/components/query-solution/src/designer/query-solution-config/query-solution-config.props.ts index d649688e0b0015c9f749012a2bb61b2a4039336c..bf6306bc6180ef6ab468d4ca8f55f652c4f9d578 100644 --- a/packages/ui-vue/components/query-solution/src/designer/query-solution-config/query-solution-config.props.ts +++ b/packages/ui-vue/components/query-solution/src/designer/query-solution-config/query-solution-config.props.ts @@ -16,7 +16,7 @@ import { ExtractPropTypes, PropType } from 'vue'; import { FieldConfig } from '../../../../condition/src/types'; -import { createPropsResolver } from '../../../../dynamic-resolver'; +import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver'; import querySolutionConfigSchema from './schema/query-solution-config.schema.json'; import { schemaMapper } from './schema/schema-mapper'; import { schemaResolver } from './schema/schema-resolver'; diff --git a/packages/ui-vue/components/query-solution/src/designer/query-solution-config/schema/schema-mapper.ts b/packages/ui-vue/components/query-solution/src/designer/query-solution-config/schema/schema-mapper.ts index 90179d1bf1b123025ff1a5036cfad73b2f18e2d9..74c1e9dd6c759f4e28696f6891a9def5f31eee76 100644 --- a/packages/ui-vue/components/query-solution/src/designer/query-solution-config/schema/schema-mapper.ts +++ b/packages/ui-vue/components/query-solution/src/designer/query-solution-config/schema/schema-mapper.ts @@ -1,4 +1,4 @@ -import { MapperFunction, resolveAppearance } from '../../../../../dynamic-resolver'; +import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver'; // import {resolvePreset} from './preset-resolver'; export const schemaMapper = new Map([ diff --git a/packages/ui-vue/components/query-solution/src/designer/query-solution-config/schema/schema-resolver.ts b/packages/ui-vue/components/query-solution/src/designer/query-solution-config/schema/schema-resolver.ts index a07d8e91d22d18baaac9ea55ad0b9085c0d96976..d36ae7457434b7381b796814e9926d352feacff6 100644 --- a/packages/ui-vue/components/query-solution/src/designer/query-solution-config/schema/schema-resolver.ts +++ b/packages/ui-vue/components/query-solution/src/designer/query-solution-config/schema/schema-resolver.ts @@ -1,4 +1,4 @@ -import { DynamicResolver } from "../../../../../dynamic-resolver"; +import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver"; export function schemaResolver(resolver: DynamicResolver, schema: Record, context: Record): Record { return schema; diff --git a/packages/ui-vue/components/query-solution/src/schema/schema-mapper.ts b/packages/ui-vue/components/query-solution/src/schema/schema-mapper.ts index f81d72ba9b41c3b172130bf698247e31e531773b..8634692bd74856355e3fa57da84d3cc69c35d62c 100644 --- a/packages/ui-vue/components/query-solution/src/schema/schema-mapper.ts +++ b/packages/ui-vue/components/query-solution/src/schema/schema-mapper.ts @@ -1,4 +1,4 @@ -import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver'; +import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver'; import { resolvePreset } from './preset-resolver'; export const schemaMapper = new Map([ 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 6cfaa3841579c0252eb688b34cf660e1d6cf5668..c9b083dee41be844c31211602c6fc78f3d71ce87 100644 --- a/packages/ui-vue/components/query-solution/src/schema/schema-resolver.ts +++ b/packages/ui-vue/components/query-solution/src/schema/schema-resolver.ts @@ -1,5 +1,5 @@ import { DesignerComponentInstance, DesignerHostService } from "../../../designer-canvas"; -import { DynamicResolver } from "../../../dynamic-resolver"; +import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver"; import { querySolutionCreatorService } from "../composition/build-solution"; export function schemaResolver(resolver: DynamicResolver, schema: Record, context: Record, designerHostService?: DesignerHostService): Record { diff --git a/packages/ui-vue/components/radio-button/src/schema/schema-mapper.ts b/packages/ui-vue/components/radio-button/src/schema/schema-mapper.ts index 97964aee23bbb8b523c7692723ea02db00d4f4c0..2ca33ca080647b9edc66a133396282d6a3b1698f 100644 --- a/packages/ui-vue/components/radio-button/src/schema/schema-mapper.ts +++ b/packages/ui-vue/components/radio-button/src/schema/schema-mapper.ts @@ -1,4 +1,4 @@ -import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver'; +import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver'; export const schemaMapper = new Map([ ['appearance', resolveAppearance] diff --git a/packages/ui-vue/components/radio-button/src/schema/schema-resolver.ts b/packages/ui-vue/components/radio-button/src/schema/schema-resolver.ts index b02bdf93eec9060948f579c53aa81e3963a7d706..d36ae7457434b7381b796814e9926d352feacff6 100644 --- a/packages/ui-vue/components/radio-button/src/schema/schema-resolver.ts +++ b/packages/ui-vue/components/radio-button/src/schema/schema-resolver.ts @@ -1,4 +1,4 @@ -import { DynamicResolver } from "../../../dynamic-resolver"; +import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver"; export function schemaResolver(resolver: DynamicResolver, schema: Record, context: Record): Record { return schema; diff --git a/packages/ui-vue/components/radio-group/src/schema/schema-mapper.ts b/packages/ui-vue/components/radio-group/src/schema/schema-mapper.ts index 2d80eae993ad640f91223f53c0e3e824cb35908c..079a0e56dba89a4748ea7d9f6b451a595f4ade75 100644 --- a/packages/ui-vue/components/radio-group/src/schema/schema-mapper.ts +++ b/packages/ui-vue/components/radio-group/src/schema/schema-mapper.ts @@ -1,4 +1,4 @@ -import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver'; +import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver'; export const schemaMapper = new Map([ ['appearance', resolveAppearance] diff --git a/packages/ui-vue/components/radio-group/src/schema/schema-resolver.ts b/packages/ui-vue/components/radio-group/src/schema/schema-resolver.ts index 1394c7551da21180091c490e1f1341ed90291688..89f36392140ef5b1fe69de8cccd5de2a9b39954a 100644 --- a/packages/ui-vue/components/radio-group/src/schema/schema-resolver.ts +++ b/packages/ui-vue/components/radio-group/src/schema/schema-resolver.ts @@ -1,4 +1,4 @@ -import { DynamicResolver } from "../../../dynamic-resolver"; +import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver"; export function schemaResolver(resolver: DynamicResolver, schema: Record, context: Record): Record { return schema; diff --git a/packages/ui-vue/components/rate/src/schema/schema-mapper.ts b/packages/ui-vue/components/rate/src/schema/schema-mapper.ts index 97964aee23bbb8b523c7692723ea02db00d4f4c0..2ca33ca080647b9edc66a133396282d6a3b1698f 100644 --- a/packages/ui-vue/components/rate/src/schema/schema-mapper.ts +++ b/packages/ui-vue/components/rate/src/schema/schema-mapper.ts @@ -1,4 +1,4 @@ -import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver'; +import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver'; export const schemaMapper = new Map([ ['appearance', resolveAppearance] diff --git a/packages/ui-vue/components/rate/src/schema/schema-resolver.ts b/packages/ui-vue/components/rate/src/schema/schema-resolver.ts index b02bdf93eec9060948f579c53aa81e3963a7d706..d36ae7457434b7381b796814e9926d352feacff6 100644 --- a/packages/ui-vue/components/rate/src/schema/schema-resolver.ts +++ b/packages/ui-vue/components/rate/src/schema/schema-resolver.ts @@ -1,4 +1,4 @@ -import { DynamicResolver } from "../../../dynamic-resolver"; +import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver"; export function schemaResolver(resolver: DynamicResolver, schema: Record, context: Record): Record { return schema; diff --git a/packages/ui-vue/components/response-layout-editor/src/composition/props/response-layout-editor-setting.props.ts b/packages/ui-vue/components/response-layout-editor/src/composition/props/response-layout-editor-setting.props.ts index bc8fdd676fc67413904fb82a7e9a3a8b2dbd12ee..c5bddd848bc9047d97938802d05d4b0a4f3b3c9a 100644 --- a/packages/ui-vue/components/response-layout-editor/src/composition/props/response-layout-editor-setting.props.ts +++ b/packages/ui-vue/components/response-layout-editor/src/composition/props/response-layout-editor-setting.props.ts @@ -1,6 +1,6 @@ import { ExtractPropTypes, PropType } from 'vue'; -import { createPropsResolver } from '../../../../dynamic-resolver/src/props-resolver'; +import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver'; import { schemaMapper } from '../../schema/schema-mapper'; import { schemaResolver } from '../../schema/schema-resolver'; import responseLayoutEditorSettingSchema from '../../schema/response-layout-editor-setting.schema.json'; diff --git a/packages/ui-vue/components/response-layout-editor/src/schema/schema-mapper.ts b/packages/ui-vue/components/response-layout-editor/src/schema/schema-mapper.ts index 97964aee23bbb8b523c7692723ea02db00d4f4c0..2ca33ca080647b9edc66a133396282d6a3b1698f 100644 --- a/packages/ui-vue/components/response-layout-editor/src/schema/schema-mapper.ts +++ b/packages/ui-vue/components/response-layout-editor/src/schema/schema-mapper.ts @@ -1,4 +1,4 @@ -import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver'; +import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver'; export const schemaMapper = new Map([ ['appearance', resolveAppearance] diff --git a/packages/ui-vue/components/response-layout-editor/src/schema/schema-resolver.ts b/packages/ui-vue/components/response-layout-editor/src/schema/schema-resolver.ts index f7d390a1dd0c5633a1fecde412a514c02d888e73..ea67474b2010ce3cf1f1795f11e0d1b71bdd2aaa 100644 --- a/packages/ui-vue/components/response-layout-editor/src/schema/schema-resolver.ts +++ b/packages/ui-vue/components/response-layout-editor/src/schema/schema-resolver.ts @@ -1,6 +1,6 @@ import { ComponentSchema } from "../../../designer-canvas/src/types"; -import { DynamicResolver } from "../../../dynamic-resolver"; +import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver"; function wrapSectionForForm(resolver: DynamicResolver, schema: ComponentSchema, context: Record, formSchemaId: string): ComponentSchema { const sectionSchema = resolver.getSchemaByType('section') as ComponentSchema; diff --git a/packages/ui-vue/components/search-box/src/schema/schema-mapper.ts b/packages/ui-vue/components/search-box/src/schema/schema-mapper.ts index 97964aee23bbb8b523c7692723ea02db00d4f4c0..2ca33ca080647b9edc66a133396282d6a3b1698f 100644 --- a/packages/ui-vue/components/search-box/src/schema/schema-mapper.ts +++ b/packages/ui-vue/components/search-box/src/schema/schema-mapper.ts @@ -1,4 +1,4 @@ -import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver'; +import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver'; export const schemaMapper = new Map([ ['appearance', resolveAppearance] diff --git a/packages/ui-vue/components/search-box/src/schema/schema-resolver.ts b/packages/ui-vue/components/search-box/src/schema/schema-resolver.ts index b02bdf93eec9060948f579c53aa81e3963a7d706..d36ae7457434b7381b796814e9926d352feacff6 100644 --- a/packages/ui-vue/components/search-box/src/schema/schema-resolver.ts +++ b/packages/ui-vue/components/search-box/src/schema/schema-resolver.ts @@ -1,4 +1,4 @@ -import { DynamicResolver } from "../../../dynamic-resolver"; +import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver"; export function schemaResolver(resolver: DynamicResolver, schema: Record, context: Record): Record { return schema; diff --git a/packages/ui-vue/components/smoke-detector/src/schema/schema-mapper.ts b/packages/ui-vue/components/smoke-detector/src/schema/schema-mapper.ts index 97964aee23bbb8b523c7692723ea02db00d4f4c0..2ca33ca080647b9edc66a133396282d6a3b1698f 100644 --- a/packages/ui-vue/components/smoke-detector/src/schema/schema-mapper.ts +++ b/packages/ui-vue/components/smoke-detector/src/schema/schema-mapper.ts @@ -1,4 +1,4 @@ -import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver'; +import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver'; export const schemaMapper = new Map([ ['appearance', resolveAppearance] diff --git a/packages/ui-vue/components/smoke-detector/src/schema/schema-resolver.ts b/packages/ui-vue/components/smoke-detector/src/schema/schema-resolver.ts index b02bdf93eec9060948f579c53aa81e3963a7d706..d36ae7457434b7381b796814e9926d352feacff6 100644 --- a/packages/ui-vue/components/smoke-detector/src/schema/schema-resolver.ts +++ b/packages/ui-vue/components/smoke-detector/src/schema/schema-resolver.ts @@ -1,4 +1,4 @@ -import { DynamicResolver } from "../../../dynamic-resolver"; +import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver"; export function schemaResolver(resolver: DynamicResolver, schema: Record, context: Record): Record { return schema; diff --git a/packages/ui-vue/components/splitter/src/components/splitter-pane.props.ts b/packages/ui-vue/components/splitter/src/components/splitter-pane.props.ts index 8ec98d02e5ce2b7d074648be6da1997685efbc6e..fb79f349c3370711fa8506be632363270f81d2df 100644 --- a/packages/ui-vue/components/splitter/src/components/splitter-pane.props.ts +++ b/packages/ui-vue/components/splitter/src/components/splitter-pane.props.ts @@ -1,5 +1,5 @@ import { ExtractPropTypes, PropType } from "vue"; -import { createPropsResolver } from "../../../dynamic-resolver"; +import { createPropsResolver } from "@farris/ui-vue/components/dynamic-resolver"; import { splitterPaneSchemaMapper } from '../schema/splitter-pane-schema-mapper'; import splitterPaneSchema from '../schema/splitter-pane.schema.json'; import { splitterPaneSchemaResolver } from "../schema/splitter-schema-resolver"; diff --git a/packages/ui-vue/components/splitter/src/schema/splitter-pane-schema-mapper.ts b/packages/ui-vue/components/splitter/src/schema/splitter-pane-schema-mapper.ts index d9158a6968af97f94f5d7fa05496bb5c0c5035d9..6b3ee30d591bb54a6e4109aa087d025a39d01e1e 100644 --- a/packages/ui-vue/components/splitter/src/schema/splitter-pane-schema-mapper.ts +++ b/packages/ui-vue/components/splitter/src/schema/splitter-pane-schema-mapper.ts @@ -1,4 +1,4 @@ -import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver'; +import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver'; export const splitterPaneSchemaMapper = new Map([ ['appearance', resolveAppearance] diff --git a/packages/ui-vue/components/splitter/src/schema/splitter-schema-mapper.ts b/packages/ui-vue/components/splitter/src/schema/splitter-schema-mapper.ts index f4f5325f4c2ad25fb44cb95a7e86618a124bc289..cddec52733938a0e84a745f93c370abbde94f2f4 100644 --- a/packages/ui-vue/components/splitter/src/schema/splitter-schema-mapper.ts +++ b/packages/ui-vue/components/splitter/src/schema/splitter-schema-mapper.ts @@ -1,4 +1,4 @@ -import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver'; +import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver'; export const splitterSchemaMapper = new Map([ ['appearance', resolveAppearance] diff --git a/packages/ui-vue/components/splitter/src/schema/splitter-schema-resolver.ts b/packages/ui-vue/components/splitter/src/schema/splitter-schema-resolver.ts index 1e1d22ed80cf4786509c853718ad755bd38ce1af..2f221d9fe49c89c9d76d78052987b08e0a6755d9 100644 --- a/packages/ui-vue/components/splitter/src/schema/splitter-schema-resolver.ts +++ b/packages/ui-vue/components/splitter/src/schema/splitter-schema-resolver.ts @@ -1,6 +1,6 @@ import { ComponentSchema, DesignerComponentInstance } from "../../../designer-canvas/src/types"; -import { DynamicResolver } from "../../../dynamic-resolver"; +import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver"; function wrapContentContainerForDataGrid(resolver: DynamicResolver, schema: ComponentSchema, context: Record): ComponentSchema { const contentContainerSchema = resolver.getSchemaByType('content-container') as ComponentSchema; diff --git a/packages/ui-vue/components/step/src/schema/schema-mapper.ts b/packages/ui-vue/components/step/src/schema/schema-mapper.ts index 97964aee23bbb8b523c7692723ea02db00d4f4c0..2ca33ca080647b9edc66a133396282d6a3b1698f 100644 --- a/packages/ui-vue/components/step/src/schema/schema-mapper.ts +++ b/packages/ui-vue/components/step/src/schema/schema-mapper.ts @@ -1,4 +1,4 @@ -import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver'; +import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver'; export const schemaMapper = new Map([ ['appearance', resolveAppearance] diff --git a/packages/ui-vue/components/step/src/schema/schema-resolver.ts b/packages/ui-vue/components/step/src/schema/schema-resolver.ts index b02bdf93eec9060948f579c53aa81e3963a7d706..d36ae7457434b7381b796814e9926d352feacff6 100644 --- a/packages/ui-vue/components/step/src/schema/schema-resolver.ts +++ b/packages/ui-vue/components/step/src/schema/schema-resolver.ts @@ -1,4 +1,4 @@ -import { DynamicResolver } from "../../../dynamic-resolver"; +import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver"; export function schemaResolver(resolver: DynamicResolver, schema: Record, context: Record): Record { return schema; diff --git a/packages/ui-vue/components/switch/designer.ts b/packages/ui-vue/components/switch/designer.ts new file mode 100644 index 0000000000000000000000000000000000000000..2a13021eb0cd6574392ee6de4292a00c531ea6e5 --- /dev/null +++ b/packages/ui-vue/components/switch/designer.ts @@ -0,0 +1,36 @@ + +/** + * Copyright (c) 2020 - present, Inspur Genersoft Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import FSwitch, { SwitchProps, switchProps } from '@farris/ui-vue/components/switch'; +import { withInstall } from '@farris/ui-vue/components/common'; +import FSwitchDesign from './src/designer/switch.design.component'; +import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver'; +import { schemaMapper } from './src/schema/schema-mapper'; +import switchSchema from './src/schema/switch.schema.json'; +import { schemaResolver } from './src/schema/schema-resolver'; +export const propsResolver = createPropsResolver(switchProps, switchSchema, schemaMapper, schemaResolver); + +FSwitchDesign.register = (componentMap: Record, propsResolverMap: Record, configResolverMap: Record, resolverMap: Record) => { + componentMap.switch = FSwitch; + propsResolverMap.switch = propsResolver; +}; +FSwitchDesign.registerDesigner = (componentMap: Record, propsResolverMap: Record, configResolverMap: Record) => { + componentMap.switch = FSwitchDesign; + propsResolverMap.switch = propsResolver; +}; + +export { FSwitchDesign }; +export default withInstall(FSwitchDesign); diff --git a/packages/ui-vue/components/switch/index.ts b/packages/ui-vue/components/switch/index.ts index f8b87179ad63c5cf7c0167256fe184c475f53462..24417ee5ec6796a53f5e415d051f7eea9a85f88d 100644 --- a/packages/ui-vue/components/switch/index.ts +++ b/packages/ui-vue/components/switch/index.ts @@ -14,22 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import type { App } from 'vue'; import FSwitch from './src/switch.component'; -import { propsResolver } from './src/switch.props'; -import FSwitchDesign from './src/designer/switch.design.component'; import { withInstall } from '@farris/ui-vue/components/common'; export * from './src/switch.props'; -FSwitch.register = (componentMap: Record, propsResolverMap: Record, configResolverMap: Record, resolverMap: Record) => { - componentMap.switch = FSwitch; - propsResolverMap.switch = propsResolver; -}; -FSwitch.registerDesigner = (componentMap: Record, propsResolverMap: Record, configResolverMap: Record) => { - componentMap.switch = FSwitchDesign; - propsResolverMap.switch = propsResolver; -}; - export { FSwitch }; export default withInstall(FSwitch); diff --git a/packages/ui-vue/components/switch/src/designer/switch.design.component.tsx b/packages/ui-vue/components/switch/src/designer/switch.design.component.tsx index b6cf664c8a907ad7211009332c457c2c3e69b5ad..a31270f9c896474d2d3b5805c7bdba9a4ee69736 100644 --- a/packages/ui-vue/components/switch/src/designer/switch.design.component.tsx +++ b/packages/ui-vue/components/switch/src/designer/switch.design.component.tsx @@ -16,7 +16,7 @@ */ import { computed, defineComponent, inject, onMounted, ref, SetupContext, toRefs } from 'vue'; import { useDesignerComponent, DesignerItemContext } from '@farris/ui-vue/components/designer-canvas'; -import { switchProps, SwitchProps } from '../switch.props'; +import { switchProps, SwitchProps } from '@farris/ui-vue/components/switch'; import { useSwitchDesignerRules } from './use-design-rules'; export default defineComponent({ diff --git a/packages/ui-vue/components/switch/src/switch.props.ts b/packages/ui-vue/components/switch/src/switch.props.ts index dbf1414cab3ffb091b2113e07f98299f12dae8d4..68a6cdbbc1464eeefea6c352e02243911354ffd3 100644 --- a/packages/ui-vue/components/switch/src/switch.props.ts +++ b/packages/ui-vue/components/switch/src/switch.props.ts @@ -14,10 +14,6 @@ * limitations under the License. */ import { ExtractPropTypes, PropType } from 'vue'; -import { createPropsResolver } from '../../dynamic-resolver'; -import { schemaMapper } from './schema/schema-mapper'; -import switchSchema from './schema/switch.schema.json'; -import { schemaResolver } from './schema/schema-resolver'; export type SwitchType = 'small' | 'medium' | 'large'; @@ -42,6 +38,4 @@ export const switchProps = { focusOnCreated: { type: Boolean, default: false } } as Record; -export type SwitchProps = ExtractPropTypes; - -export const propsResolver = createPropsResolver(switchProps, switchSchema, schemaMapper, schemaResolver); +export type SwitchProps = ExtractPropTypes; \ No newline at end of file diff --git a/packages/ui-vue/components/tags/designer.ts b/packages/ui-vue/components/tags/designer.ts new file mode 100644 index 0000000000000000000000000000000000000000..f88908e14d50fae69a92badd06ecd92409f206a9 --- /dev/null +++ b/packages/ui-vue/components/tags/designer.ts @@ -0,0 +1,27 @@ + + +import { withInstall } from '@farris/ui-vue/components/common'; +import FTags, { TagsProps, tagsProps } from '@farris/ui-vue/components/tags'; +import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver'; +import FTagsDesign from './src/designer/tags.design.component'; +import { schemaResolver } from './src/schema/schema-resolver'; +import { schemaMapper } from './src/schema/schema-mapper'; +import propertyConfig from './src/property-config/tags.property-config.json'; +import tagsSchema from './src/schema/tags.schema.json'; +export * from './src/tags.props'; +export const propsResolver = createPropsResolver(tagsProps, tagsSchema, schemaMapper, schemaResolver, propertyConfig); +import './tags.scss'; + +FTagsDesign.register = (componentMap: Record, propsResolverMap: Record, configResolverMap: Record, resolverMap: Record): void => { + componentMap.tags = FTags; + propsResolverMap.tags = propsResolver; +}; + +FTagsDesign.registerDesigner = (componentMap: Record, propsResolverMap: Record, configResolverMap: Record): void => { + componentMap.tags = FTagsDesign; + propsResolverMap.tags = propsResolver; +}; + +export { FTagsDesign }; + +export default withInstall(FTagsDesign); diff --git a/packages/ui-vue/components/tags/index.ts b/packages/ui-vue/components/tags/index.ts index ee226df600712627348202380c0f4948c0c7a85f..90e43f3c92ef2e30924b7413309fbb62f5f7a478 100644 --- a/packages/ui-vue/components/tags/index.ts +++ b/packages/ui-vue/components/tags/index.ts @@ -2,23 +2,10 @@ import { withInstall } from '@farris/ui-vue/components/common'; import FTags from './src/tags.component'; -import { propsResolver } from './src/tags.props'; -import FTagsDesign from './src/designer/tags.design.component'; - export * from './src/tags.props'; import './tags.scss'; -FTags.register = (componentMap: Record, propsResolverMap: Record, configResolverMap: Record, resolverMap: Record): void => { - componentMap.tags = FTags; - propsResolverMap.tags = propsResolver; -}; - -FTags.registerDesigner = (componentMap: Record, propsResolverMap: Record, configResolverMap: Record): void => { - componentMap.tags = FTagsDesign; - propsResolverMap.tags = propsResolver; -}; - export { FTags }; export default withInstall(FTags); diff --git a/packages/ui-vue/components/tags/src/schema/schema-mapper.ts b/packages/ui-vue/components/tags/src/schema/schema-mapper.ts index 97964aee23bbb8b523c7692723ea02db00d4f4c0..2ca33ca080647b9edc66a133396282d6a3b1698f 100644 --- a/packages/ui-vue/components/tags/src/schema/schema-mapper.ts +++ b/packages/ui-vue/components/tags/src/schema/schema-mapper.ts @@ -1,4 +1,4 @@ -import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver'; +import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver'; export const schemaMapper = new Map([ ['appearance', resolveAppearance] diff --git a/packages/ui-vue/components/tags/src/schema/schema-resolver.ts b/packages/ui-vue/components/tags/src/schema/schema-resolver.ts index b02bdf93eec9060948f579c53aa81e3963a7d706..d36ae7457434b7381b796814e9926d352feacff6 100644 --- a/packages/ui-vue/components/tags/src/schema/schema-resolver.ts +++ b/packages/ui-vue/components/tags/src/schema/schema-resolver.ts @@ -1,4 +1,4 @@ -import { DynamicResolver } from "../../../dynamic-resolver"; +import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver"; export function schemaResolver(resolver: DynamicResolver, schema: Record, context: Record): Record { return schema; diff --git a/packages/ui-vue/components/tags/src/tags.props.ts b/packages/ui-vue/components/tags/src/tags.props.ts index 04dcdb91d4b9ebf26082ddd9932e148b173ec09c..61616f7132f5aef72992ada51f8a0fbf766c7f3b 100644 --- a/packages/ui-vue/components/tags/src/tags.props.ts +++ b/packages/ui-vue/components/tags/src/tags.props.ts @@ -1,10 +1,5 @@ import { ExtractPropTypes, PropType } from 'vue'; -import { schemaResolver } from './schema/schema-resolver'; -import { schemaMapper } from './schema/schema-mapper'; -import propertyConfig from './property-config/tags.property-config.json'; -import { createPropsResolver } from '../../dynamic-resolver/src/props-resolver'; -import tagsSchema from './schema/tags.schema.json'; export interface Tag { name: string; @@ -39,4 +34,3 @@ export const tagsProps = { } as Record; export type TagsProps = ExtractPropTypes; -export const propsResolver = createPropsResolver(tagsProps, tagsSchema, schemaMapper, schemaResolver, propertyConfig); diff --git a/packages/ui-vue/components/text/src/schema/schema-mapper.ts b/packages/ui-vue/components/text/src/schema/schema-mapper.ts index 97964aee23bbb8b523c7692723ea02db00d4f4c0..2ca33ca080647b9edc66a133396282d6a3b1698f 100644 --- a/packages/ui-vue/components/text/src/schema/schema-mapper.ts +++ b/packages/ui-vue/components/text/src/schema/schema-mapper.ts @@ -1,4 +1,4 @@ -import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver'; +import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver'; export const schemaMapper = new Map([ ['appearance', resolveAppearance] diff --git a/packages/ui-vue/components/text/src/schema/schema-resolver.ts b/packages/ui-vue/components/text/src/schema/schema-resolver.ts index b02bdf93eec9060948f579c53aa81e3963a7d706..d36ae7457434b7381b796814e9926d352feacff6 100644 --- a/packages/ui-vue/components/text/src/schema/schema-resolver.ts +++ b/packages/ui-vue/components/text/src/schema/schema-resolver.ts @@ -1,4 +1,4 @@ -import { DynamicResolver } from "../../../dynamic-resolver"; +import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver"; export function schemaResolver(resolver: DynamicResolver, schema: Record, context: Record): Record { return schema; diff --git a/packages/ui-vue/components/time-picker/designer.ts b/packages/ui-vue/components/time-picker/designer.ts new file mode 100644 index 0000000000000000000000000000000000000000..a1247359d6e6b63c7a1eca107f47af4984f0e8b5 --- /dev/null +++ b/packages/ui-vue/components/time-picker/designer.ts @@ -0,0 +1,21 @@ + +import type { Plugin } from 'vue'; +import FTimePicker, { TimePickerProps, timePickerProps } from '@farris/ui-vue/components/time-picker'; +import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver'; +import FTimePickerDesign from './src/designer/time-picker.design.component'; +import { schemaMapper } from './src/schema/schema-mapper'; +import timePickerSchema from './src/schema/time-picker.schema.json'; +import { schemaResolver } from './src/schema/schema-resolver'; +export const propsResolver = createPropsResolver(timePickerProps, timePickerSchema, schemaMapper, schemaResolver); + +FTimePickerDesign.register = (componentMap: Record, propsResolverMap: Record, configResolverMap: Record, resolverMap: Record) => { + componentMap['time-picker'] = FTimePicker; + propsResolverMap['time-picker'] = propsResolver; +}; +FTimePickerDesign.registerDesigner = (componentMap: Record, propsResolverMap: Record, configResolverMap: Record) => { + componentMap['time-picker'] = FTimePickerDesign; + propsResolverMap['time-picker'] = propsResolver; +}; + +export { FTimePickerDesign }; +export default FTimePickerDesign as typeof FTimePickerDesign & Plugin; diff --git a/packages/ui-vue/components/time-picker/index.ts b/packages/ui-vue/components/time-picker/index.ts index b66fd0172664045821a9369b39342a49e582a2f3..9502905e45d86f81602919f9b74d424e1fd6a66c 100644 --- a/packages/ui-vue/components/time-picker/index.ts +++ b/packages/ui-vue/components/time-picker/index.ts @@ -2,8 +2,6 @@ import type { App, Plugin } from 'vue'; import FTimePicker from './src/time-picker.component'; import FTimePickerTimeView from './src/components/time.component'; -import { propsResolver } from './src/time-picker.props'; -import FTimePickerDesign from './src/designer/time-picker.design.component'; export * from './src/composition/types'; export * from './src/composition/utils'; @@ -14,14 +12,6 @@ FTimePicker.install = (app: App) => { app.component(FTimePicker.name as string, FTimePicker) .component(FTimePickerTimeView.name as string, FTimePickerTimeView); }; -FTimePicker.register = (componentMap: Record, propsResolverMap: Record, configResolverMap: Record, resolverMap: Record) => { - componentMap['time-picker'] = FTimePicker; - propsResolverMap['time-picker'] = propsResolver; -}; -FTimePicker.registerDesigner = (componentMap: Record, propsResolverMap: Record, configResolverMap: Record) => { - componentMap['time-picker'] = FTimePickerDesign; - propsResolverMap['time-picker'] = propsResolver; -}; export { FTimePicker, FTimePickerTimeView }; export default FTimePicker as typeof FTimePicker & Plugin; diff --git a/packages/ui-vue/components/time-picker/src/designer/time-picker.design.component.tsx b/packages/ui-vue/components/time-picker/src/designer/time-picker.design.component.tsx index bacc91a0d2ea29a8c678d6ca3cdec520a2396765..b4efa47f0a647147e3a88ac3efe7902a6d31d12b 100644 --- a/packages/ui-vue/components/time-picker/src/designer/time-picker.design.component.tsx +++ b/packages/ui-vue/components/time-picker/src/designer/time-picker.design.component.tsx @@ -1,8 +1,7 @@ import { SetupContext, defineComponent, inject, onMounted, ref } from 'vue'; import { TimePickerProps, timePickerProps } from '../time-picker.props'; -import { FButtonEdit } from '../../../button-edit'; -import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component'; -import { DesignerItemContext } from '../../../designer-canvas/src/types'; +import { FButtonEdit } from '@farris/ui-vue/components/button-edit'; +import { useDesignerComponent, DesignerItemContext } from '@farris/ui-vue/components/designer-canvas'; import { useTimePickerDesignerRules } from './use-design-rules'; export default defineComponent({ diff --git a/packages/ui-vue/components/time-picker/src/schema/schema-mapper.ts b/packages/ui-vue/components/time-picker/src/schema/schema-mapper.ts index 97964aee23bbb8b523c7692723ea02db00d4f4c0..2ca33ca080647b9edc66a133396282d6a3b1698f 100644 --- a/packages/ui-vue/components/time-picker/src/schema/schema-mapper.ts +++ b/packages/ui-vue/components/time-picker/src/schema/schema-mapper.ts @@ -1,4 +1,4 @@ -import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver'; +import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver'; export const schemaMapper = new Map([ ['appearance', resolveAppearance] diff --git a/packages/ui-vue/components/time-picker/src/schema/schema-resolver.ts b/packages/ui-vue/components/time-picker/src/schema/schema-resolver.ts index b02bdf93eec9060948f579c53aa81e3963a7d706..d36ae7457434b7381b796814e9926d352feacff6 100644 --- a/packages/ui-vue/components/time-picker/src/schema/schema-resolver.ts +++ b/packages/ui-vue/components/time-picker/src/schema/schema-resolver.ts @@ -1,4 +1,4 @@ -import { DynamicResolver } from "../../../dynamic-resolver"; +import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver"; export function schemaResolver(resolver: DynamicResolver, schema: Record, context: Record): Record { return schema; diff --git a/packages/ui-vue/components/time-picker/src/time-picker.props.ts b/packages/ui-vue/components/time-picker/src/time-picker.props.ts index 95bdb8b83732002c62076433fc9ab6e2a9d000da..d1f1e94d9f9439482a8d60c068fd983ffc6c8062 100644 --- a/packages/ui-vue/components/time-picker/src/time-picker.props.ts +++ b/packages/ui-vue/components/time-picker/src/time-picker.props.ts @@ -1,9 +1,5 @@ import { ExtractPropTypes, PropType } from 'vue'; -import { createPropsResolver } from '../../dynamic-resolver'; -import { schemaMapper } from './schema/schema-mapper'; -import timePickerSchema from './schema/time-picker.schema.json'; -import { schemaResolver } from './schema/schema-resolver'; import { DisabledHoursFunction, DisabledMinutesFunction, DisabledSecondsFunction } from './composition/types'; export const timePickerProps = { @@ -39,4 +35,3 @@ export const timePickerProps = { export type TimePickerProps = ExtractPropTypes; -export const propsResolver = createPropsResolver(timePickerProps, timePickerSchema, schemaMapper, schemaResolver); diff --git a/packages/ui-vue/components/transfer/src/schema/schema-mapper.ts b/packages/ui-vue/components/transfer/src/schema/schema-mapper.ts index 97964aee23bbb8b523c7692723ea02db00d4f4c0..2ca33ca080647b9edc66a133396282d6a3b1698f 100644 --- a/packages/ui-vue/components/transfer/src/schema/schema-mapper.ts +++ b/packages/ui-vue/components/transfer/src/schema/schema-mapper.ts @@ -1,4 +1,4 @@ -import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver'; +import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver'; export const schemaMapper = new Map([ ['appearance', resolveAppearance] diff --git a/packages/ui-vue/components/transfer/src/schema/schema-resolver.ts b/packages/ui-vue/components/transfer/src/schema/schema-resolver.ts index b02bdf93eec9060948f579c53aa81e3963a7d706..d36ae7457434b7381b796814e9926d352feacff6 100644 --- a/packages/ui-vue/components/transfer/src/schema/schema-resolver.ts +++ b/packages/ui-vue/components/transfer/src/schema/schema-resolver.ts @@ -1,4 +1,4 @@ -import { DynamicResolver } from "../../../dynamic-resolver"; +import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver"; export function schemaResolver(resolver: DynamicResolver, schema: Record, context: Record): Record { return schema; diff --git a/packages/ui-vue/components/uploader/src/schema/schema-mapper.ts b/packages/ui-vue/components/uploader/src/schema/schema-mapper.ts index 97964aee23bbb8b523c7692723ea02db00d4f4c0..2ca33ca080647b9edc66a133396282d6a3b1698f 100644 --- a/packages/ui-vue/components/uploader/src/schema/schema-mapper.ts +++ b/packages/ui-vue/components/uploader/src/schema/schema-mapper.ts @@ -1,4 +1,4 @@ -import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver'; +import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver'; export const schemaMapper = new Map([ ['appearance', resolveAppearance] diff --git a/packages/ui-vue/components/uploader/src/schema/schema-resolver.ts b/packages/ui-vue/components/uploader/src/schema/schema-resolver.ts index b02bdf93eec9060948f579c53aa81e3963a7d706..d36ae7457434b7381b796814e9926d352feacff6 100644 --- a/packages/ui-vue/components/uploader/src/schema/schema-resolver.ts +++ b/packages/ui-vue/components/uploader/src/schema/schema-resolver.ts @@ -1,4 +1,4 @@ -import { DynamicResolver } from "../../../dynamic-resolver"; +import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver"; export function schemaResolver(resolver: DynamicResolver, schema: Record, context: Record): Record { return schema; diff --git a/packages/ui-vue/components/verify-detail/src/schema/schema-mapper.ts b/packages/ui-vue/components/verify-detail/src/schema/schema-mapper.ts index 97964aee23bbb8b523c7692723ea02db00d4f4c0..2ca33ca080647b9edc66a133396282d6a3b1698f 100644 --- a/packages/ui-vue/components/verify-detail/src/schema/schema-mapper.ts +++ b/packages/ui-vue/components/verify-detail/src/schema/schema-mapper.ts @@ -1,4 +1,4 @@ -import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver'; +import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver'; export const schemaMapper = new Map([ ['appearance', resolveAppearance] diff --git a/packages/ui-vue/components/verify-detail/src/schema/schema-resolver.ts b/packages/ui-vue/components/verify-detail/src/schema/schema-resolver.ts index b02bdf93eec9060948f579c53aa81e3963a7d706..d36ae7457434b7381b796814e9926d352feacff6 100644 --- a/packages/ui-vue/components/verify-detail/src/schema/schema-resolver.ts +++ b/packages/ui-vue/components/verify-detail/src/schema/schema-resolver.ts @@ -1,4 +1,4 @@ -import { DynamicResolver } from "../../../dynamic-resolver"; +import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver"; export function schemaResolver(resolver: DynamicResolver, schema: Record, context: Record): Record { return schema;