@gct-paas/design 0.1.4-dev.18 → 0.1.4-dev.19

package/es/index.mjs

@@ -9,11 +9,10 @@ import { DesignStepCheck } from "./components/design-step-check/design-step-chec
 import { ModalNameEditor } from "./components/modal-name-editor/modal-name-editor.mjs";
 import { DesignViewLayout } from "./components/design-view-layout/design-view-layout.mjs";
 import FieldCascader_default from "./components/field-cascader/src/FieldCascader.vue.mjs";
+import { designInterceptors } from "./utils/design-interceptors/design-interceptors.mjs";
 import { designRegister, platform } from "./utils/design-view/index.mjs";
 import { basicAttrsUtils } from "./utils/field-attrs/basicAttrs.mjs";
 import { transformField2Component } from "./utils/field-attrs/index.mjs";
-import { beginDrag } from "./utils/begin-drag/begin-drag.mjs";
-import { designInterceptors } from "./utils/design-interceptors/design-interceptors.mjs";
 import { deptFilter, formulaFilter } from "./utils/field-filter/index.mjs";
 import { openFormulaEditorByDesign } from "./utils/formula-editor-design/formula-editor-design.mjs";
 import { findAllChildrenTypes } from "./utils/find-deep-types/find-deep-types.mjs";
@@ -24,6 +23,9 @@ import { buildRunJs, initMethodMap } from "./utils/transform-js/transform-js.mjs
 import { flatten } from "./utils/flatten.mjs";
 import "./utils/index.mjs";
 import { modal_exports } from "./schema/modal/modal.mjs";
+import { changeCmpData, createdSearchField } from "./schema/utils.mjs";
+import { fixedAlignEditor } from "./schema/common-config/column-editor-config.mjs";
+import { beginDrag } from "./schema/begin-drag/begin-drag.mjs";
 import { hiddenButtonProps } from "./schema/common-config/button-props-func.mjs";
 import { commonStyle, notNeedPxStyle } from "./schema/common-config/common-style.mjs";
 import { displayEditor, displayProps } from "./schema/common-config/display-editor-config.mjs";
@@ -34,10 +36,9 @@ import { buttonEditor, buttonProps, buttonStyleEditor } from "./schema/common-co
 import { formItemProps } from "./schema/common-config/formItem-editor-config.mjs";
 import { deviceEvent } from "./schema/common-config/common-event-config.mjs";
 import { getAutofillEditor } from "./schema/common-config/autofill-editor-config.mjs";
-import { fixedAlignEditor } from "./schema/common-config/column-editor-config.mjs";
+import { FieldOverrideUtil, setupOverride } from "./schema/field/index.mjs";
 import { BaseSearch, getSearchOptions } from "./schema/search/BaseSearch.mjs";
 import { BaseDate } from "./schema/search/BaseDate.mjs";
-import { FieldOverrideUtil, setupOverride } from "./schema/field/index.mjs";
 import "./schema/index.mjs";
 import { isModified, loading, methodMap, modalDesignId, modalDesignState, modalInfo, noMore, pageDesignHistoryList, pageJson, pageJsonSnapshot, pageNo, pluginConfigs, regRoot, subTableModalId, subTableModalState, transformPageJson, wfNodesModalId, wfNodesModalState, widgetInfo, workflowModalId, workflowModalState } from "./hooks/design-view/design-state.mjs";
 import { useScope } from "./hooks/design-view/layout/useScope.mjs";
@@ -91,4 +92,4 @@ function onInit() {
 }
 onInit();
 //#endregion
