cloud-web-corejs 1.1.0-dev.6 → 1.1.0-dev.61

package/src/components/xform/form-designer/toolbar-panel/indexMixin.js

@@ -36,6 +36,7 @@ modules = {
   },
   inject: [
     "getDesignerConfig",
+    "getLayoutTypeLocked",
     "saveReportTemplate",
     "getReportTemplate",
     "getFormTemplateTableDTOs",
@@ -105,6 +106,15 @@ modules = {
     layoutType() {
       return this.designer.getLayoutType();
     },
+
+    /* 布局模式由入口（表单模板类型）锁定时，PC/移动端按钮只回显不可切换 */
+    layoutTypeLocked() {
+      return !!this.getLayoutTypeLocked();
+    },
+
+    layoutTypeLockedTip() {
+      return this.$t1("模板类型由表单模板维护，设计器内不可切换");
+    },
   },
   watch: {
     "designer.widgetList": {
@@ -281,6 +291,9 @@ modules = {
     },
 
     changeLayoutType(newType) {
+      if (this.layoutTypeLocked) {
+        return;
+      }
       this.designer.changeLayoutType(newType);
       this.$emit("loadWidgets");
     },

package/src/components/xform/form-designer/widget-panel/index.vue

@@ -6,7 +6,7 @@
         <el-tab-pane v-if="showComponentLib" name="componentLib">
           <span slot="label"><i class="el-icon-set-up"></i> {{ i18nt('designer.componentLib') }}</span>
 
-          <el-collapse v-model="activeNames" class="widget-collapse">
+          <el-collapse v-model="activeNames" class="widget-collapse" :key="currentLayoutType">
             <el-collapse-item name="1" :title="i18nt('designer.containerTitle')">
               <draggable tag="ul" :list="containers" :group="{name: 'dragGroup', pull: 'clone', put: false}"
                          :clone="handleContainerWidgetClone" ghost-class="ghost" :sort="false"
@@ -34,6 +34,7 @@
               </draggable>
             </el-collapse-item>
 
+            <template v-if="advancedFields.length">
             <el-collapse-item name="3" :title="i18nt('designer.advancedFieldTitle')">
               <draggable tag="ul" :list="advancedFields" :group="{name: 'dragGroup', pull: 'clone', put: false}"
                          :move="checkFieldMove"
@@ -47,8 +48,9 @@
                 </li>
               </draggable>
             </el-collapse-item>
+            </template>
 
-            <!-- -->
+            <template v-if="customFields.length">
             <el-collapse-item name="4" :title="i18nt('designer.customFieldTitle')">
               <draggable tag="ul" :list="customFields" :group="{name: 'dragGroup', pull: 'clone', put: false}"
                          :move="checkFieldMove"
@@ -62,7 +64,7 @@
                 </li>
               </draggable>
             </el-collapse-item>
-            <!-- -->
+            </template>
 
 
           </el-collapse>
@@ -71,7 +73,7 @@
         <el-tab-pane v-if="showMetadataLib" name="metadataLib">
           <span slot="label"><i class="el-icon-set-up"></i> {{ i18nt('designer.metadataLib') }}</span>
 
-          <el-collapse v-model="metadataActiveNames" class="widget-collapse">
+          <el-collapse v-model="metadataActiveNames" class="widget-collapse" :key="currentLayoutType">
             <el-collapse-item name="0" :title="i18nt('designer.containerTitle')">
               <draggable tag="ul" :list="commonContainers" :group="{name: 'dragGroup', pull: 'clone', put: false}"
                          :clone="handleContainerWidgetClone" ghost-class="ghost" :sort="false"
@@ -97,6 +99,7 @@
                 </li>
               </draggable>
             </el-collapse-item>
+            <template v-if="commonAdvancedFields.length">
             <el-collapse-item name="3" :title="i18nt('designer.advancedFieldTitle')">
               <draggable tag="ul" :list="commonAdvancedFields" :group="{name: 'dragGroup', pull: 'clone', put: false}"
                          :move="checkFieldMove"
@@ -110,6 +113,7 @@
                 </li>
               </draggable>
             </el-collapse-item>
+            </template>
 
 
 
@@ -160,7 +164,7 @@
                 </li>
               </draggable>
             </el-collapse-item>
-            <el-collapse-item name="compare" :title="i18nt('对比组件')">
+            <el-collapse-item v-if="currentLayoutType !== 'H5'" name="compare" :title="i18nt('对比组件')">
               <draggable tag="ul" :list="compareFields" :group="{name: 'dragGroup', pull: 'clone', put: false}"
                          :move="checkFieldMove"
                          :clone="handleFieldWidgetClone" ghost-class="ghost" :sort="false">
@@ -311,8 +315,8 @@ export default {
         background: #f1f2f3;
         font-size: 12px;
         padding-left: 12px;
-        > span{
-          display: flex;align-items: center;white-space: normal;line-height: 1.2;height: 35px;
+        > span{
+          display: flex;align-items: center;white-space: normal;line-height: 1.2;height: 35px;
         }
         svg {
           display: inline-block;

package/src/components/xform/form-designer/widget-panel/indexMixin.js

@@ -6,7 +6,8 @@ import {
   advancedFields,
   customFields,
   businessFields,
-  widgetPanelOrder
+  widgetPanelOrder,
+  h5PanelAllowTypes
 } from "./widgetsConfig"
 import {
   formTemplates
@@ -207,7 +208,7 @@ modules = {
           displayName: this.i18n2t(`designer.widgetLabel.${fld.type}`, `extension.widgetLabel.${fld.type}`)
         };
       }).filter(fld => {
-        return !this.isBanned(fld.type) && this.getIsShow(fld);
+        return !fld.internal && !this.isBanned(fld.type) && this.getIsShow(fld);
       });
 
       /* 面板分组归一：表单数据字段（搜索框/自动完成/级联/凭证/状态等）展示在基础字段分组 */
@@ -268,6 +269,14 @@ modules = {
         return !this.isBanned(fld.type) && this.getIsShow(fld);
       });
 
+      /* 空分组不渲染（见 index.vue 的 v-if），展开项按当前版式重算：
+         不能只做减法，否则从 H5 切回 PC 时分组回来了却是收起状态 */
+      this.activeNames = ["1", "2"]
+        .concat(this.advancedFields.length ? ["3"] : [])
+        .concat(this.customFields.length ? ["4"] : []);
+      this.metadataActiveNames = ["0", "1", "2", "4"]
+        .concat(this.commonAdvancedFields.length ? ["3"] : []);
+
     },
 
     /* 按 widgetPanelOrder 排序面板展示列表；未列出的类型（含扩展组件）排在末尾，保持原有相对顺序 */
@@ -354,6 +363,10 @@ modules = {
       let flag = !ftd.layoutType || ftd.layoutType === layoutType;
       let flag2 = this.checkColumnFlag(ftd)
       let flag3 = !!ftd.commonFlag
+      /* H5 面板按白名单收口，PC 不受影响 */
+      if (layoutType === "H5") {
+        flag = flag && h5PanelAllowTypes.indexOf(ftd.type) > -1;
+      }
       return flag && flag2 && flag3;
     }
   }

package/src/components/xform/form-designer/widget-panel/widgetsConfig.js

@@ -51,6 +51,7 @@ export const containers = [
     category: "container",
     icon: "table",
     commonFlag: !0,
+    layoutType: "PC",
     columnFlag: true,
     rows: [],
     options: {
@@ -97,6 +98,15 @@ export const containers = [
       height: "",
       // isFullscreen: false,
       tabClass: "tab-boxCard tabCard-sty1",
+      // 懒渲染：页签内容首次激活才挂载(element lazy)。默认关闭——开启前需确认表单
+      // 无跨页签 getWidgetRef 脚本、未访问页签字段无需参与提交校验(详情类模板适用)。
+      lazyRender: !1,
+      // 页签事件脚本：点击/切换页签时的联动入口(懒渲染后"切到页签再刷新数据"的挂钩)
+      onTabClick: "",
+      onTabChange: "",
+      // 容器生命周期脚本(与 detail 等容器同口径,由 containerItemMixin 的 handleOnCreated/Mounted 执行)
+      onCreated: "",
+      onMounted: "",
       customClass: "",
       ...defaultWfConfig,
     },
@@ -122,7 +132,7 @@ export const containers = [
 }, {
   type: "grid-sub-form",
   category: "container",
-  icon: "grid-sub-form",
+  icon: "sub-form",
   widgetList: [],
   options: {
     name: "",
@@ -140,7 +150,7 @@ export const containers = [
   {
     type: "grid-col",
     category: "container",
-    icon: "grid-col",
+    icon: "grid",
     internal: !0,
     widgetList: [],
     options: {
@@ -162,7 +172,7 @@ export const containers = [
   {
     type: "table-cell",
     category: "container",
-    icon: "table-cell",
+    icon: "table",
     internal: !0,
     widgetList: [],
     merged: !1,
@@ -178,7 +188,7 @@ export const containers = [
   {
     type: "tab-pane",
     category: "container",
-    icon: "tab-pane",
+    icon: "tab",
     internal: !0,
     widgetList: [],
     options: {
@@ -319,6 +329,53 @@ export const containers = [
       tableConfig: null,
       isEditTable: false,
       isTreeTable: false,
+      mergeRowEnabled: false,
+      mergeRowKey: null,
+      showGridFooter: false,
+      editDefaultRow: null,
+      rowEditableScript: null,
+      rowAddableScript: null,
+      rowDeletableScript: null,
+      rowSaveScriptCode: null,
+      beforeRowSave: null,
+      afterRowSave: null,
+      onRowSaveError: null,
+      clipboardEnabled: false,
+      clipboardRowIncrementEnabled: false,
+      clipboardAttachmentEnabled: false,
+      clipboardExcludeFields: [],
+      clipboardInvalidValueStrategy: "ignore",
+      clipboardAutoSaveEnabled: false,
+      autoSaveEnabled: false,
+      autoSaveTrigger: ["blur", "change", "paste"],
+      autoSaveDelay: 200,
+      treeConfig: {
+        rowField: "id",
+        parentField: "f_parent",
+        children: "f_children",
+        mapChildren: "_X_ROW_CHILD",
+        hasChild: "f_has_child",
+        lazy: false,
+        expandAll: true,
+        reserve: true,
+      },
+      treeIdentityConfig: {
+        physicalIdField: "id",
+        rootParentValue: 0,
+        serverGeneratesRowField: true,
+        persistedRowFieldChangeStrategy: "reject",
+      },
+      treeCopyConfig: {
+        rowFieldStrategy: "regenerate",
+        orphanParentStrategy: "detach",
+        lazyStrategy: "reject",
+      },
+      treeSubmitConfig: {
+        orphanParentStrategy: "preserve",
+        unloadedChildrenStrategy: "reject",
+        successReconcileStrategy: "reload",
+      },
+      treePasteInsertMode: "root",
       wbsEnabled: false,
       sortScriptCode: null,
       importTemplateFile: null,
@@ -329,6 +386,7 @@ export const containers = [
       showRules: [],
       hideGridCheckBox: false,
       isNotQueryAllPage: false,
+      isNotReadQueryAllPage: false,
       isNotShowQueryButton: false,
 
       exportItemColumns: [],
@@ -341,6 +399,7 @@ export const containers = [
     category: "container",
     icon: "text-field",
     commonFlag: !0,
+    layoutType: "PC",
     formItemFlag: !0,
     widgetList: [],
     options: {
@@ -459,6 +518,8 @@ export const containers = [
       label: "模板模块",
       detailTempContainer: true,
       styleTempClass: 'd-temp-1',
+      // 默认栅格行列数：1=一行一列 2=一行两列 3=一行三列
+      rowColCount: 3,
       customClass: "",
       wfEnabled: false,
       onCreated: "",
@@ -538,7 +599,7 @@ export const containers = [
      * 直接拖进 tab-pane(见 docs/详情模块标签承载方案.md) */
     type: "detail-pane",
     category: "container",
-    icon: "grid-col",
+    icon: "grid",
     buttonWidgetList: [],
     widgetList: [],
     options: {
@@ -716,6 +777,7 @@ export const containers = [
     category: "container",
     icon: "tree-pane",
     commonFlag: !0,
+    layoutType: "PC",
     leftWidgetList: [],
     widgetList: [],
     options: {
@@ -747,7 +809,7 @@ export const containers = [
   {
     type: "h5-card-pane",
     category: "container",
-    icon: "tab-pane",
+    icon: "tab",
     internal: !0,
     buttonWidgetList: [],
     widgetList: [],
@@ -771,13 +833,13 @@ export const containers = [
       name: "",
       hidden: !1,
       customClass: "",
-      fullWidth: false,
+      fullWidth: true,
     },
   },
   {
     type: "h5-table-cell",
     category: "container",
-    icon: "table-cell",
+    icon: "table",
     internal: !0,
     widgetList: [],
     merged: !1,
@@ -795,6 +857,7 @@ export const containers = [
     icon: "tree",
     category: "container",
     commonFlag: !0,
+    layoutType: "PC",
     widgetList: [],
     options: {
       name: "tree",
@@ -1148,6 +1211,7 @@ export const basicFields = [
       showWordLimit: !1,
       prefixIcon: "",
       suffixIcon: "",
+      suffixIconClickable: !1,
       /*appendButton: !1,
       appendButtonDisabled: !1,
       buttonIcon: "el-icon-search",*/
@@ -1174,6 +1238,7 @@ export const basicFields = [
     type: "input-batch",
     icon: "input-batch",
     commonFlag: !0,
+    layoutType: "PC",
     formItemFlag: !0,
     columnFlag: true,
     tableField: null,
@@ -2071,6 +2136,7 @@ export const basicFields = [
     type: "html-text",
     icon: "html-text",
     commonFlag: !0,
+    layoutType: "PC",
     formItemFlag: !1,
     columnFlag: false,
     options: {
@@ -2397,6 +2463,7 @@ export const advancedFields = [
     type: "echart-pie",
     icon: "echart-pie",
     commonFlag: !0,
+    layoutType: "PC",
     formItemFlag: false,
     options: {
       name: "",
@@ -2501,6 +2568,7 @@ export const advancedFields = [
     type: "echart-bar",
     icon: "echart",
     commonFlag: !0,
+    layoutType: "PC",
     formItemFlag: false,
     options: {
       name: "",
@@ -2691,6 +2759,7 @@ export const advancedFields = [
     type: "echart-category",
     icon: "echart-category",
     commonFlag: !0,
+    layoutType: "PC",
     formItemFlag: false,
     options: {
       name: "",
@@ -3264,6 +3333,7 @@ export const advancedFields = [
     icon: "el-icon-upload",
     formItemFlag: !1,
     commonFlag: !0,
+    layoutType: "PC",
     columnFlag: true,
     tableField: null,
     options: {
@@ -3277,6 +3347,9 @@ export const advancedFields = [
       tableRef: "",
       tableExportParam: "",
       showImageAtTable: false,
+      exportPageSize: null,
+      maxQueryTotal: null,
+      limitFileSize: null,
       tableExportFlag: 1,
 
       onCreated: "",
@@ -3293,6 +3366,7 @@ export const advancedFields = [
     icon: "el-icon-upload",
     formItemFlag: !1,
     commonFlag: !0,
+    layoutType: "PC",
     columnFlag: true,
     options: {
       name: "",
@@ -3324,6 +3398,7 @@ export const advancedFields = [
     icon: "el-icon-upload",
     formItemFlag: !1,
     commonFlag: !0,
+    layoutType: "PC",
     columnFlag: true,
     options: {
       name: "",
@@ -3339,6 +3414,9 @@ export const advancedFields = [
       tableRef: "",
       tableExportParam: "",
       showImageAtTable: false,
+      exportPageSize: null,
+      maxQueryTotal: null,
+      limitFileSize: null,
       selectExportItemFlag: 1,
       exportItemConditionEnabled: !1,
       // 按钮级明细导出配置：三项各自独立，留空的那项沿用数据表格属性上维护的
@@ -3396,6 +3474,7 @@ export const advancedFields = [
     type: "import-button",
     icon: "el-icon-download",
     commonFlag: !0,
+    layoutType: "PC",
     columnFlag: true,
     formItemFlag: !1,
     options: {
@@ -3426,12 +3505,19 @@ export const advancedFields = [
       ...defaultWidgetShowRuleConfig,
       importMultiple: false,
       importMultiSize: 1,
+      // 批量导入时给每行补一层实体信封以承载附件列；默认关＝仍发裸行数组
+      importMultiAttachEnvelope: false,
       importFileLimitSize: 200,
       importEntity: "",
       importAttachCode: "",
       importAttachName: "",
       importScriptCode: "",
       onBeforeImport: "",
+      // 逐行补默认值脚本：返回对象，Object.assign 到该行后再发包
+      importDefaultValue: "",
+      onValidateRow: "",
+      // 必填校验方式："" 默认（逐行标记失败）/ "strict" 解析期整批硬拦 / "off" 不校验
+      requiredCheckMode: "",
       enabledImportPreHandle: false,
       tableRef: "",
       onSuccessImport: "",
@@ -3448,6 +3534,7 @@ export const advancedFields = [
     type: "import2-button",
     icon: "el-icon-download",
     commonFlag: !0,
+    layoutType: "PC",
     columnFlag: true,
     formItemFlag: !1,
     options: {
@@ -3481,6 +3568,24 @@ export const advancedFields = [
       importAttachCode: "",
       importAttachName: "",
       tableRef: "",
+      // 进度框形态：逐行校验 + 成功/失败计数 + 结果表。
+      // 默认关闭 —— 关闭时是"全屏 loading + 整批入表"的老链路，存量表单无感知。
+      showProgressDialog: false,
+      // 进度框形态下每行怎么处理："table" 塞入关联表格；"script" 交给 onImportRow 逐行脚本
+      importMode: "table",
+      // 前台校验通过后，整批一次送给后台校验并补字段；默认关＝不发请求
+      backendValidateEnabled: false,
+      importScriptCode: "",
+      onImportParams: "",
+      // 内嵌图片三段式：把 Excel 里贴的图取回来填进 attachments_ 列。
+      // 依赖进度框，仅在 showProgressDialog 打开时生效
+      enabledImportPreHandle: false,
+      onImportRow: "",
+      onValidateRow: "",
+      // 入表前按该字段去重，空则不去重
+      dedupField: "",
+      // 必填校验方式："" 默认（有逐行通道就逐行标记，否则整批拦）/ "strict" 整批硬拦 / "off" 不校验
+      requiredCheckMode: "",
       onConfirmImportEnabled: false,
       onConfirmImport: "",
       onSuccessImport: "",
@@ -3496,6 +3601,7 @@ export const advancedFields = [
     type: "print-button",
     icon: "el-icon-printer",
     commonFlag: !0,
+    layoutType: "PC",
     columnFlag: true,
     formItemFlag: !1,
     options: {
@@ -3537,6 +3643,7 @@ export const advancedFields = [
     type: "print-detail-button",
     icon: "el-icon-printer",
     commonFlag: !0,
+    layoutType: "PC",
     columnFlag: false,
     formItemFlag: !1,
     options: {
@@ -3654,6 +3761,7 @@ export const advancedFields = [
     type: "census",
     icon: "census",
     commonFlag: !0,
+    layoutType: "PC",
     formItemFlag: false,
     options: {
       name: "",
@@ -3720,6 +3828,7 @@ export const advancedFields = [
     category: "container",
     icon: "tree-table",
     commonFlag: !0,
+    layoutType: "PC",
     formItemFlag: !0,
     rows: [],
     options: {
@@ -3764,7 +3873,7 @@ export const advancedFields = [
   },
   {
     type: "dropdown-item",
-    icon: "tab-pane",
+    icon: "tab",
     internal: !0,
     options: {
       name: "",
@@ -3796,6 +3905,7 @@ export const advancedFields = [
     type: "gantt",
     icon: "chart",
     commonFlag: !0,
+    layoutType: "PC",
     formItemFlag: !1,
     options: {
       name: "",
@@ -3818,6 +3928,7 @@ export const advancedFields = [
     type: "download-button",
     icon: "el-icon-download",
     commonFlag: !0,
+    layoutType: "PC",
     columnFlag: true,
     formItemFlag: !1,
     options: {
@@ -3856,6 +3967,7 @@ export const advancedFields = [
     type: "vue-page",
     icon: "vue-sfc",
     commonFlag: !0,
+    layoutType: "PC",
     formItemFlag: !1,
     columnFlag: false,
     options: {
@@ -4104,6 +4216,8 @@ export const businessFields = [
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !0,
+    /* H5 业务组件只保留创建人/更新人/创建时间/更新时间 */
+    layoutType: "PC",
     tableField: null,
     options: {
       ...vabsearchConfig,
@@ -4127,6 +4241,7 @@ export const businessFields = [
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !0,
+    layoutType: "PC",
     tableField: null,
     options: {
       ...vabsearchConfig,
@@ -4151,6 +4266,7 @@ export const businessFields = [
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !0,
+    layoutType: "PC",
     tableField: null,
     options: {
       ...projectTagConfig,
@@ -4172,6 +4288,7 @@ export const businessFields = [
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !0,
+    layoutType: "PC",
     tableField: null,
     options: {
       ...projectTagConfig,
@@ -4234,6 +4351,7 @@ export const businessFields = [
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !1,
+    layoutType: "PC",
     options: {
       name: "",
       label: "复制",
@@ -4264,6 +4382,7 @@ export const businessFields = [
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !1,
+    layoutType: "PC",
     options: {
       name: "",
       // label: "暂存",
@@ -4286,6 +4405,7 @@ export const businessFields = [
     type: "oplog",
     icon: "list",
     commonFlag: !0,
+    layoutType: "PC",
     formItemFlag: !1,
     options: {
       name: "",
@@ -4308,6 +4428,7 @@ export const businessFields = [
     icon: "file-upload-field",
     commonFlag: !0,
     formItemFlag: !0,
+    layoutType: "PC",
     tableField: null,
     options: {
       name: "",
@@ -4653,6 +4774,28 @@ export const widgetPanelOrder = {
   ],
 };
 
+/**
+ * H5 版式左侧组件面板白名单（仅影响面板展示，不影响已有模板渲染与按 type 查找）。
+ * 容器：H5详情 / H5列表 / H5卡片 / h5表格
+ * 基础字段：文本、状态、凭证、下拉选项
+ *   （status / vabUpload 定义在 advancedFields，面板会归入基础字段）
+ * 业务组件：创建人、更新人、创建时间、更新时间
+ */
+export const h5PanelAllowTypes = [
+  "detail-h5",
+  "list-h5",
+  "h5-card",
+  "h5-table",
+  "text",
+  "status",
+  "vabUpload",
+  "select",
+  "create_by-text",
+  "modify_by-text",
+  "create_date-text",
+  "modify_date-text",
+];
+
 /**
  * H5 版式：所有表单字段统一具备 h5Span（整宽/半宽）。
  *