@gct-paas/core-web 0.1.6-dev.38 → 0.1.6-dev.39

package/dist/{zh_TW-Dxzu1jIs.js → zh_TW-CIZU5thr.js}

@@ -1,2 +1,2 @@
-/*! @gct-paas/core-web v0.1.6-dev.38 */
-import{t as e}from"./objectSpread2-hnXyEBLf.js";var l={placeholder:"請選擇時間"},a={lang:e({placeholder:"請選擇日期",yearPlaceholder:"請選擇年份",quarterPlaceholder:"請選擇季度",monthPlaceholder:"請選擇月份",weekPlaceholder:"請選擇周",rangePlaceholder:["開始日期","結束日期"],rangeYearPlaceholder:["開始年份","結束年份"],rangeMonthPlaceholder:["開始月份","結束月份"],rangeQuarterPlaceholder:["開始季度","結束季度"],rangeWeekPlaceholder:["開始周","結束周"]},{locale:"zh_TW",today:"今天",now:"此刻",backToToday:"返回今天",ok:"確定",timeSelect:"選擇時間",dateSelect:"選擇日期",weekSelect:"選擇周",clear:"清除",month:"月",year:"年",previousMonth:"上個月 (翻頁上鍵)",nextMonth:"下個月 (翻頁下鍵)",monthSelect:"選擇月份",yearSelect:"選擇年份",decadeSelect:"選擇年代",yearFormat:"YYYY年",dayFormat:"D日",dateFormat:"YYYY年M月D日",dateTimeFormat:"YYYY年M月D日 HH時mm分ss秒",previousYear:"上一年 (Control鍵加左方向鍵)",nextYear:"下一年 (Control鍵加右方向鍵)",previousDecade:"上一年代",nextDecade:"下一年代",previousCentury:"上一世紀",nextCentury:"下一世紀"}),timePickerLocale:e({},l)};a.lang.ok="確 定";var r="${label}不是一個有效的${type}",t={locale:"zh-tw",Pagination:{items_per_page:"條/頁",jump_to:"跳至",jump_to_confirm:"確定",page:"頁",prev_page:"上一頁",next_page:"下一頁",prev_5:"向前 5 頁",next_5:"向後 5 頁",prev_3:"向前 3 頁",next_3:"向後 3 頁"},DatePicker:a,TimePicker:l,Calendar:a,global:{placeholder:"請選擇"},Table:{filterTitle:"篩選器",filterConfirm:"確定",filterReset:"重置",filterEmptyText:"無篩選項",selectAll:"全部選取",selectInvert:"反向選取",selectNone:"清空所有",selectionAll:"全選所有",sortTitle:"排序",expand:"展開行",collapse:"關閉行",triggerDesc:"點擊降序",triggerAsc:"點擊升序",cancelSort:"取消排序"},Modal:{okText:"確定",cancelText:"取消",justOkText:"知道了"},Popconfirm:{okText:"確定",cancelText:"取消"},Transfer:{searchPlaceholder:"搜尋資料",itemUnit:"項目",itemsUnit:"項目",remove:"删除",selectCurrent:"全選當頁",removeCurrent:"删除當頁",selectAll:"全選所有",removeAll:"删除全部",selectInvert:"反選當頁"},Upload:{uploading:"正在上傳...",removeFile:"刪除檔案",uploadError:"上傳失敗",previewFile:"檔案預覽",downloadFile:"下载文件"},Empty:{description:"無此資料"},Icon:{icon:"圖標"},Text:{edit:"編輯",copy:"複製",copied:"複製成功",expand:"展開"},PageHeader:{back:"返回"},Form:{optional:"（可選）",defaultValidateMessages:{default:"字段驗證錯誤${label}",required:"請輸入${label}",enum:"${label}必須是其中一個[${enum}]",whitespace:"${label}不能為空字符",date:{format:"${label}日期格式無效",parse:"${label}不能轉換為日期",invalid:"${label}是一個無效日期"},types:{string:r,method:r,array:r,object:r,number:r,date:r,boolean:r,integer:r,float:r,regexp:r,email:r,url:r,hex:r},string:{len:"${label}須為${len}個字符",min:"${label}最少${min}個字符",max:"${label}最多${max}個字符",range:"${label}須在${min}-${max}字符之間"},number:{len:"${label}必須等於${len}",min:"${label}最小值為${min}",max:"${label}最大值為${max}",range:"${label}須在${min}-${max}之間"},array:{len:"須為${len}個${label}",min:"最少${min}個${label}",max:"最多${max}個${label}",range:"${label}數量須在${min}-${max}之間"},pattern:{mismatch:"${label}與模式不匹配${pattern}"}}},Image:{preview:"預覽"}};export{t as default};
+/*! @gct-paas/core-web v0.1.6-dev.39 */
+import{t as e}from"./objectSpread2-BoFiCiyp.js";var l={placeholder:"請選擇時間"},a={lang:e({placeholder:"請選擇日期",yearPlaceholder:"請選擇年份",quarterPlaceholder:"請選擇季度",monthPlaceholder:"請選擇月份",weekPlaceholder:"請選擇周",rangePlaceholder:["開始日期","結束日期"],rangeYearPlaceholder:["開始年份","結束年份"],rangeMonthPlaceholder:["開始月份","結束月份"],rangeQuarterPlaceholder:["開始季度","結束季度"],rangeWeekPlaceholder:["開始周","結束周"]},{locale:"zh_TW",today:"今天",now:"此刻",backToToday:"返回今天",ok:"確定",timeSelect:"選擇時間",dateSelect:"選擇日期",weekSelect:"選擇周",clear:"清除",month:"月",year:"年",previousMonth:"上個月 (翻頁上鍵)",nextMonth:"下個月 (翻頁下鍵)",monthSelect:"選擇月份",yearSelect:"選擇年份",decadeSelect:"選擇年代",yearFormat:"YYYY年",dayFormat:"D日",dateFormat:"YYYY年M月D日",dateTimeFormat:"YYYY年M月D日 HH時mm分ss秒",previousYear:"上一年 (Control鍵加左方向鍵)",nextYear:"下一年 (Control鍵加右方向鍵)",previousDecade:"上一年代",nextDecade:"下一年代",previousCentury:"上一世紀",nextCentury:"下一世紀"}),timePickerLocale:e({},l)};a.lang.ok="確 定";var r="${label}不是一個有效的${type}",t={locale:"zh-tw",Pagination:{items_per_page:"條/頁",jump_to:"跳至",jump_to_confirm:"確定",page:"頁",prev_page:"上一頁",next_page:"下一頁",prev_5:"向前 5 頁",next_5:"向後 5 頁",prev_3:"向前 3 頁",next_3:"向後 3 頁"},DatePicker:a,TimePicker:l,Calendar:a,global:{placeholder:"請選擇"},Table:{filterTitle:"篩選器",filterConfirm:"確定",filterReset:"重置",filterEmptyText:"無篩選項",selectAll:"全部選取",selectInvert:"反向選取",selectNone:"清空所有",selectionAll:"全選所有",sortTitle:"排序",expand:"展開行",collapse:"關閉行",triggerDesc:"點擊降序",triggerAsc:"點擊升序",cancelSort:"取消排序"},Modal:{okText:"確定",cancelText:"取消",justOkText:"知道了"},Popconfirm:{okText:"確定",cancelText:"取消"},Transfer:{searchPlaceholder:"搜尋資料",itemUnit:"項目",itemsUnit:"項目",remove:"删除",selectCurrent:"全選當頁",removeCurrent:"删除當頁",selectAll:"全選所有",removeAll:"删除全部",selectInvert:"反選當頁"},Upload:{uploading:"正在上傳...",removeFile:"刪除檔案",uploadError:"上傳失敗",previewFile:"檔案預覽",downloadFile:"下载文件"},Empty:{description:"無此資料"},Icon:{icon:"圖標"},Text:{edit:"編輯",copy:"複製",copied:"複製成功",expand:"展開"},PageHeader:{back:"返回"},Form:{optional:"（可選）",defaultValidateMessages:{default:"字段驗證錯誤${label}",required:"請輸入${label}",enum:"${label}必須是其中一個[${enum}]",whitespace:"${label}不能為空字符",date:{format:"${label}日期格式無效",parse:"${label}不能轉換為日期",invalid:"${label}是一個無效日期"},types:{string:r,method:r,array:r,object:r,number:r,date:r,boolean:r,integer:r,float:r,regexp:r,email:r,url:r,hex:r},string:{len:"${label}須為${len}個字符",min:"${label}最少${min}個字符",max:"${label}最多${max}個字符",range:"${label}須在${min}-${max}字符之間"},number:{len:"${label}必須等於${len}",min:"${label}最小值為${min}",max:"${label}最大值為${max}",range:"${label}須在${min}-${max}之間"},array:{len:"須為${len}個${label}",min:"最少${min}個${label}",max:"最多${max}個${label}",range:"${label}數量須在${min}-${max}之間"},pattern:{mismatch:"${label}與模式不匹配${pattern}"}}},Image:{preview:"預覽"}};export{t as default};