-export { BaseDate, BaseSearch, CategoryEnum, ControllerType, DesignContainerNode, DesignEditorNode, DesignEditorType, DesignItemActionTag, DesignItemAttribute, DesignNode, DesignNodePrefix, DesignNodeType, DesignPluginPgkUtil, DesignSaveTip, DesignStepCheck, DesignViewHooks, DesignViewLayout, DesignViewPrefix, DesignerRegister, FieldCascader_default as FieldCascader, FieldOverrideUtil, FieldSchema, InsertNodeMode, MaterialGroup, MaterialRegister, MenuClickEvent, ModalNameEditor, ModelTypeEnum, NotMask, PageTypeEnum, ProcessTypeEnum, SCREditorUtils, ScriptTypeEnum, user_lock_default as UserLock, user_occupy_default as UserOccupy, baseBtnEditor, baseBtnProp, basicAttrsUtils, basicFieldEditor, beginDrag, BTN_TYPE_COLOR as btnTypeColor, buildRunJs, buildRuntimeJson, buttonEditor, buttonProps, buttonStyleEditor, commonStyle, createWidgetByType, createWidgetProvider, currentPanel, customMenu, deptFilter, designCreateAppVue, designInterceptors, designRegister, designSetupApp, destroyOccupyTimer, deviceEvent, displayEditor, displayProps, explainEditor, findAllChildrenTypes, fixedAlignEditor, flatten, formItemProps, formulaFilter, getAutofillEditor, getBindCmpTypeEditor, getInputAttrEditor, getSearchOptions, hiddenButtonProps, initFieldWidgetRuntime, initMethodMap, isModified, loadPageInfo, loadPageOccupyInfo, loading, lockPage, methodMap, modal_exports as modalCfg, modalDesignId, modalDesignState, modalInfo, multiFieldEditor, newKeyTag, noMore, nodeContainerProps, nodeEditorProps, nodeProps, notNeedPxStyle, occupyPage, onWidgetInfoInit, openFormulaEditorByDesign, pageDesignHistoryList, pageInfo, pageJson, pageJsonSnapshot, pageNo, pageOccupyInfo, pagePermissions, permissionEditor, placeholderEditor, platform, pluginConfigs, PRESET_COLOR as presetColor, propEditorProps, propsToStyle, regRoot, regexEditor, rgba2hex, schemaToStyle, setupOverride, shadeColor, styleEditorProps, subTableModalId, subTableModalState, submitInHideEditor, togglePanel, transformField2Component, transformPageJson, unlockAvailable, uploadDraggerEditor, useAsyncFieldConfig, useAsyncFileAttrs, useAsyncOperateField, useCacheHistory, useCacheHistoryInner, useDesignCache, useDesignHistory, useDesignModal, useDesignPreview, useDesignSave, useDesigner, useDesignerController, useFieldTransfer, useGlobal, useKeyParser, useModelField, usePage, usePageOccupy, usePropEditor, useScope, useSelectedWidget, useStyle, useStyleEditor, useToolkit, useUserOccupy, useWidget, useWidgetQuery, useWidgetRegistry, validatorEditor, wfNodesModalId, wfNodesModalState, widgetInfo, widgetProps, widgetWrapperProps, workflowModalId, workflowModalState };
+export { BaseDate, BaseSearch, CategoryEnum, ControllerType, DesignContainerNode, DesignEditorNode, DesignEditorType, DesignItemActionTag, DesignItemAttribute, DesignNode, DesignNodePrefix, DesignNodeType, DesignPluginPgkUtil, DesignSaveTip, DesignStepCheck, DesignViewHooks, DesignViewLayout, DesignViewPrefix, DesignerRegister, FieldCascader_default as FieldCascader, FieldOverrideUtil, FieldSchema, InsertNodeMode, MaterialGroup, MaterialRegister, MenuClickEvent, ModalNameEditor, ModelTypeEnum, NotMask, PageTypeEnum, ProcessTypeEnum, SCREditorUtils, ScriptTypeEnum, user_lock_default as UserLock, user_occupy_default as UserOccupy, baseBtnEditor, baseBtnProp, basicAttrsUtils, basicFieldEditor, beginDrag, BTN_TYPE_COLOR as btnTypeColor, buildRunJs, buildRuntimeJson, buttonEditor, buttonProps, buttonStyleEditor, changeCmpData, commonStyle, createWidgetByType, createWidgetProvider, createdSearchField, currentPanel, customMenu, deptFilter, designCreateAppVue, designInterceptors, designRegister, designSetupApp, destroyOccupyTimer, deviceEvent, displayEditor, displayProps, explainEditor, findAllChildrenTypes, fixedAlignEditor, flatten, formItemProps, formulaFilter, getAutofillEditor, getBindCmpTypeEditor, getInputAttrEditor, getSearchOptions, hiddenButtonProps, initFieldWidgetRuntime, initMethodMap, isModified, loadPageInfo, loadPageOccupyInfo, loading, lockPage, methodMap, modal_exports as modalCfg, modalDesignId, modalDesignState, modalInfo, multiFieldEditor, newKeyTag, noMore, nodeContainerProps, nodeEditorProps, nodeProps, notNeedPxStyle, occupyPage, onWidgetInfoInit, openFormulaEditorByDesign, pageDesignHistoryList, pageInfo, pageJson, pageJsonSnapshot, pageNo, pageOccupyInfo, pagePermissions, permissionEditor, placeholderEditor, platform, pluginConfigs, PRESET_COLOR as presetColor, propEditorProps, propsToStyle, regRoot, regexEditor, rgba2hex, schemaToStyle, setupOverride, shadeColor, styleEditorProps, subTableModalId, subTableModalState, submitInHideEditor, togglePanel, transformField2Component, transformPageJson, unlockAvailable, uploadDraggerEditor, useAsyncFieldConfig, useAsyncFileAttrs, useAsyncOperateField, useCacheHistory, useCacheHistoryInner, useDesignCache, useDesignHistory, useDesignModal, useDesignPreview, useDesignSave, useDesigner, useDesignerController, useFieldTransfer, useGlobal, useKeyParser, useModelField, usePage, usePageOccupy, usePropEditor, useScope, useSelectedWidget, useStyle, useStyleEditor, useToolkit, useUserOccupy, useWidget, useWidgetQuery, useWidgetRegistry, validatorEditor, wfNodesModalId, wfNodesModalState, widgetInfo, widgetProps, widgetWrapperProps, workflowModalId, workflowModalState };

