diff --git a/packages/designer/src/app-providers.ts b/packages/designer/src/app-providers.ts index 71db35c8b35eb76621211585f1c3091038ceb993..38380e1df11eaf5fbe3690bab87bafc1abe90a37 100644 --- a/packages/designer/src/app-providers.ts +++ b/packages/designer/src/app-providers.ts @@ -1,7 +1,7 @@ import { App } from "vue"; import { FLoadingService, FTooltipDirective, FMessageBoxService, F_MODAL_SERVICE_TOKEN, FModalService, LookupSchemaRepositoryToken, FieldSelectorRepositoryToken, F_NOTIFY_SERVICE_TOKEN, FNotifyService, ControllerSchemaRepositorySymbol, FormSchemaRepositorySymbol } from "@farris/ui-vue/components"; -import { LookupSchemaRepositoryToken as MobileLookupSchemaRepositoryToken, FieldSelectorRepositoryToken as MobileFieldSelectorRepositoryToken } from "@farris/mobile-ui-vue"; +// import { LookupSchemaRepositoryToken as MobileLookupSchemaRepositoryToken, FieldSelectorRepositoryToken as MobileFieldSelectorRepositoryToken } from "@farris/mobile-ui-vue"; import { MetadataService } from "./components/composition/metadata.service"; import { MetadataPathToken, MetadataServiceToken } from "./components/types"; import { LookupFieldSelectorService, LookupSchemaService } from "./components/composition/schema-repository"; @@ -27,8 +27,8 @@ export default { app.provide(LookupSchemaRepositoryToken, new LookupSchemaService(metadataService)); app.provide(FieldSelectorRepositoryToken, new LookupFieldSelectorService(metadataService)); - app.provide(MobileLookupSchemaRepositoryToken, new LookupSchemaService(metadataService)); - app.provide(MobileFieldSelectorRepositoryToken, new LookupFieldSelectorService(metadataService)); + // app.provide(MobileLookupSchemaRepositoryToken, new LookupSchemaService(metadataService)); + // app.provide(MobileFieldSelectorRepositoryToken, new LookupFieldSelectorService(metadataService)); app.provide(F_NOTIFY_SERVICE_TOKEN, new FNotifyService()); app.provide(ControllerSchemaRepositorySymbol, new ControllerSelectorSchemaService(metadataService,designerContext)); app.provide(FormSchemaRepositorySymbol, new FormSelectorSchemaService(metadataService)); diff --git a/packages/designer/src/components/components/entity-tree-view/components/create-new-field.component.tsx b/packages/designer/src/components/components/entity-tree-view/components/create-new-field.component.tsx index 48669cd7c749f8047f3545750f8e11b0aec0b9cb..d51598b07af2f94cc21f9de72df6585b8767150a 100644 --- a/packages/designer/src/components/components/entity-tree-view/components/create-new-field.component.tsx +++ b/packages/designer/src/components/components/entity-tree-view/components/create-new-field.component.tsx @@ -169,7 +169,7 @@ export default defineComponent({ true )} - {(extendField.value.type === 'String' || extendField.value.type === 'Integer') && + {extendField.value.type === 'String' && renderEditor('对象类型', diff --git a/packages/designer/src/components/components/entity-tree-view/components/modify-field.component.tsx b/packages/designer/src/components/components/entity-tree-view/components/modify-field.component.tsx index 28cfb400acc6b399c9924d55306344ce01d65d60..d1b1e748440f45236593a1b85309a4446a037d8e 100644 --- a/packages/designer/src/components/components/entity-tree-view/components/modify-field.component.tsx +++ b/packages/designer/src/components/components/entity-tree-view/components/modify-field.component.tsx @@ -97,8 +97,7 @@ export default defineComponent({ } context.emit('submit', { name: fieldName.value, - defaultValue: fieldDefaultValue.value, - modified: designerMode === 'PC_RTC' + defaultValue: fieldDefaultValue.value }); } @@ -135,6 +134,25 @@ export default defineComponent({ expressionConfig={expressionConfig} onValueChange={onDefaultValueChanged}> ; } + + function onCopyBindingPath() { + const textarea = document.createElement("textarea"); + textarea.value = fieldNode.value.bindingPath; + document.body.appendChild(textarea); + textarea.select(); + try { + const success = document.execCommand("copy"); + if (success) { + notifyService.success({ message: '字段绑定路径已复制到剪贴板' }); + } else { + notifyService.warning(`复制失败，请手动复制以下路径: ${fieldNode.value.bindingPath}`); + } + } catch (err) { + notifyService.warning(`复制失败，请手动复制以下路径: ${fieldNode.value.bindingPath}`); + } + document.body.removeChild(textarea); + } + return () => { return
@@ -144,7 +162,7 @@ export default defineComponent({ 字段名称
- + {fieldName.value && !fieldNameValid.value &&
名称已存在，请重新输入。 @@ -157,13 +175,13 @@ export default defineComponent({ -
- - +
+ +
- {designerMode === 'PC_RTC' && canModifyDefaultValue.value &&
+ {designerMode === DesignerMode.PC_RTC && canModifyDefaultValue.value &&
}
-
- - -
+ {designerMode === DesignerMode.PC_RTC && +
+ + +
}
; }; diff --git a/packages/designer/src/components/components/entity-tree-view/composition/use-modify-field-modal.tsx b/packages/designer/src/components/components/entity-tree-view/composition/use-modify-field-modal.tsx index 4796a18ccc674a3b3d219add786a3fed832ddad0..ba022dae26fb91f4a3ad08613a473c0e26bfb275 100644 --- a/packages/designer/src/components/components/entity-tree-view/composition/use-modify-field-modal.tsx +++ b/packages/designer/src/components/components/entity-tree-view/composition/use-modify-field-modal.tsx @@ -69,11 +69,7 @@ export function useOpenModifyField( /** * 确定修改字段 */ - function onSubmit(fieldInfo: { name: string, defaultValue: any, modified: boolean }) { - if (!fieldInfo?.modified) { - onCloseModal(); - return; - } + function onSubmit(fieldInfo: { name: string, defaultValue: any }) { const originalFieldName = currentTreeNode.value?.data?.name; // 修改字段schema if (currentTreeNode.value?.data) { @@ -125,7 +121,7 @@ export function useOpenModifyField( const modalEditorRef = modalService.open({ title: '字段信息', width: 500, - height: useFormSchema.designerMode === 'PC_RTC' ? 250 : 210, + height: useFormSchema.designerMode === 'PC_RTC' ? 250 : 160, fitContent: false, showButtons: false, render: renderModifyFieldComponent(treeNode), diff --git a/packages/designer/src/components/components/entity-tree-view/composition/use-new-field-util.tsx b/packages/designer/src/components/components/entity-tree-view/composition/use-new-field-util.tsx index b274aa2f60cb3e19b0251ea26834357458e9869e..558514ef2fa8afe902b98c0d786749dc966ca518 100644 --- a/packages/designer/src/components/components/entity-tree-view/composition/use-new-field-util.tsx +++ b/packages/designer/src/components/components/entity-tree-view/composition/use-new-field-util.tsx @@ -83,7 +83,7 @@ export function useNewFieldUtil(props: CreateNewFieldProps, extendField: Ref [ElementObjectType.None, ElementObjectType.Enum].includes(type.value)); + // fieldObjectTypes.value = FieldObjectTypeEnums.filter(type => [ElementObjectType.None, ElementObjectType.Enum].includes(type.value)); break; } default: { diff --git a/packages/designer/src/components/components/form-designer/form-designer.component.tsx b/packages/designer/src/components/components/form-designer/form-designer.component.tsx index c1db9972b987a192179551eb772589bd6c349f9c..47709119228cb6788ae4414ce470ff498c22d13f 100644 --- a/packages/designer/src/components/components/form-designer/form-designer.component.tsx +++ b/packages/designer/src/components/components/form-designer/form-designer.component.tsx @@ -287,8 +287,8 @@ export default defineComponent({ class={formDesignerViewClass.value}>可视化设计器
onChangeDesignerView('formDesignerCode')} class={formDesignerCodeViewClass.value}>设计时代码
- {
onChangeDesignerView('customClassEditor')} - class={customClassEditorClass.value}>自定义样式
} + {/* {
onChangeDesignerView('customClassEditor')} + class={customClassEditorClass.value}>自定义样式
} */}
diff --git a/packages/designer/src/components/composition/command/supported-controllers/pc-supported-controller.json b/packages/designer/src/components/composition/command/supported-controllers/pc-supported-controller.json index 3a860204fb1ad053777fb9c54f6fcf6ea593b150..27a43cf45b06e94440e0aa86b3d1f646cdc3c8d4 100644 --- a/packages/designer/src/components/composition/command/supported-controllers/pc-supported-controller.json +++ b/packages/designer/src/components/composition/command/supported-controllers/pc-supported-controller.json @@ -465,22 +465,50 @@ "code": "viewProcessInstance" } ], - "3f40288a-d11e-4dbd-89ba-388abf931ca3": [ - { - "id": "2e237692-05ae-8c84-6ec9-5f9c42ad7f82", - "code": "DataImport" - },{ - "id": "474eb4bb-f218-664d-dc2d-796ab04d79a1", - "code": "DataExport" - },{ - "id": "608a3c5f-448d-2b05-d58f-de72af9a3566", - "code": "CardDataImport" - },{ - "id": "6a8d583c-3a7b-db67-5910-ab4e1e518f6b", - "code": "DownloadTemplate" - },{ - "id": "9194b00d-1b61-a33f-ad3d-38ebbf6ef022", - "code": "ListDataExport" + "a7cb7d01-9df1-4a32-8202-99c9d0f4c339": [ + { + "id": "570ffa0f-b80e-58fb-d327-ee44dc1d31d5", + "code": "submitWithBizDefKey" + }, + { + "id": "a0c24027-1c0a-63df-2a34-0f4de060ba86", + "code": "cancelSubmitWithDataId" + }, + { + "id": "f7a1b394-4659-f041-cb5d-2aa277fb4420", + "code": "batchSubmitWithBizDefKey" + }, + { + "id": "548db8ec-ca86-4a18-c481-af88038c413b", + "code": "batchCancelSubmitWithDataId" + }, + { + "id": "f32b5f55-2689-a398-0b56-f74973473b5a", + "code": "childSubmit" + }, + { + "id": "43d82ccc-26f2-91a1-614c-e9e810509b81", + "code": "childCancelSubmit" + }, + { + "id": "0f804753-536d-fda0-add8-0ec287c15cf8", + "code": "childBatchSubmit" + }, + { + "id": "a5ad23bc-9dec-995a-476e-1387060d4fc3", + "code": "childBatchCancelSubmit" + }, + { + "id": "f90e9df2-1bb3-e222-1cba-c41c600306a6", + "code": "viewFlowChartWithForecast" + }, + { + "id": "b749634e-473b-0d52-3f0a-3d78c255b03c", + "code": "viewProcessWithDataId" + }, + { + "id": "5e32c926-f5d3-ce1f-adb3-298f3dd658db", + "code": "viewApprovalLog" } ] } \ No newline at end of file diff --git a/packages/designer/src/components/composition/designer-context/use-designer-context.ts b/packages/designer/src/components/composition/designer-context/use-designer-context.ts index 25b397cbbb1ca9e00955209159eada41def58954..2b204cdd421ae324a8e37684b321cb1194807e24 100644 --- a/packages/designer/src/components/composition/designer-context/use-designer-context.ts +++ b/packages/designer/src/components/composition/designer-context/use-designer-context.ts @@ -30,12 +30,12 @@ export function useDesignerContext(): UseDesignerContext { const designerMode = getDesignerMode(); switch (designerMode) { - case DesignerMode.PC: { + case DesignerMode.PC: case DesignerMode.Mobile: { return usePCDesignerContext(); } - case DesignerMode.Mobile: { - return useMobileDesignerContext(); - } + // { + // return useMobileDesignerContext(); + // } case DesignerMode.PC_RTC: { return usePCRtcDesignerContext(); } diff --git a/packages/designer/src/components/composition/form-metadata.service.ts b/packages/designer/src/components/composition/form-metadata.service.ts index ce8e1b2a6aca2d1b12509380675fc4f1712b3a17..53b3686b840445faf3db876461e882752d7f4a12 100644 --- a/packages/designer/src/components/composition/form-metadata.service.ts +++ b/packages/designer/src/components/composition/form-metadata.service.ts @@ -206,9 +206,9 @@ export function useFormMetadata(props: DesignerProps, useFormSchemaComposition: if (designerContext.designerMode === DesignerMode.Mobile) { const component = useFormSchemaComposition.getComponents()[0]; const uri = component?.route?.uri; - previewUrl = `${window.location.origin}/platform/common/web/mobile-renderer/index.html#/${formCode}/${uri}?metadataPath=${metadataPath}&projectPath=${relativePath}&metadataId=${metadataId}`; + previewUrl = `${window.location.origin}/platform/common/web/mobile-renderer/index.html#/${formCode}/${uri}?metadataPath=${metadataPath}&projectPath=${relativePath}&baseMetadataId=${metadataId}`; } else { - previewUrl = `${window.location.origin}/platform/common/web/renderer/index.html#/preview?metadataPath=${metadataPath}&projectPath=${relativePath}&metadataId=${metadataId}`; + previewUrl = `${window.location.origin}/platform/common/web/renderer/index.html#/preview?metadataPath=${metadataPath}&projectPath=${relativePath}&baseMetadataId=${metadataId}`; } const windowProxy = window.open(previewUrl); if (!windowProxy) { @@ -227,7 +227,7 @@ export function useFormMetadata(props: DesignerProps, useFormSchemaComposition: */ async function publishMenu(messageBoxService: any, notifyService: any) { const metadataId = useFormSchemaComposition.getFormMetadataBasicInfo()?.id; - const publishUrl = `/platform/common/web/renderer/index.html#/?formMetadataId=${metadataId}`; + const publishUrl = `/platform/common/web/renderer/index.html#/?baseMetadataId=${metadataId}`; const textarea = document.createElement("textarea"); textarea.value = publishUrl; diff --git a/packages/designer/src/components/types/toolbox/pc-toolbox.json b/packages/designer/src/components/types/toolbox/pc-toolbox.json index f9fe57f77ccb9e79127ff3d892e8ee787f750601..2a5084fb69529d983f33084d7e45b5d1f107faf3 100644 --- a/packages/designer/src/components/types/toolbox/pc-toolbox.json +++ b/packages/designer/src/components/types/toolbox/pc-toolbox.json @@ -122,13 +122,6 @@ "type": "content-container", "name": "容器", "category": "container" - }, - { - "id": "ExternalContainer", - "type": "external-container", - "name": "外部容器", - "category": "container", - "icon":"content-container" } ] }, @@ -141,12 +134,6 @@ "type": "query-solution", "name": "筛选方案", "category": "container" - }, - { - "id": "FilterBar", - "type": "filter-bar", - "name": "筛选条", - "category": "container" } ] }, diff --git a/packages/ui-vue/components/lookup/src/lookup.props.ts b/packages/ui-vue/components/lookup/src/lookup.props.ts index bf3f7aa5175ce134225622b1e21a8e93dee16b6e..70267ccae72378d29cb45eddfc49ee5dd15a277e 100644 --- a/packages/ui-vue/components/lookup/src/lookup.props.ts +++ b/packages/ui-vue/components/lookup/src/lookup.props.ts @@ -56,7 +56,7 @@ export const lookupProps = { enableMultiFieldSearch: { type: Boolean, default: false }, treeToList: { type: Boolean, default: false }, navTreeToList: { type: Boolean, default: false }, - loadTreeDataType:{ type: String as PropType, default: LoadTreeDataType.default }, + loadTreeDataType:{ type: String as PropType, default: LoadTreeDataType.all }, enableToSelect: { type: Boolean, default: true }, customData: { type: Object, default: null }, modelValue: { type: String, default: '' }, diff --git a/packages/ui-vue/components/lookup/src/property-config/lookup.property-config.ts b/packages/ui-vue/components/lookup/src/property-config/lookup.property-config.ts index d7e33b4da9d32adc1c5ad3fe548ecbe9d7e05bbe..742f5bb775a275a74016f1d8f45514dd97488dfd 100644 --- a/packages/ui-vue/components/lookup/src/property-config/lookup.property-config.ts +++ b/packages/ui-vue/components/lookup/src/property-config/lookup.property-config.ts @@ -551,13 +551,14 @@ export class LookupPropertyConfig extends InputBaseProperty { editor: { ...this.comboListEditor, data: [ - { text: '弹出窗口', value: 'Modal'}, - { text: '下拉面板', value: 'Popup'}, + { text: '弹出窗口', value: 'Modal' }, + { text: '下拉面板', value: 'Popup' }, ], valueField: 'value', textField: 'text', idField: 'value' - } + }, + visible: false }, title: { description: "帮助标题", @@ -784,7 +785,8 @@ export class LookupPropertyConfig extends InputBaseProperty { textField: 'text', valueField: 'value' }, - visible: this.showLoadType(editorOptions) + // visible: this.showLoadType(editorOptions), + visible: false }, enableFullTree: { description: "启用构造完整树", @@ -806,27 +808,30 @@ export class LookupPropertyConfig extends InputBaseProperty { refreshPanelAfterChanged: true, title: "启用级联选择", type: "boolean", - visible: this.isTree(editorOptions) && !!editorOptions.multiSelect + // visible: this.isTree(editorOptions) && !!editorOptions.multiSelect, + visible: false }, showCascadeControl: { description: "显示级联选择控件", $converter: lookupDefaultConverter, title: "显示级联选择控件", type: "boolean", - visible: !!editorOptions.enableCascade && this.isTree(editorOptions) + // visible: !!editorOptions.enableCascade && this.isTree(editorOptions), + visible: false }, cascadeValue: { description: "级联选择默认状态", $converter: lookupDefaultConverter, title: "级联状态", type: "string", - visible: !!editorOptions.enableCascade && this.isTree(editorOptions), + // visible: !!editorOptions.enableCascade && this.isTree(editorOptions), editor: { ...this.comboListEditor, data: cascadeItems, textField: 'text', valueField: 'value' - } + }, + visible: false }, expandLevel: { description: "默认展开层级: 0: 不展开； -1: 全部展开；>0: 展开到指定级数 ", diff --git a/packages/ui-vue/components/lookup/src/schema/lookup.schema.json b/packages/ui-vue/components/lookup/src/schema/lookup.schema.json index dd0812629c17c84b685dfe74015c60de351909e5..2e96acfc1a18b285eb4167221f9dd7823b493874 100644 --- a/packages/ui-vue/components/lookup/src/schema/lookup.schema.json +++ b/packages/ui-vue/components/lookup/src/schema/lookup.schema.json @@ -198,7 +198,7 @@ }, "loadTreeDataType": { "type": "string", - "default": "default" + "default": "all" }, "onlySelectLeaf": { "type": "boolean", diff --git a/packages/ui-vue/components/mapping-editor/src/mapping-editor.component.tsx b/packages/ui-vue/components/mapping-editor/src/mapping-editor.component.tsx index 8d78e9aeb1af55ce5445d1b733a555c529391bf8..dbf995be0ad4e69288e5a38a7814ac2ba257f5f9 100644 --- a/packages/ui-vue/components/mapping-editor/src/mapping-editor.component.tsx +++ b/packages/ui-vue/components/mapping-editor/src/mapping-editor.component.tsx @@ -78,7 +78,7 @@ export default defineComponent({ valueField: props.toData.valueField || 'id', formatter: props.toData.formatter, editorParams: props.toData.editorParams, - multiSelect: true, + multiSelect: false, editable: false, customRowStatus: treeNodeStatus }, formatter: (cell, row) => {