package/es/components/label-design/hooks/useProp.mjs

@@ -429,7 +429,7 @@ function useProp(context) {
 						},
 						changeEvent({ val, label, type, exp }) {
 							if (label) att.value["text"].label = label;
-							if (val) onAttrsChanges("text", val);
+							if (val !== void 0) onAttrsChanges("text", val);
 							if (type) {
 								onAttrsText("sourceType", type);
 								att.value["text"].label = label;

package/es/components/label-design/panels/widget/controls/VariableSelect.vue.mjs

@@ -1,9 +1,9 @@
 import { __exportAll } from "../../../../../_virtual/_rolldown/runtime.mjs";
 import _plugin_vue_export_helper_default from "../../../../../_virtual/_plugin-vue_export-helper.mjs";
 import VariableSelect_vue_vue_type_script_setup_true_name_variable_select_lang_default from "./VariableSelect.vue_vue_type_script_setup_true_name_variable-select_lang.mjs";
-import './VariableSelect.vue_vue_type_style_index_0_scoped_14634dd0_lang.css';/* empty css                                                                     */
+import './VariableSelect.vue_vue_type_style_index_0_scoped_8729413a_lang.css';/* empty css                                                                     */
 //#region src/components/label-design/panels/widget/controls/VariableSelect.vue
 var VariableSelect_exports = /* @__PURE__ */ __exportAll({ default: () => VariableSelect_default });
-var VariableSelect_default = /* @__PURE__ */ _plugin_vue_export_helper_default(VariableSelect_vue_vue_type_script_setup_true_name_variable_select_lang_default, [["__scopeId", "data-v-14634dd0"]]);
+var VariableSelect_default = /* @__PURE__ */ _plugin_vue_export_helper_default(VariableSelect_vue_vue_type_script_setup_true_name_variable_select_lang_default, [["__scopeId", "data-v-8729413a"]]);
 //#endregion
 export { VariableSelect_exports };

package/es/components/label-design/panels/widget/controls/VariableSelect.vue_vue_type_script_setup_true_name_variable-select_lang.mjs

@@ -89,7 +89,11 @@ var VariableSelect_vue_vue_type_script_setup_true_name_variable_select_lang_defa
 		};
 		const handleUpdateValue = async (value) => {
 			await nextTick();
-			currentValue.value = value || "";
+			const val = value || "";
+			emit("changeEvent", val ? { val } : {
+				val: "",
+				label: ""
+			});
 		};
 		const loadOptions = async (modelKey, level = 1) => {
 			const maxLevel = props.maxLevel ?? 3;

package/es/components/label-design/panels/widget/controls/VariableSelect.vue_vue_type_style_index_0_scoped_8729413a_lang.css

@@ -0,0 +1,15 @@
+.gct-field-cascader-selector[data-v-8729413a] {
+  width: 132px;
+}
+[data-v-8729413a] .ant-input-affix-wrapper {
+  border-radius: 0 4px 4px 0;
+}
+[data-v-8729413a] .sub-content_inner .ant-input-group {
+  display: flex;
+}
+[data-v-8729413a] .sub-content_inner .gct-field-cascader-selector .ant-select-selector {
+  width: 133px !important;
+}
+[data-v-8729413a] .sub-content_inner .gct-field-cascader-selector .ant-select-selector .ant-select-selection-placeholder {
+  line-height: 26px;
+}

package/es/components/model-cascader/util.mjs

@@ -34,7 +34,8 @@ var getRecursiveModelTreeData = async (modelKey, depth, cache) => {
 	}
 	for (const refModel of refModelList) {
 		const { id, key: relatedFieldKey, name, bindInfo, relationModelName } = refModel;
-		const label = `${name}（${relationModelName}）`;
+		let label = name;
+		if (relationModelName) label = `${name}（${relationModelName}）`;
 		const value = [
 			relatedFieldKey,
 			id,

package/es/hooks/index.d.ts

@@ -3,3 +3,4 @@ export { UseDragByLine } from './useDragLine';
 export * from './useKeyParser';
 export { useTreeList } from './useTreeList';
 export { usePrinter } from './usePrinter';
+export * from './useTag';

package/es/hooks/index.mjs

@@ -3,3 +3,4 @@ import "./useDragLine.mjs";
 import "./useKeyParser.mjs";
 import "./useTreeList.mjs";
 import "./usePrinter.mjs";
+import "./useTag.mjs";

package/es/hooks/useTag.d.ts

@@ -0,0 +1,7 @@
+export declare const typePadding: (option: IObject) => 33 | 36 | 52 | 57;
+/** 计算规定行内tag最多展示个数 */
+export declare function calcMutiLineTags(selectLabel: IObject[], maxRow?: number, selectWidth?: number, maxTagCount?: number): number;
+/** 计算是否是单行模式 */
+export declare function isSingleLine(tableCellHeight: IObject): boolean;
+/** 非单行模式 */
+export declare function isNotSignalLine(tableCellHeight: IObject): boolean;

package/es/hooks/useTag.mjs

@@ -0,0 +1,83 @@
+import { TABLE_CELL_HEIGHT_MODE, measureText } from "@gct-paas/core";
+//#region src/hooks/useTag.ts
+var typePadding = (option) => {
+	if (!option.value) return 33;
+	if (option.type === "user" || option.type === "user_multi") return 57;
+	if (option.type === "icon") return 52;
+	if (option.type === "checkbox") return 36;
+	if (option.value.includes("ROLE:") || option.value.includes("ORG:") || option.value.includes("USER_GROUP:")) return 52;
+	if (option.icon || option._item?.icon) return 52;
+	if (option.value.includes("USER:")) return 57;
+	return 33;
+};
+/** 计算规定行内tag最多展示个数 */
+function calcMutiLineTags(selectLabel, maxRow = 3, selectWidth = 100, maxTagCount = 0) {
+	const PLUS_WIDTH = 68;
+	let currentLineWidth = 0;
+	let currentRow = 1;
+	let showCount = 0;
+	const total = selectLabel.length;
+	const rows = [[]];
+	for (let i = 0; i < total; i++) {
+		if (!selectLabel[i]) continue;
+		const label = selectLabel[i].label || selectLabel[i].value;
+		if (!label) continue;
+		const tagPadding = typePadding(selectLabel[i]) || 29;
+		const w = measureText(maxTagCount && label.length > maxTagCount ? label.slice(0, maxTagCount) : label, { fontFamily: "-apple-system, BlinkMacSystemFont, Segoe UI, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Helvetica Neue, Helvetica, Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol" }) + tagPadding + (label.length > maxTagCount ? 9 : 0);
+		if (currentRow > maxRow) break;
+		if (w >= selectWidth) {
+			if (currentRow >= maxRow && rows[currentRow - 1] && rows[currentRow - 1].length) break;
+			if (rows[currentRow - 1] && rows[currentRow - 1].length) {
+				rows.push([i]);
+				currentRow += 1;
+			} else rows[currentRow - 1] = [i];
+			currentRow += 1;
+			currentLineWidth = 0;
+			showCount += 1;
+			continue;
+		}
+		if (currentLineWidth + w <= selectWidth) {
+			currentLineWidth += w;
+			if (rows[currentRow - 1]) rows[currentRow - 1].push(i);
+			else rows[currentRow - 1] = [i];
+			showCount += 1;
+		} else {
+			if (currentRow >= maxRow) break;
+			currentRow += 1;
+			currentLineWidth = w;
+			rows.push([i]);
+			showCount += 1;
+		}
+	}
+	if (rows.length >= maxRow && total > showCount) {
+		const lastRow = rows[maxRow - 1];
+		let lastLineWidth = 0;
+		for (const idx of lastRow) {
+			if (selectLabel[idx].type === "checkbox") continue;
+			const label = selectLabel[idx].label || selectLabel[idx].value;
+			const tagPadding = typePadding(selectLabel[idx]) || 29;
+			lastLineWidth += measureText(maxTagCount && label.length > maxTagCount ? label.slice(0, maxTagCount) : label) + tagPadding + (label.length > maxTagCount ? 9 : 0);
+		}
+		if (lastLineWidth + PLUS_WIDTH > selectWidth && lastRow.length > 0) {
+			lastRow.pop();
+			showCount -= 1;
+		}
+	}
+	console.log("showCount", showCount);
+	return showCount;
+}
+/** 计算是否是单行模式 */
+function isSingleLine(tableCellHeight) {
+	if (!tableCellHeight) return true;
+	if (!tableCellHeight.cellHeightMode || tableCellHeight.cellHeightMode === TABLE_CELL_HEIGHT_MODE.ONE_ROW || tableCellHeight.cellHeightMode === TABLE_CELL_HEIGHT_MODE.CUSTOM_ROW && tableCellHeight.cellHeight == 1) return true;
+	return false;
+}
+/** 非单行模式 */
+function isNotSignalLine(tableCellHeight) {
+	if (!tableCellHeight) return true;
+	if (isSingleLine(tableCellHeight)) return true;
+	if (tableCellHeight.cellHeightMode === TABLE_CELL_HEIGHT_MODE.ALL_ROW) return true;
+	return false;
+}
+//#endregion
+export { calcMutiLineTags, isNotSignalLine, isSingleLine, typePadding };

package/es/index.mjs

@@ -57,6 +57,7 @@ import { UseDragByLine } from "./hooks/useDragLine.mjs";
 import { useKeyParser } from "./hooks/useKeyParser.mjs";
 import { useTreeList } from "./hooks/useTreeList.mjs";
 import { usePrinter } from "./hooks/usePrinter.mjs";
+import { calcMutiLineTags, isNotSignalLine, isSingleLine, typePadding } from "./hooks/useTag.mjs";
 import "./hooks/index.mjs";
 import { OverlayController, overlay } from "./utils/overlay-controller/overlay-controller.mjs";
 import { withInstall } from "./utils/with-install.mjs";
@@ -183,4 +184,4 @@ function onInit() {
 }
 onInit();
 //#endregion
-export { base_button_default as BaseButton, basic_button_default as BasicButton, basic_grid_default as BasicGrid, BasicModal, BatchSelectList, BoolOptions, ButtonTextEnum, CONTENT_TYPE, category_modal_default as CategoryModal, category_sider_default as CategorySider, Ch_FieldTypeName, Ch_Operator, Ch_Perm_Operator, Ch_SystemVars, Ch_ValueType, CodeEditor, color_editor_default as ColorEditor, ColorPicker_default as ColorPicker, ComponentTypeEnum, ConfirmUtil, ControllerKey, CopperFreeModal_default as CopperFreeModal, CopperModal_default as CopperModal, copy_module_key_default as CopyModuleKey, CropperAvatar_default as CropperAvatar, CropperFree_default as CropperFree, Cropper_default as CropperImage, DATA_TYPE, DataRoleSetTabsEnum, data_rules_container_default as DataRulesContainer, DataRulesModal, DataTypeOptions, DateSystemEnum, DateSystemKeys, DesignSaveTip, DesignStepCheck, DesignViewLayout, double_input_default as DoubleInput, EditFormController, EditorController, EditorRegister, EditorRegisterConst, EditorType, embed_grid_default as EmbedGrid, FIELD_SEPARATOR, FORM_CONTROLLER_INJECT_TAG, FieldCascader_default as FieldCascader, field_role_container_default as FieldRoleContainer, FieldUpload, form_alert_default as FormAlert, FormCollapseController, FormCollapsePaneController, FormCollapsePaneState, FormCollapseState, FormEditItemController, FormEditItemState, FormGroupController, FormGroupState, FormHiddenItemController, FormItemBasicController, FormItemBasicState, FormItemController, FormItemRegister, FormItemState, FormLineController, FormLineState, FormState, FormTabController, FormTabPaneController, FormTabPaneState, FormTabState, full_screen_default as FullScreen, GCT_DND_INSERT_POS, GctDndContainer, GctDndDropLine, GctDndItem, GctFormCollapseModel, GctFormCollapsePaneModel, GctFormController, GctFormGroupModel, GctFormHiddenItemModel, GctFormItemModel, GctFormLineModel, GctFormTabModel, GctFormTabPaneModel, GctFormTitleGroupModel, GctTableController, grid_btns_default as GridBtns, grid_pagination_default as GridPagination, highlight_default as HightLight, i18n_modal_default as I18Modal, i18n_select_btn_default as I18nSelectBtn, i18n_select_input_default as I18nSelectInput, i18n_select_input_form_default as I18nSelectInputForm, i18n_select_textarea_default as I18nSelectTextarea, i18n_select_textarea_form_default as I18nSelectTextareaForm, icon_tooltip_default as IconTooltip, picture_preview_default as ImagePreview, ImageUpload, panelComps as LabelDesignControlComps, designer_default as LabelDesigner, label_params_select_default as LabelParamsSelect, Lang, MODEL_SEPARATOR, MessageUtil, ModalNameEditor, ModalTypeEnum, modal_wrapper_default as ModalWrapper, ModelCascader, MonacoEditor, MonacoEditor$1 as MonacoEditor1, MultiOperatorTypes, number_range_default as NumberRange, OnlineControl, OperatorTypeEnum, OverlayController, PRINT_ELE_TYPE, paas_bpmn_log_default as PaasBpmnLog, Prop, QR_CODE_TEXT, QR_CODE_TYPE, RangTypeEnum, RelationTypeEnum, SceneType, SearchTypeEnum, select_user_modal_default as SelectUserModal, serial_number_container_default as SerialNumberContainer, ShrinkPanel, stage_canvas_default as StageCanvas, stage_view_default as StageView, TableActionItemController, TableEditItemController, TableEditItemState, TableEditorRegister, TableITemState, TableItemController, TableRowController, TableRowState, TableState, Theme, TreeEx, tree_select_ex_default as TreeSelectEx, UseDragByLine, PickType as UserPickType, UserSystemEnum, UserSystemKeys, ValueTypeEnum, ViewContainer, Vue3GridDndItem, WUJIE_FORMULA_EVENTS, calcTreeChildLevel, coreWebCreateAppVue, coreWebSetupApp, createImgPreview, dropNode, filterTreeData, findRecursiveChild, findTreePathById, gctFieldSortPopover, gctFieldTreeSelect, gctFormItemEditorProps, getCmpConfig, getController, getForeignKeyChainFromJointKey, getLeafModelKeyFromJointKey, getRecursiveModelTreeData, getRootModelKeyFromJointKey, getSpecificationsForSize, getValue, print_tmpl_modal_default as labelTmplModal, loadLabelInfo, modalConfirm, monacoLoader, openFormulaEditor, openSelectUserModal, overlay, recursiveIterate, recursiveTransfer, renderColTitle, renderOptionLabel, setIdentify, setValue, sizeOpt, transformCoordinateByDpi, transformsize, useAntTableScrollHeight, useController, useEditFormController, useEditorConsole, useEditorConsoleInner, useForm, useFormItemController, useFormValue, useGctFormValue, useGctFormValueByText, useI18nSelect, useKeyParser, useModalPicker as useLabelModalPicker, useLocale, useModal, useModalContext, useModalDragMove, useModalInner, useModalPicker$1 as useModalPicker, usePage, usePrinter, useProp, useTableController, useTreeList, validateFieldDefaultForLength, validateFieldDefaultForValue, validateLengthRange, widthEditorInstall, withInstall };
+export { base_button_default as BaseButton, basic_button_default as BasicButton, basic_grid_default as BasicGrid, BasicModal, BatchSelectList, BoolOptions, ButtonTextEnum, CONTENT_TYPE, category_modal_default as CategoryModal, category_sider_default as CategorySider, Ch_FieldTypeName, Ch_Operator, Ch_Perm_Operator, Ch_SystemVars, Ch_ValueType, CodeEditor, color_editor_default as ColorEditor, ColorPicker_default as ColorPicker, ComponentTypeEnum, ConfirmUtil, ControllerKey, CopperFreeModal_default as CopperFreeModal, CopperModal_default as CopperModal, copy_module_key_default as CopyModuleKey, CropperAvatar_default as CropperAvatar, CropperFree_default as CropperFree, Cropper_default as CropperImage, DATA_TYPE, DataRoleSetTabsEnum, data_rules_container_default as DataRulesContainer, DataRulesModal, DataTypeOptions, DateSystemEnum, DateSystemKeys, DesignSaveTip, DesignStepCheck, DesignViewLayout, double_input_default as DoubleInput, EditFormController, EditorController, EditorRegister, EditorRegisterConst, EditorType, embed_grid_default as EmbedGrid, FIELD_SEPARATOR, FORM_CONTROLLER_INJECT_TAG, FieldCascader_default as FieldCascader, field_role_container_default as FieldRoleContainer, FieldUpload, form_alert_default as FormAlert, FormCollapseController, FormCollapsePaneController, FormCollapsePaneState, FormCollapseState, FormEditItemController, FormEditItemState, FormGroupController, FormGroupState, FormHiddenItemController, FormItemBasicController, FormItemBasicState, FormItemController, FormItemRegister, FormItemState, FormLineController, FormLineState, FormState, FormTabController, FormTabPaneController, FormTabPaneState, FormTabState, full_screen_default as FullScreen, GCT_DND_INSERT_POS, GctDndContainer, GctDndDropLine, GctDndItem, GctFormCollapseModel, GctFormCollapsePaneModel, GctFormController, GctFormGroupModel, GctFormHiddenItemModel, GctFormItemModel, GctFormLineModel, GctFormTabModel, GctFormTabPaneModel, GctFormTitleGroupModel, GctTableController, grid_btns_default as GridBtns, grid_pagination_default as GridPagination, highlight_default as HightLight, i18n_modal_default as I18Modal, i18n_select_btn_default as I18nSelectBtn, i18n_select_input_default as I18nSelectInput, i18n_select_input_form_default as I18nSelectInputForm, i18n_select_textarea_default as I18nSelectTextarea, i18n_select_textarea_form_default as I18nSelectTextareaForm, icon_tooltip_default as IconTooltip, picture_preview_default as ImagePreview, ImageUpload, panelComps as LabelDesignControlComps, designer_default as LabelDesigner, label_params_select_default as LabelParamsSelect, Lang, MODEL_SEPARATOR, MessageUtil, ModalNameEditor, ModalTypeEnum, modal_wrapper_default as ModalWrapper, ModelCascader, MonacoEditor, MonacoEditor$1 as MonacoEditor1, MultiOperatorTypes, number_range_default as NumberRange, OnlineControl, OperatorTypeEnum, OverlayController, PRINT_ELE_TYPE, paas_bpmn_log_default as PaasBpmnLog, Prop, QR_CODE_TEXT, QR_CODE_TYPE, RangTypeEnum, RelationTypeEnum, SceneType, SearchTypeEnum, select_user_modal_default as SelectUserModal, serial_number_container_default as SerialNumberContainer, ShrinkPanel, stage_canvas_default as StageCanvas, stage_view_default as StageView, TableActionItemController, TableEditItemController, TableEditItemState, TableEditorRegister, TableITemState, TableItemController, TableRowController, TableRowState, TableState, Theme, TreeEx, tree_select_ex_default as TreeSelectEx, UseDragByLine, PickType as UserPickType, UserSystemEnum, UserSystemKeys, ValueTypeEnum, ViewContainer, Vue3GridDndItem, WUJIE_FORMULA_EVENTS, calcMutiLineTags, calcTreeChildLevel, coreWebCreateAppVue, coreWebSetupApp, createImgPreview, dropNode, filterTreeData, findRecursiveChild, findTreePathById, gctFieldSortPopover, gctFieldTreeSelect, gctFormItemEditorProps, getCmpConfig, getController, getForeignKeyChainFromJointKey, getLeafModelKeyFromJointKey, getRecursiveModelTreeData, getRootModelKeyFromJointKey, getSpecificationsForSize, getValue, isNotSignalLine, isSingleLine, print_tmpl_modal_default as labelTmplModal, loadLabelInfo, modalConfirm, monacoLoader, openFormulaEditor, openSelectUserModal, overlay, recursiveIterate, recursiveTransfer, renderColTitle, renderOptionLabel, setIdentify, setValue, sizeOpt, transformCoordinateByDpi, transformsize, typePadding, useAntTableScrollHeight, useController, useEditFormController, useEditorConsole, useEditorConsoleInner, useForm, useFormItemController, useFormValue, useGctFormValue, useGctFormValueByText, useI18nSelect, useKeyParser, useModalPicker as useLabelModalPicker, useLocale, useModal, useModalContext, useModalDragMove, useModalInner, useModalPicker$1 as useModalPicker, usePage, usePrinter, useProp, useTableController, useTreeList, validateFieldDefaultForLength, validateFieldDefaultForValue, validateLengthRange, widthEditorInstall, withInstall };

package/es/modules/gct-form/editor/gct-form-model-select/gct-form-model-select.mjs

@@ -104,7 +104,8 @@ var GctFormModelSelect = /* @__PURE__ */ defineComponent({
 				val.value = void 0;
 			} else {
 				const { name, version } = formInfo;
-				modelName.value = `${name}:${version}`;
+				if (version) modelName.value = `${name}:${version}`;
+				else modelName.value = name;
 			}
 			onFieldChange();
 		}

package/es/modules/gct-form/editor/gct-form-model-select/select-online-form-model/online-form-model-modal.vue.mjs

@@ -1,7 +1,7 @@
 import _plugin_vue_export_helper_default from "../../../../../_virtual/_plugin-vue_export-helper.mjs";
 import online_form_model_modal_vue_vue_type_script_setup_true_name_online_form_model_modal_lang_default from "./online-form-model-modal.vue_vue_type_script_setup_true_name_online-form-model-modal_lang.mjs";
-import './online-form-model-modal.vue_vue_type_style_index_0_scoped_7aa34739_lang.css';/* empty css                                                                              */
+import './online-form-model-modal.vue_vue_type_style_index_0_scoped_41c1457b_lang.css';/* empty css                                                                              */
 //#region src/modules/gct-form/editor/gct-form-model-select/select-online-form-model/online-form-model-modal.vue
-var online_form_model_modal_default = /* @__PURE__ */ _plugin_vue_export_helper_default(online_form_model_modal_vue_vue_type_script_setup_true_name_online_form_model_modal_lang_default, [["__scopeId", "data-v-7aa34739"]]);
+var online_form_model_modal_default = /* @__PURE__ */ _plugin_vue_export_helper_default(online_form_model_modal_vue_vue_type_script_setup_true_name_online_form_model_modal_lang_default, [["__scopeId", "data-v-41c1457b"]]);
 //#endregion
 export { online_form_model_modal_default as default };

package/es/modules/gct-form/editor/gct-form-model-select/select-online-form-model/online-form-model-modal.vue_vue_type_script_setup_true_name_online-form-model-modal_lang.mjs

@@ -1,4 +1,4 @@
-import { Fragment, createCommentVNode, createElementBlock, createElementVNode, createTextVNode, createVNode, defineComponent, normalizeClass, normalizeStyle, onMounted, openBlock, ref, renderList, resolveComponent, toDisplayString, unref, watch, withCtx, withKeys } from "vue";
+import { Fragment, createCommentVNode, createElementBlock, createElementVNode, createTextVNode, createVNode, defineComponent, normalizeClass, normalizeStyle, onMounted, openBlock, ref, renderList, resolveComponent, toDisplayString, toRaw, unref, watch, withCtx, withKeys } from "vue";
 import { orderBy } from "lodash-es";
 import { t, useModal } from "@gct-paas/core";
 //#region src/modules/gct-form/editor/gct-form-model-select/select-online-form-model/online-form-model-modal.vue?vue&type=script&setup=true&name=online-form-model-modal&lang.ts
@@ -55,7 +55,7 @@ var online_form_model_modal_vue_vue_type_script_setup_true_name_online_form_mode
 		const tableData = ref([]);
 		const modelTableData = ref([]);
 		const modelKey = ref();
-		const formId = ref();
+		const formSelectedRow = ref();
 		watch(modelKey, (k) => {
 			props.modal.setOptions?.({ okButtonProps: { disabled: !k } });
 		});
@@ -82,17 +82,24 @@ var online_form_model_modal_vue_vue_type_script_setup_true_name_online_form_mode
 			tableData.value = await _api.apaas.onlineFormTmpl.getListBaseAndProcessForm(formState.value) || [];
 		}
 		const onSave = async () => {
+			const row = formSelectedRow.value;
+			const formSelected = row ? {
+				...toRaw(row),
+				refId: row.baseId ? `${row.baseId}:${row.id}` : row.id
+			} : void 0;
+			const info = modelTableData.value.find((item) => item.key === modelKey.value);
 			return {
 				ok: true,
 				params: {
 					modelKey: modelKey.value,
-					formId: formId.value
+					formSelected,
+					subModel: Boolean(info?.subModel)
 				}
 			};
 		};
 		async function cellClickEvent({ row }) {
-			if (formId.value === row.id) return;
-			formId.value = row.id;
+			if (!row || formSelectedRow.value?.id === row.id) return;
+			formSelectedRow.value = row;
 			modelTableData.value = orderBy(await _api.apaas.onlineFormTmpl.getFormModelsId({ id: row.id }), "subModel", "asc");
 			modelKey.value = "";
 		}

package/es/modules/gct-form/editor/gct-form-model-select/select-online-form-model/{online-form-model-modal.vue_vue_type_style_index_0_scoped_7aa34739_lang.css → online-form-model-modal.vue_vue_type_style_index_0_scoped_41c1457b_lang.css}

@@ -1,7 +1,7 @@
-.gct-online-form-model-modal[data-v-7aa34739] {
+.gct-online-form-model-modal[data-v-41c1457b] {
   border-right: 1px solid #f0f0f0;
 }
-.gct-online-form-model-modal[data-v-7aa34739] .vxe-table {
+.gct-online-form-model-modal[data-v-41c1457b] .vxe-table {
   --vxe-table-row-hover-radio-checked-background-color: hsl(from var(--ant-primary-color) h s 94%);
   --vxe-table-row-radio-checked-background-color: hsl(from var(--ant-primary-color) h s 94%);
   --vxe-table-row-checkbox-checked-background-color: hsl(from var(--ant-primary-color) h s 94%);
@@ -10,33 +10,33 @@
   --vxe-table-row-hover-current-background-color: hsl(from var(--ant-primary-color) h s 94%);
   --vxe-table-header-background-color: #f6f8faff;
 }
-.gct-online-form-model-modal[data-v-7aa34739] .gct-text-overflow {
+.gct-online-form-model-modal[data-v-41c1457b] .gct-text-overflow {
   color: #212528;
 }
-.gct-online-form-model-modal[data-v-7aa34739] .vxe-cell--label {
+.gct-online-form-model-modal[data-v-41c1457b] .vxe-cell--label {
   color: #212528;
 }
-.gct-online-form-model-modal[data-v-7aa34739] 
+.gct-online-form-model-modal[data-v-41c1457b] 
     .vxe-table--render-default .is--checked.vxe-cell--radio .vxe-radio--icon
    {
   color: var(--ant-primary-color);
 }
-.gct-online-form-model-modal[data-v-7aa34739] .vxe-tree--node-btn.rotate90 {
+.gct-online-form-model-modal[data-v-41c1457b] .vxe-tree--node-btn.rotate90 {
   color: var(--ant-primary-color);
 }
-.gct-online-form-model-modal[data-v-7aa34739] .ant-form .ant-form-item {
+.gct-online-form-model-modal[data-v-41c1457b] .ant-form .ant-form-item {
   margin-bottom: 15px;
 }
-.gct-online-form-model-modal[data-v-7aa34739] .ant-form .ant-form-item-label {
+.gct-online-form-model-modal[data-v-41c1457b] .ant-form .ant-form-item-label {
   padding: 0;
 }
-.gct-online-form-model-modal[data-v-7aa34739] .ant-form .ant-form-item .ant-form-item-label > label::after {
+.gct-online-form-model-modal[data-v-41c1457b] .ant-form .ant-form-item .ant-form-item-label > label::after {
   display: block;
 }
-.gct-online-form-model-modal[data-v-7aa34739] .vxe-table--render-default .vxe-cell--radio.is--disabled .vxe-radio--icon {
+.gct-online-form-model-modal[data-v-41c1457b] .vxe-table--render-default .vxe-cell--radio.is--disabled .vxe-radio--icon {
   position: relative;
 }
-.gct-online-form-model-modal[data-v-7aa34739] .vxe-table--render-default .vxe-cell--radio.is--disabled .vxe-radio--icon::after {
+.gct-online-form-model-modal[data-v-41c1457b] .vxe-table--render-default .vxe-cell--radio.is--disabled .vxe-radio--icon::after {
   content: '';
   background-color: rgba(0, 0, 0, 0.06);
   border-color: #d9d9d9;
@@ -49,18 +49,18 @@
   top: 2px;
   left: 2px;
 }
-.model-list[data-v-7aa34739] {
+.model-list[data-v-41c1457b] {
   overflow: hidden;
   display: flex;
   flex-direction: column;
 }
-.model-list .model-title[data-v-7aa34739] {
+.model-list .model-title[data-v-41c1457b] {
   color: #212528;
   border-bottom: 1px solid #f0f0f0;
   padding: 16px 16px 20px;
   font-weight: 500;
 }
-.model-list .model-title[data-v-7aa34739]::before {
+.model-list .model-title[data-v-41c1457b]::before {
   content: ' ';
   display: inline-block;
   width: 2px;
@@ -69,25 +69,25 @@
   margin-right: 8px;
   vertical-align: -1px;
 }
-.model-list .model-table-wrap[data-v-7aa34739] {
+.model-list .model-table-wrap[data-v-41c1457b] {
   overflow: auto;
   padding: 0 12px;
   flex: 1;
 }
-.model-list .model-table-row[data-v-7aa34739] {
+.model-list .model-table-row[data-v-41c1457b] {
   padding: 9px 12px;
   border-radius: 4px;
   cursor: pointer;
   align-items: center;
 }
-.model-list .model-table-row.selected[data-v-7aa34739] {
+.model-list .model-table-row.selected[data-v-41c1457b] {
   color: var(--ant-primary-color);
   background: hsl(from var(--ant-primary-color) h s 94%);
 }
-.model-list .model-table-row[data-v-7aa34739]:hover {
+.model-list .model-table-row[data-v-41c1457b]:hover {
   background: rgba(0, 0, 0, 0.04);
 }
-.model-list .model-table-row .model-tag[data-v-7aa34739] {
+.model-list .model-table-row .model-tag[data-v-41c1457b] {
   display: flex;
   justify-content: center;
   align-items: center;

package/es/modules/gct-form/editor/gct-form-model-select/select-online-form-model/online-form-model-select.vue.d.ts

@@ -1,16 +1,21 @@
 type __VLS_Props = {
-    border?: boolean;
-    disabled?: boolean;
     joinFormRefId?: string;
     joinModelKey?: string;
+    joinSubModel?: boolean;
+    border?: boolean;
+    disabled?: boolean;
 };
 declare const _default: import('vue').DefineComponent<__VLS_Props, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     change: (data: IObject) => any;
+    "on-clear": () => any;
     "update:joinFormRefId": (value: string) => any;
     "update:joinModelKey": (value: string) => any;
+    "update:joinSubModel": (value: boolean) => any;
 }, string, import('vue').PublicProps, Readonly<__VLS_Props> & Readonly<{
     onChange?: ((data: IObject) => any) | undefined;
+    "onOn-clear"?: (() => any) | undefined;
     "onUpdate:joinFormRefId"?: ((value: string) => any) | undefined;
     "onUpdate:joinModelKey"?: ((value: string) => any) | undefined;
+    "onUpdate:joinSubModel"?: ((value: boolean) => any) | undefined;
 }>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {}, any>;
 export default _default;

package/es/modules/gct-form/editor/gct-form-model-select/select-online-form-model/online-form-model-select.vue_vue_type_script_setup_true_name_online-form-model-select_lang.mjs

@@ -5,15 +5,18 @@ import { FormDesignEnum, t } from "@gct-paas/core";
 var online_form_model_select_vue_vue_type_script_setup_true_name_online_form_model_select_lang_default = /* @__PURE__ */ defineComponent({
 	__name: "online-form-model-select",
 	props: {
-		border: { type: Boolean },
-		disabled: { type: Boolean },
 		joinFormRefId: {},
-		joinModelKey: {}
+		joinModelKey: {},
+		joinSubModel: { type: Boolean },
+		border: { type: Boolean },
+		disabled: { type: Boolean }
 	},
 	emits: [
 		"change",
 		"update:joinFormRefId",
-		"update:joinModelKey"
+		"update:joinModelKey",
+		"update:joinSubModel",
+		"on-clear"
 	],
 	setup(__props, { emit: __emit }) {
 		const moduleType = FormDesignEnum.ONLINE_FORM;
@@ -57,6 +60,7 @@ var online_form_model_select_vue_vue_type_script_setup_true_name_online_form_mod
 			return toRaw(optionsData.value.find((i) => i.refId === v));
 		}
 		const openModal = async () => {
+			if (props.disabled) return;
 			const res = await _gct.openUtil.modal(online_form_model_modal_default, {
 				formSelected: getOptionValue(),
 				modelSelected: props.joinModelKey,
@@ -68,8 +72,14 @@ var online_form_model_select_vue_vue_type_script_setup_true_name_online_form_mod
 				okButtonProps: { disabled: true }
 			});
 			if (res.ok && res.params) {
-				emit("update:joinModelKey", res.params.modelKey);
-				localVal.value = res.params.formId;
+				const { formSelected, modelKey, subModel } = res.params ?? {};
+				if (!formSelected) return;
+				if (!_options.value.some((e) => e.refId === formSelected.refId)) _options.value.push({ ...formSelected });
+				localVal.value = formSelected.refId;
+				emit("update:joinModelKey", modelKey);
+				emit("update:joinSubModel", subModel);
+				if (formSelected.refId !== props.joinFormRefId || modelKey !== props.joinModelKey) emit("on-clear");
+				emit("change", formSelected);
 			}
 		};
 		return (_ctx, _cache) => {

package/es/modules/gct-table/editor/gct-table-date/gct-table-date.mjs

@@ -1,6 +1,6 @@
 import { useGctFormValue } from "../../../gct-form/hooks/use-gct-form-value/use-gct-form-value.mjs";
 import "../../../gct-form/index.mjs";
-import '../gct-table-text/gct-table-text.css';/* empty css                     */
+import './gct-table-date.css';/* empty css                     */
 import { createVNode, defineComponent, mergeProps, resolveComponent } from "vue";
 import { useNamespace } from "@gct-paas/core";
 //#region src/modules/gct-table/editor/gct-table-date/gct-table-date.tsx

package/es/modules/gct-table/editor/gct-table-text/gct-table-text.mjs

@@ -1,6 +1,6 @@
 import { useGctFormValueByText } from "../../../gct-form/hooks/use-gct-form-value/use-gct-form-value.mjs";
 import "../../../gct-form/index.mjs";
-import './gct-table-text.css';/* empty css                     */
+import '../gct-table-date/gct-table-date.css';/* empty css                     */
 import { createVNode, defineComponent, mergeProps, resolveComponent } from "vue";
 import { useNamespace } from "@gct-paas/core";
 //#region src/modules/gct-table/editor/gct-table-text/gct-table-text.tsx

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gct-paas/core-web",
-  "version": "0.1.6-dev.38",
+  "version": "0.1.6-dev.39",
   "type": "module",
   "description": "paas 平台网页端核心包",
   "loader": "dist/loader.esm.min.js",
@@ -65,20 +65,20 @@
     "vxe-table": "npm:@gct-paas/vxe-table@4.6.19",
     "wujie": "^1.0.29",
     "wujie-vue3": "^1.0.29",
-    "@gct-paas/core": "0.1.6-dev.38",
-    "@gct-paas/scss": "0.1.6-dev.38",
-    "@gct-paas/core-components": "0.1.6-dev.38",
-    "@gct-paas/v-ben": "0.1.6-dev.38"
+    "@gct-paas/core": "0.1.6-dev.39",
+    "@gct-paas/core-components": "0.1.6-dev.39",
+    "@gct-paas/scss": "0.1.6-dev.39",
+    "@gct-paas/v-ben": "0.1.6-dev.39"
   },
   "peerDependencies": {
     "@gct-paas/api": "^6.0.0-dev.2",
     "@types/sortablejs": "^1.15.1",
     "vant": ">=4",
     "vue": ">=3",
-    "@gct-paas/core": "0.1.6-dev.38",
-    "@gct-paas/v-ben": "0.1.6-dev.38",
-    "@gct-paas/core-components": "0.1.6-dev.38",
-    "@gct-paas/scss": "0.1.6-dev.38"
+    "@gct-paas/core": "0.1.6-dev.39",
+    "@gct-paas/core-components": "0.1.6-dev.39",
+    "@gct-paas/scss": "0.1.6-dev.39",
+    "@gct-paas/v-ben": "0.1.6-dev.39"
   },
   "devDependencies": {
     "@types/bwip-js": "^3.2.3",