package/es/register/designer-register/designer-register.mjs

@@ -85,6 +85,10 @@ var DesignerRegister = class {
 	* @returns {*}  {(IDesignerProvider | undefined)}
 	*/
 	getProvider(tag) {
+		if (!this.providers.has(tag)) {
+			console.warn(`getProvider with tag ${tag} is not registered.`);
+			return;
+		}
 		return this.providers.get(tag);
 	}
 	/**

package/es/{utils → schema}/begin-drag/begin-drag.mjs

@@ -1,13 +1,15 @@
-import { designRegister, platform } from "../design-view/index.mjs";
-import { basicAttrsUtils } from "../field-attrs/basicAttrs.mjs";
-import { transformField2Component } from "../field-attrs/index.mjs";
+import { designRegister, platform } from "../../utils/design-view/index.mjs";
+import { basicAttrsUtils } from "../../utils/field-attrs/basicAttrs.mjs";
+import { transformField2Component } from "../../utils/field-attrs/index.mjs";
+import "../../utils/index.mjs";
+import { runSubtableFieldWidget, runWidget } from "../field/data-table-column.mjs";
 import { useDesigner } from "../../hooks/design-view/useDesigner.mjs";
 import { useAsyncOperateField } from "../../hooks/widgets/useAsyncFields.mjs";
 import "../../hooks/index.mjs";
 import { cloneDeep, get, merge } from "lodash-es";
 import { CreateType, EntityModelTypeEnum, FIELD_TYPE, FieldIconMap, FormComponents, MaterialEnum, Platform, buildShortUUID } from "@gct-paas/core";
 import { transformI18n } from "@gct-paas/schema";
-//#region src/utils/begin-drag/begin-drag.ts
+//#region src/schema/begin-drag/begin-drag.ts
 var { unBindAsyncStatus } = useAsyncOperateField();
 /**
 *
@@ -94,8 +96,8 @@ function beginDrag(data, { materialType = MaterialEnum.MaterialFormField, preLoc
 	transformI18n(cmp.props);
 	const widget = merge(cmp, basic);
 	provider.beforeCreate?.(widget);
-	if (materialType === MaterialEnum.MaterialTableField) {}
-	if ([MaterialEnum.MaterialSubTableField, MaterialEnum.MaterialTableSelectField].includes(materialType) && (widget.platform === Platform.WEB || widget.platform === Platform.PAD)) {}
+	if (materialType === MaterialEnum.MaterialTableField) return runWidget(widget);
+	if ([MaterialEnum.MaterialSubTableField, MaterialEnum.MaterialTableSelectField].includes(materialType) && (widget.platform === Platform.WEB || widget.platform === Platform.PAD)) return runSubtableFieldWidget(widget);
 	if (materialType === MaterialEnum.MaterialSubTableModalField) {
 		const { subTableModalId } = useDesigner();
 		unBindAsyncStatus(subTableModalId.value);

package/es/schema/common-config/common-field-editor-config.mjs

@@ -1,3 +1,4 @@
+import { changeCmpData } from "../utils.mjs";
 import { useScope } from "../../hooks/design-view/layout/useScope.mjs";
 import { useDesigner } from "../../hooks/design-view/useDesigner.mjs";
 import "../../hooks/index.mjs";
@@ -105,6 +106,7 @@ var getBindCmpTypeEditor = ({ name, type, hiddenCallback, filterOptionsCallback,
 				widget.props.displayTimeType = "d:h:m:s";
 				return;
 			}
+			changeCmpData(widget);
 		}
 	}];
 };

package/es/schema/field/data-table-column.mjs

@@ -1,8 +1,56 @@
+import { createdSearchField } from "../utils.mjs";
 import { fixedAlignEditor } from "../common-config/column-editor-config.mjs";
-import "lodash-es";
-import { BindCmpStyleEnum, FIELD_TYPE, FormComponents, Platform, ProgressTypeEnum, PropGroup, StyleGroup, TagTypeEnum, TextDecoration, buildShortUUID, fixedAlignENUM, tableColumnWidthEnum, tagEnum } from "@gct-paas/core";
+import { merge } from "lodash-es";
+import { BindCmpStyleEnum, FIELD_TYPE, FormComponents, MaterialEnum, Platform, ProgressTypeEnum, PropGroup, StyleGroup, TagTypeEnum, TextDecoration, buildShortUUID, fixedAlignENUM, searchListByFieldType, t, tableColumnWidthEnum, tagEnum } from "@gct-paas/core";
 import "@gct-paas/schema";
-fixedAlignENUM.NONE, tableColumnWidthEnum.ATUO;
+//#region src/schema/field/data-table-column.ts
+var columns = {
+	props: {
+		fixedAlign: fixedAlignENUM.NONE,
+		embeddedSearch: false
+	},
+	style: {
+		columnwidthConfigure: tableColumnWidthEnum.ATUO,
+		columnwidth: 100,
+		columnFontStyleByRule: [],
+		columnBackgroundByRule: []
+	}
+};
+var tempComponent = [];
+function runWidget(widget) {
+	const columnWidget = merge({}, { ...widget }, columns);
+	if (widget.platform === Platform.MOBILE) {
+		/**移动端汇总字段 */
+		columnWidget.style.columnwidth = 25;
+		columnWidget.style.columnwidthConfigure = tableColumnWidthEnum.ATUO;
+		return columnWidget;
+	}
+	/** bindFieldKey 存在必然是关联模型关联字段 不需要内嵌搜索*/
+	columnWidget.props.embeddedSearch = !columnWidget.props.bindFieldKey;
+	const searchField = searchListByFieldType.includes(widget.props.fieldType);
+	if (searchField && columnWidget.props.embeddedSearch) {
+		if (!tempComponent.includes(widget.props.fieldType)) {
+			const search = createdSearchField(widget.props);
+			if (search) {
+				search.alias = t("sys.pageDesigner.embeddedSearch");
+				columnWidget.children = [search];
+				search.materialType = MaterialEnum.MaterialTableField;
+			}
+		}
+		columnWidget.props.readonly = true;
+		columnWidget.props.required = false;
+	}
+	if (!searchField) {
+		columnWidget.props.readonly = true;
+		columnWidget.props.embeddedSearch = false;
+		columnWidget.props.required = false;
+		if (widget.props.fieldType === FIELD_TYPE.SERIAL) columnWidget.props.fieldReadonly = true;
+	}
+	return columnWidget;
+}
+function runSubtableFieldWidget(widget) {
+	return merge({}, { ...widget }, columns);
+}
 function webRunPropEditor(list) {
 	return [
 		...list,
@@ -218,4 +266,4 @@ function getBackgroundRule() {
 	};
 }
 //#endregion
-export { mobileRunSubTableStyleEditor, runStyleEditor, webRunPropEditor };
+export { mobileRunSubTableStyleEditor, runStyleEditor, runSubtableFieldWidget, runWidget, webRunPropEditor };

package/es/schema/field/index.mjs

@@ -1,5 +1,5 @@
-import { runPropEditor } from "./card-list-field.mjs";
 import { mobileRunSubTableStyleEditor, runStyleEditor, webRunPropEditor } from "./data-table-column.mjs";
+import { runPropEditor } from "./card-list-field.mjs";
 import { MaterialEnum, Platform, SUB_TABLE_EDIT_MODE } from "@gct-paas/core";
 import { FieldEditorOverrideRegistry, padVTableSupportEditFieldTypes } from "@gct-paas/schema";
 //#region src/schema/field/index.ts

package/es/schema/index.d.ts

@@ -1,5 +1,6 @@
 import * as modalCfg from './modal/modal';
 export { modalCfg };
+export { beginDrag } from './begin-drag/begin-drag';
 export * from './common-config/button-props-func';
 export * from './common-config/common-style';
 export * from './common-config/display-editor-config';
@@ -11,6 +12,7 @@ export * from './common-config/formItem-editor-config';
 export * from './common-config/common-event-config';
 export * from './common-config/autofill-editor-config';
 export * from './common-config/column-editor-config';
+export * from './field';
 export * from './search/BaseSearch';
 export * from './search/BaseDate';
-export * from './field';
+export * from './utils';

package/es/schema/index.mjs

@@ -1,4 +1,7 @@
 import "./modal/modal.mjs";
+import "./utils.mjs";
+import "./common-config/column-editor-config.mjs";
+import "./begin-drag/begin-drag.mjs";
 import "./common-config/button-props-func.mjs";
 import "./common-config/common-style.mjs";
 import "./common-config/display-editor-config.mjs";
@@ -9,7 +12,6 @@ import "./common-config/button-editor-config.mjs";
 import "./common-config/formItem-editor-config.mjs";
 import "./common-config/common-event-config.mjs";
 import "./common-config/autofill-editor-config.mjs";
-import "./common-config/column-editor-config.mjs";
+import "./field/index.mjs";
 import "./search/BaseSearch.mjs";
 import "./search/BaseDate.mjs";
-import "./field/index.mjs";

package/es/schema/utils.d.ts

@@ -0,0 +1,8 @@
+import { LowCodeWidget } from '@gct-paas/schema';
+/**
+ * 创建搜索字段组件
+ * @param data
+ * @returns
+ */
+export declare function createdSearchField(data: IObject): LowCodeWidget.SearchSchema;
+export declare function changeCmpData(widget: LowCodeWidget.BasicSchema): void;

package/es/schema/utils.mjs

@@ -0,0 +1,76 @@
+import { designRegister } from "../utils/design-view/index.mjs";
+import "../utils/index.mjs";
+import { cloneDeep, difference, merge, pick, without } from "lodash-es";
+import { FIELD_TYPE, FieldIconMap, buildShortUUID, t, transformBindCmp2CmpType } from "@gct-paas/core";
+import { basicSearchAttrsUtils, transformField2SearchComponent, transformI18n } from "@gct-paas/schema";
+//#region src/schema/utils.ts
+/**
+* 创建搜索字段组件
+* @param data
+* @returns
+*/
+function createdSearchField(data) {
+	const { field, fieldId, fieldName, fieldCodeChain, fieldType: comType, label, bindModelKey, modelKey, returnType, type, preLocation, isFieldModel, platform } = data;
+	const basic = {
+		id: buildShortUUID(comType),
+		name: `sys.pageDesigner.fieldCmp.${type || comType}`,
+		icon: FieldIconMap[type || comType],
+		isSearchField: true,
+		preLocation,
+		platform
+	};
+	const fieldType = [FIELD_TYPE.AGG, FIELD_TYPE.EXPRESSION].includes(comType) ? returnType : comType;
+	data.fieldType = fieldType;
+	const { searchCmpKey, attrsTransform } = transformField2SearchComponent(fieldType) || {};
+	if (!searchCmpKey) return;
+	const searchCmp = cloneDeep(designRegister.value.getProvider(searchCmpKey)?.schema);
+	const otherAttrs = Object.fromEntries(attrsTransform.concat([...basicSearchAttrsUtils.ope]).map((row) => {
+		const value = data[row.from];
+		return [row.to, row.transform ? row.transform(value) : value];
+	}));
+	merge(searchCmp.props, {
+		field,
+		fieldId,
+		fieldType,
+		fieldName,
+		fieldCodeChain,
+		label,
+		modelKey,
+		bindModelKey,
+		disabled: false,
+		readonly: false,
+		modeldata: {
+			modelCategory: data.modelCategory,
+			modelType: data.modelType
+		},
+		isFieldModel,
+		...otherAttrs
+	}, searchCmp.props.placeholder && { placeholder: t(searchCmp.props.placeholder) });
+	if (isFieldModel && fieldCodeChain) searchCmp.props.fieldSearchKey = [...JSON.parse(fieldCodeChain)?.fieldLink || [], field].join("$");
+	return merge(searchCmp, basic);
+}
+function changeCmpData(widget) {
+	const cmpType = transformBindCmp2CmpType[widget.props.bindCompStyleType];
+	const cmp = cloneDeep(designRegister.value.getProvider(cmpType)?.schema);
+	const sourceWidgetPropsAttrs = Object.keys(widget.props);
+	const nowWidgetPropsAttrs = Object.keys(cmp.props);
+	const commonAttrs = [
+		"field",
+		"fieldId",
+		"fieldType",
+		"fieldName",
+		"fieldCodeChain",
+		"bindFieldKey"
+	];
+	const addAttrs = difference(nowWidgetPropsAttrs, sourceWidgetPropsAttrs);
+	const delAttrs = without(difference(sourceWidgetPropsAttrs, nowWidgetPropsAttrs), ...commonAttrs);
+	widget.type = cmp.type;
+	delAttrs.forEach((attr) => {
+		delete widget.props[attr];
+	});
+	const addRes = pick(cmp.props, addAttrs);
+	merge(widget.props, addRes);
+	transformI18n(widget.props);
+}
+//#endregion
+export { changeCmpData, createdSearchField };

package/es/utils/index.d.ts

@@ -1,4 +1,3 @@
-export { beginDrag } from './begin-drag/begin-drag';
 export { designInterceptors } from './design-interceptors/design-interceptors';
 export { platform, designRegister } from './design-view';
 export { basicAttrsUtils, transformField2Component } from './field-attrs';

package/es/utils/index.mjs

@@ -1,8 +1,7 @@
+import "./design-interceptors/design-interceptors.mjs";
 import "./design-view/index.mjs";
 import "./field-attrs/basicAttrs.mjs";
 import "./field-attrs/index.mjs";
-import "./begin-drag/begin-drag.mjs";
-import "./design-interceptors/design-interceptors.mjs";
 import "./field-filter/index.mjs";
 import "./formula-editor-design/formula-editor-design.mjs";
 import "./find-deep-types/find-deep-types.mjs";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gct-paas/design",
-  "version": "0.1.4-dev.18",
+  "version": "0.1.4-dev.19",
   "type": "module",
   "description": "paas 平台设计界面底包",
   "loader": "dist/loader.esm.min.js",
@@ -45,11 +45,11 @@
     "@ant-design/icons-vue": "^7.0.1",
     "@babel/core": "^7.29.0",
     "@babel/standalone": "^7.29.2",
-    "@gct-paas/api": "^0.1.2-dev.1",
-    "@gct-paas/core": "0.1.4-dev.18",
-    "@gct-paas/core-web": "0.1.4-dev.18",
-    "@gct-paas/schema": "0.1.4-dev.18",
-    "@gct-paas/scss": "0.1.4-dev.18",
+    "@gct-paas/api": "^0.1.2-dev.2",
+    "@gct-paas/core": "0.1.4-dev.19",
+    "@gct-paas/core-web": "0.1.4-dev.19",
+    "@gct-paas/schema": "0.1.4-dev.19",
+    "@gct-paas/scss": "0.1.4-dev.19",
     "@jsplumb/browser-ui": "^6.2.10",
     "@vueuse/core": "^14.1.0",
     "ant-design-vue": "~3.2.20",
@@ -79,5 +79,5 @@
     "@gct-paas/scss": "*",
     "vue": ">=3"
   },
-  "gitHead": "d79e561695bc9a4ff14b7c1bc735a595a32ed3e9"
+  "gitHead": "efd978bbe7552b0c5ef6dbc5b62780c68aa116ab"
 }