diff --git a/packages/ui-vue/components/data-view/composition/pagination/use-pagination.ts b/packages/ui-vue/components/data-view/composition/pagination/use-pagination.ts index 4eeafc937ea1253b52496e9cb3e9fbfb18e5ca2a..a98638e48d1840bb1dcd5ecfdc517a2ac1e28498 100644 --- a/packages/ui-vue/components/data-view/composition/pagination/use-pagination.ts +++ b/packages/ui-vue/components/data-view/composition/pagination/use-pagination.ts @@ -3,8 +3,8 @@ import { useCommonUtils } from '@farris/ui-vue/components/common'; import { DataViewOptions, PaginatonOptions, UseData, UseDataView, UsePagination } from '../types'; export function usePagination( - props: DataViewOptions, - dataView: UseDataView + props: DataViewOptions|any, + dataView: UseDataView|any ): UsePagination { const { isUndefined } = useCommonUtils(); const { pageIndex, totalItems, pagination } = dataView; @@ -25,7 +25,7 @@ export function usePagination( const showGotoPage = ref(props.pagination?.showGoto || false); // 是否展示分页总数信息 - const showPageInfo = ref(props.pagination?.showPageInfo || true); + const showPageInfo: any = ref(props.pagination?.showPageInfo || true); watch(() => props.pagination?.disabled, (newValue: boolean, oldValue: boolean) => { if (newValue !== oldValue) { diff --git a/packages/ui-vue/components/dynamic-form/src/component/dynamic-form-group/dynamic-form-group.props.ts b/packages/ui-vue/components/dynamic-form/src/component/dynamic-form-group/dynamic-form-group.props.ts index 16f19efd11e9ef5f941c523b9c982c92148e68d5..4cb3c15505daf08d729bd55b55f46272b4efc754 100644 --- a/packages/ui-vue/components/dynamic-form/src/component/dynamic-form-group/dynamic-form-group.props.ts +++ b/packages/ui-vue/components/dynamic-form/src/component/dynamic-form-group/dynamic-form-group.props.ts @@ -1,5 +1,9 @@ import { ExtractPropTypes, PropType } from 'vue'; import { EditorType, EditorConfig } from '../../types'; +import { createPropsResolver } from '../../../../dynamic-resolver'; +import { schemaMapper } from '../../schema/schema-mapper'; +import formGroupSchema from '../../schema/form-group.schema.json'; +import { createFormGroupEditorResolver } from '../../../../dynamic-resolver/src/editor-resolver'; import { FormValidationInfo } from '../validation-message/validation-message.props'; /** * 显示且占位visible、占位不显示reserve-space、不占位不显示none diff --git a/packages/ui-vue/components/dynamic-form/src/component/dynamic-form-input/dynamic-form-input.component.tsx b/packages/ui-vue/components/dynamic-form/src/component/dynamic-form-input/dynamic-form-input.component.tsx index 6fe0e58e14dcda596fcff4198f17b7daad950afd..b7efe7e86e6a1ec3f85f8d97ee5c6d44093d9bb2 100644 --- a/packages/ui-vue/components/dynamic-form/src/component/dynamic-form-input/dynamic-form-input.component.tsx +++ b/packages/ui-vue/components/dynamic-form/src/component/dynamic-form-input/dynamic-form-input.component.tsx @@ -1,6 +1,6 @@ import { SetupContext, computed, defineComponent, ref, watch } from 'vue'; -import { DynamicFormInputProps, dynamicFormInputProps } from '@farris/ui-vue/components/dynamic-form'; import { useTypeResolver } from '../../composition/use-type-resolver'; +import { DynamicFormInputProps, dynamicFormInputProps } from './dynamic-form-input.props'; export default defineComponent({ name: 'FDynamicFormInput', diff --git a/packages/ui-vue/components/dynamic-form/src/composition/form-binding-resolver-design.ts b/packages/ui-vue/components/dynamic-form/src/composition/form-binding-resolver-design.ts index 2927dc119f64d177857c54a750eca39bdf8a36c8..51ddabb2f8e0c7f8a7dcfde2a5aa144ea9c0a5c6 100644 --- a/packages/ui-vue/components/dynamic-form/src/composition/form-binding-resolver-design.ts +++ b/packages/ui-vue/components/dynamic-form/src/composition/form-binding-resolver-design.ts @@ -1,7 +1,8 @@ -import { FormBindingType } from "@farris/ui-vue/components/property-panel"; -import { DesignerHostService, DesignerItemContext } from "@farris/ui-vue/components/designer-canvas"; -import { FormSchemaEntityField$Type } from "@farris/ui-vue/components/common"; -import { DynamicFormGroupPropsType } from "@farris/ui-vue/components/dynamic-form"; +import { FormBindingType } from "../../../../components/property-panel"; +import { DesignerHostService } from "../../../../components/designer-canvas/src/composition/types"; +import { DesignerItemContext } from "../../../../components/designer-canvas"; +import { FormSchemaEntityField$Type } from "../../../../components/common/entity/entity-schema"; +import { DynamicFormGroupPropsType } from "../component/dynamic-form-group/dynamic-form-group.props"; export function useFormBindingResolverDesign(designerHostService: DesignerHostService, designItemContext: DesignerItemContext, props: DynamicFormGroupPropsType) { diff --git a/packages/ui-vue/components/dynamic-form/src/composition/use-type-resolver-design.ts b/packages/ui-vue/components/dynamic-form/src/composition/use-type-resolver-design.ts index a84ab3488eba5d3458f2c91dc6c075f4d0dd6f41..5a8aa7649ebc0a48e1d5874d495b096b7c7e1f79 100644 --- a/packages/ui-vue/components/dynamic-form/src/composition/use-type-resolver-design.ts +++ b/packages/ui-vue/components/dynamic-form/src/composition/use-type-resolver-design.ts @@ -1,5 +1,5 @@ -import { componentMap, componentPropsConverter } from '@farris/ui-vue/components/designer-canvas'; -import FInputGroupDesign from '@farris/ui-vue/components/input-group/designer'; +import { componentMap, componentPropsConverter } from '../../../../components/designer-canvas/src/components/maps'; +import FInputGroupDesign from '../../../input-group/src/designer/input-group.design.component'; import { EditorType, EditorConfig } from "../types"; import { UseTypeResolver } from "./types"; diff --git a/packages/ui-vue/components/dynamic-form/src/composition/use-type-resolver.ts b/packages/ui-vue/components/dynamic-form/src/composition/use-type-resolver.ts index d15ab84e1e1af0680873db2787e2dbc225f0848a..4696eb2e5315552ee51a6016b46c29a99a00f2ac 100644 --- a/packages/ui-vue/components/dynamic-form/src/composition/use-type-resolver.ts +++ b/packages/ui-vue/components/dynamic-form/src/composition/use-type-resolver.ts @@ -1,7 +1,7 @@ /* eslint-disable complexity */ -import { componentMap, componentPropsConverter, loadRegister } from '@farris/ui-vue/components/dynamic-view'; import { EditorType, EditorConfig } from "../types"; import { UseTypeResolver } from "./types"; +import { componentMap, componentPropsConverter, loadRegister } from '../../../dynamic-view/src/components/maps'; export function useTypeResolver(): UseTypeResolver { diff --git a/packages/ui-vue/components/dynamic-resolver/src/converter/type.converter.ts b/packages/ui-vue/components/dynamic-resolver/src/converter/type.converter.ts index 774c240617edbba5f374c5090cbc7a33db95aba4..f3e2f4c71f0671f8aca0b0dd26fba07948ed1648 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,4 +1,5 @@ -import { ComponentSchema, DgControl } from "@farris/ui-vue/components/designer-canvas"; +import { ComponentSchema } from "../../../designer-canvas/src/types"; +import { DgControl } from "../../../designer-canvas/src/composition/dg-control"; 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 704c45fd61d98259f8472bc5d76eeae3ca2cabd0..4f3d0b0faf8676d784c03498903b16d69565c30f 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,9 +1,8 @@ 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 "./resolver/schema/schema-resolver"; import appearanceConverter from './converter/appearance.converter'; import buttonsConverter from "./converter/buttons.converter"; @@ -19,6 +18,7 @@ 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"; import changeFormatterEnumConverter from './converter/change-formatter-enum.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 1bbb34b6dc8b457bb870b2b7ee9eb392dd3b33ee..4149639d269f7eaa860917a848a9fdd2dfe981f6 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 '@farris/ui-vue/components/designer-canvas'; +import { DesignerHostService } from './../../designer-canvas/src/composition/types'; import { mappingSchemaToProps, resolveSchemaToProps, schemaMap, schemaResolverMap } from './resolver/schema/schema-resolver'; import { DynamicResolver, EffectFunction, MapperFunction, SchemaResolverFunction } from './types'; import { propertyConfigSchemaMap, propertyEffectMap } from './resolver/property-config/property-config-resolver'; diff --git a/packages/ui-vue/components/dynamic-resolver/src/types.ts b/packages/ui-vue/components/dynamic-resolver/src/types.ts index 3b5d9e5add530ea39b7b0c7ce173b67e96f802f5..8d52aff53cb7a3ddd71798f3fdabe77bfcc33fb7 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 "@farris/ui-vue/components/designer-canvas"; + +import { DesignerHostService } from "../../designer-canvas/src/composition/types"; export type MapperFunction = (key: string, value: any, resolvedSchema?: any) => Record; @@ -55,7 +55,7 @@ export interface BindingModel { export interface BindingData { getValue(elementId: string); - setValue(elementId: string, field: string, value: any); + setValue(elementId: string, field: string | undefined, value: any); } export interface BindingResolver { resolve(schema: Record, bindingData: BindingData); @@ -70,7 +70,7 @@ export interface EditorResolver { } export interface UpdateColumnsResolver { - updateColumns(component: any ,schema: Record); + updateColumns(component: any, schema: Record); } export interface ViewEvent { diff --git a/packages/ui-vue/components/tree-grid/src/designer/use-designer-rules.ts b/packages/ui-vue/components/tree-grid/src/designer/use-designer-rules.ts index 9e26516513e81ffac19c89fdd4f688ba5e48945e..240a73a23f6064be1bec44c206450d64662208f3 100644 --- a/packages/ui-vue/components/tree-grid/src/designer/use-designer-rules.ts +++ b/packages/ui-vue/components/tree-grid/src/designer/use-designer-rules.ts @@ -1,5 +1,11 @@ import { ref } from "vue"; -import { DraggingResolveContext, UseDesignerRules, ComponentSchema, DesignerItemContext } from "@farris/ui-vue/components/designer-canvas"; +import { + DraggingResolveContext, + UseDesignerRules, + ComponentSchema, + DesignerItemContext, + DgControl + } from "@farris/ui-vue/components/designer-canvas"; import { TreeGridProperty } from "../property-config/tree-grid.property-config"; export function useDesignerRulesForTreeGrid(designItemContext: DesignerItemContext, designerHostService): UseDesignerRules {