cloud-web-corejs 1.0.54-dev.804 → 1.0.54-dev.805

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.804",
+  "version": "1.0.54-dev.805",
   "scripts": {
     "dev": "vue-cli-service serve",
     "dev:micro": "vue-cli-service serve --port 17527",

package/src/components/bizTab/BizBillActions.vue

@@ -3,7 +3,7 @@
     <!-- 按钮顺序（.fr 里 DOM 次序即从左到右）：
          翻单 → 提交流程 → 业务按钮(默认插槽) → 重置 → 保存
          #before 是留给"要排在翻单之前"的特例，一般不用。
-         另外 wfUtil 的「流程操作」下拉 / 「修改单据」是 append 到本容器最前面的，会落在最左侧。 -->
+         另外 wfUtil 的「更多」下拉 / 「修改单据」是 append 到本容器最前面的，会落在最左侧。 -->
     <slot name="before"></slot>
     <!-- ① 上一单 / 下一单：列表侧 openDetail 传了 navRows 才出现 -->
     <template v-if="showBillNav">
@@ -83,7 +83,7 @@
  *   </div>
  *
  * 注意：根节点是 .d-header 里的 .fr，别再往外包一层，否则布局会散，
- * 而且 wfUtil 的「流程操作」下拉 / 「修改单据」就是往 .el-form .d-header > .fr 里塞的。
+ * 而且 wfUtil 的「更多」下拉 / 「修改单据」就是往 .el-form .d-header > .fr 里塞的。
  */
 export default {
   name: "BizBillActions",

package/src/components/wf/content.vue

@@ -6,13 +6,15 @@
     v-if="!isHideWf"
   >
     <template #default>
-      <!-- 审批按钮条留在流程模块内，不随 wfActionInHeaderEnabled 搬走或隐藏。
-           开了该开关时，详情标题栏另挂一份（wfActionDropdown.vue）：通过/驳回/撤回平铺，
-           其余收进「流程操作」下拉。 -->
+      <!-- 审批按钮条：标题栏那份挂上后（headerActionsMounted）整条 v-show 藏掉。
+           用 v-show 而不是 v-if，是为了保住 addOpinionBtn——下拉里「补充意见」走的是
+           $refs.addOpinionBtn.openDialog()。开了 wfActionInHeaderEnabled 时，详情标题栏
+           另挂一份（wfActionDropdown.vue）：通过/驳回/撤回平铺，其余收进「更多」下拉。 -->
       <div
         ref="wfActionBar"
         style="margin: -36px 0 8px 124px; position: relative; z-index: 2; height: 28px"
         v-if="!wfConfig.hiddenAllButton"
+        v-show="!headerActionsMounted"
       >
         <el-button
           type="success"

package/src/components/wf/wf.js

@@ -386,6 +386,8 @@ wfContentMixin = {
       candidateDatas:[],
       wfSendTaskId: null,
       showAddOpinionButton: false,
+      //标题栏那份审批入口挂上后为 true，流程模块按钮条据此 v-show 隐藏
+      headerActionsMounted: false,
 
       addOpinionEnabled: false,
       modifyCurrentCandidateEnabled: false,

package/src/components/wf/wfActionDropdown.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="wf-action-dropdown-wrap button-sty" v-show="items.length">
-    <!-- 通过 / 驳回 / 撤回 挪出下拉，在标题栏直接平铺；其余操作仍收在「流程操作」下拉里 -->
+    <!-- 通过 / 驳回 / 撤回 挪出下拉，在标题栏直接平铺；其余操作仍收在「更多」下拉里 -->
     <el-button
       v-for="item in standaloneItems"
       :key="item.key"
@@ -12,7 +12,7 @@
     </el-button>
     <el-dropdown trigger="hover" v-if="dropdownItems.length">
       <el-button type="primary" class="button-sty">
-        {{ $t1("流程操作") }}
+        {{ $t1("更多") }}
         <i class="el-icon-arrow-down el-icon--right"></i>
       </el-button>
       <el-dropdown-menu slot="dropdown">

package/src/components/wf/wfUtil.js

@@ -200,11 +200,12 @@ f = async function (option) {
       }
 
       /* 审批操作：开了 wfActionInHeaderEnabled 时，在详情模块标题栏再挂一份 —— 通过/驳回/撤回
-         平铺成独立按钮，其余收进「流程操作」下拉（wfActionDropdown.vue）。流程模块里的
-         原按钮条不动、不隐藏；点击走流程面板实例上的同一套方法。
+         平铺成独立按钮，其余收进「更多」下拉（wfActionDropdown.vue）。挂上后把流程面板
+         headerActionsMounted 置 true，模块内原按钮条 v-show 藏掉（addOpinionBtn 还在，
+         下拉里「补充意见」才能点开）。点击走流程面板实例上的同一套方法。
          放在「修改单据」「流程启动」之后挂——appendPrevChildDom 是前插，最后插的排最左，
-         最终顺序：通过/驳回/撤回/流程操作 → 修改单据 → 内建/业务按钮。
-         hiddenAllButton / 素身详情(取不到 .fr) 自动跳过。
+         最终顺序：通过/驳回/撤回/更多 → 修改单据 → 内建/业务按钮。
+         hiddenAllButton / 素身详情(取不到 .fr) 自动跳过，那种情况模块按钮条继续留着。
          _hideWf 也必须跳过：那种页面 content.vue 根节点 v-if 掉了，弹框根本没渲染出来，
          挂上去就是一排点了没反应的按钮（wfInfo 照样有值，光看 items 判断不出来）。 */
       if (shouldMountHeaderActions({
@@ -221,6 +222,7 @@ f = async function (option) {
         });
         instances.push(dropdownVm);
         appendPrevChildDom(wfBtnRegion, dropdownVm.$mount().$el);
+        contentInstance.headerActionsMounted = true;
       }
 
       registerDispose();

package/src/components/xform/form-designer/form-widget/dialog/formDialog.vue

@@ -168,7 +168,9 @@ export default {
         width: "1200px",
         fullscreen: this.option.fullscreen,
       };
-      config = Object.assign({}, config, this.option.dialogConfig, { customClass });
+      config = Object.assign({}, config, this.option.dialogConfig, {
+        customClass,
+      });
       config.title = this.$t1(config.title);
       return config;
     },
@@ -190,7 +192,9 @@ export default {
       if (this.option.showFooter == false) {
         classStr = classStr + " nfootBtn";
       }
-      config = Object.assign({}, config, this.option.bodyConfig, { class: classStr });
+      config = Object.assign({}, config, this.option.bodyConfig, {
+        class: classStr,
+      });
       return config;
     },
   },
@@ -198,7 +202,6 @@ export default {
     /*let dataId = this.option?.formConfig?.dataId??null
     delete this.option?.formConfig?.dataId
     this.dataId = dataId;*/
-
     this.formConfig = this.option?.formConfig || {};
 
     let currentFormConfig = this.getFormConfig();
@@ -305,9 +308,9 @@ export default {
         this.close();
       }
     },
-    setConfirmButtonHidden(val){
+    setConfirmButtonHidden(val) {
       this.confirmButtonVisible = val || false;
-    }
+    },
   },
 };
 </script>

package/src/components/xform/form-designer/form-widget/field-widget/baseAttachment-widget.vue

@@ -86,6 +86,13 @@ export default {
       if (this.isSameFieldModelValue(modelValue)) return;
       this.handleChangeEvent(modelValue);
     },
+    /* fieldMixin.setDisabled 只改 field.options.disabled 和 this.disabled，而本组件的
+       可编辑态是 initOption 里快照进 option.edit 的，不同步就永远停在 created 时的值。
+       这里只改 option 的字段、不换 option 引用：换引用会让 base-attachment 取值用的
+       $watch 重新求值，白跑一次 initRows(cloneDeep + nextTick 五个 init)，表格里按行数放大。 */
+    'field.options.disabled'(val) {
+      this.option.edit = !val;
+    },
     'option':function(){
 
     }
@@ -156,6 +163,13 @@ export default {
   },
   methods: {
     initOption(){
+      /* setDisabled 是裸赋值 this.field.options.disabled = xxx；存量表单 JSON 的 options
+         里缺这个键时会变成非响应式新增属性，上面的 watch 收不到通知(fieldMixin 补默认
+         options 的 initConfig 已注释掉，indexMixin/data-table-mixin 里都要 hasOwnProperty
+         兜底，说明确有缺键的 schema)。先补键，让后续赋值走响应式通道。 */
+      if (!this.field.options.hasOwnProperty('disabled')) {
+        this.$set(this.field.options, 'disabled', false);
+      }
       this.option = {
         title: '附件',
         edit: !this.field.options.disabled,

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

@@ -280,10 +280,6 @@ export default {
     overflow: hidden;
     white-space: nowrap;
   }
-
-  ::v-deep .el-form-item--mini.el-form-item {
-    margin-bottom: 6px;
-  }
 }
 
 /* 隐藏Chrome浏览器中el-input数字输入框右侧的上下调整小箭头 */

package/src/components/xform/form-designer/setting-panel/property-editor/dropdownFlag-editor.vue

@@ -22,6 +22,10 @@
       </el-select>
     </el-form-item>
     <el-form-item label="下拉按钮选项"></el-form-item>
+      <draggable
+        tag="ul"
+        class="draggable-box"
+      >
         <li
           v-for="(colItem, colIdx) in selectedWidget.widgetList"
           :key="colIdx"

package/src/router/modules/customer.js

@@ -1,5 +1,5 @@
 export const constantRoutes = [
-  {
+  /*{
     // 呼叫中心(CC)专用入口：只带 appid/appkey/account/callNo，
     // 先换取 tp 再 replace 到 /form_outLinkView
     path: "/cc_form_outLinkView",
@@ -22,7 +22,7 @@ export const constantRoutes = [
           icon: "dashboard",
         },
       },
-      {
+       {
         // bizTab 示例 A：手写接口版（前端 mock，无流程，不吃后台前置条件）
         path: "/demo/bizTab/simple",
         component: () => import("@base/views/demo/bizTab/simple/list"),
@@ -70,7 +70,7 @@ export const constantRoutes = [
           title: "formDialog 示例",
           icon: "dashboard",
         },
-      },
+      }, 
     ],
-  },
+  },*/
 ];

package/src/views/bd/setting/bd_company_env/dialog.vue

@@ -51,7 +51,7 @@
         class="allDel icon-quanbushanchu" @click="clearChecked()"></a></el-tooltip>
       <div class="list">
         <div class="item" v-for="(checkRow, index) in checkRows" :key="index">
-          <p>{{ getCheckLabel(checkRow, 'name') }}</p>
+          <p>{{ getCheckLabel(checkRow, 'bdCompanyCode') }}</p>
           <a class="el-icon-close" @click="clearTable1Select(index)"></a>
         </div>
       </div>

package/src/views/bd/setting/table_model/edit.vue

@@ -212,16 +212,14 @@
                           class="search-input"
                           max="200"
                           v-model="szTaMb.sszstEn"
-                          @clear="
-                            szTaMb.sszst = null;
-                            szTaMb.sszstBm = null;
-                            $forceUpdate();
-                          "
+                          @clear="clearSszst"
                           :disabled="szTaMb.taType === 0"
                           v-el-readonly
                           clearable
                         >
+                          <!-- element 的 suffix 插槽不受 disabled 影响，图标要自己按禁用条件收起来 -->
                           <i
+                            v-if="szTaMb.taType !== 0"
                             slot="suffix"
                             class="el-input__icon el-icon-search"
                             @click="showSzTaMbDialog = true"
@@ -293,15 +291,13 @@
                           class="search-input"
                           max="200"
                           v-model="szTaMb.menuKindName"
-                          @clear="
-                            szTaMb.menuKindCode = '';
-                            $forceUpdate();
-                          "
+                          @clear="clearMenuKind"
                           v-el-readonly
                           clearable
                           :disabled="otherFlag"
                         >
                           <i
+                            v-if="!otherFlag"
                             slot="suffix"
                             class="el-input__icon el-icon-search"
                             @click="showMenuKindDialog = true"
@@ -396,7 +392,7 @@
               class="button-sty"
               icon="el-icon-upload2"
               @click="excelExport"
-              >导出</el-button
+              >{{ $t1("导出") }}</el-button
             >
           </template>
           <template #default>
@@ -469,11 +465,12 @@
                       >
                         <span slot="suffix" class="el-input__suffix-inner">
                           <i
-                            v-if="row.referenceZd"
+                            v-if="row.referenceZd && !!row.zdEn"
                             class="el-input__icon el-icon-circle-close"
                             @click.stop="confirmClearReferenceZd(row)"
                           ></i>
                           <i
+                            v-if="!!row.zdEn"
                             class="el-input__icon el-icon-search"
                             @click="openReferenceZdDialog(row, rowIndex, $table)"
                           ></i>
@@ -510,7 +507,7 @@
                       >
                         <el-input
                           v-model="row.zdEn"
-                          @keydown.native="inputZdEn(row)"
+                          @focus="cacheZdEn(row)"
                           @input="
                             (val) => {
                               changeZdEn(val, row);
@@ -674,11 +671,11 @@
                         class="search-input"
                         v-model="row.toTaBmZd"
                         clearable
-                        @clear="$forceUpdate()"
                         v-el-readonly
                         :disabled="!!row.systems || !!row.relationZd"
                       >
                         <i
+                          v-if="!row.systems && !row.relationZd"
                           slot="suffix"
                           class="el-input__icon el-icon-search"
                           @click="openToTaBmZdDialog(row, rowIndex, $table)"
@@ -748,12 +745,6 @@
       @confirm="confirmInsertSzTaMb"
       :multi="false"
     />
-    <szTaMbDialog
-      v-if="showItemSzTaMbDialog"
-      :visiable.sync="showItemSzTaMbDialog"
-      @confirm="confirmInsertItemSzTaMb"
-      multi="false"
-    />
     <MenuKindDialog
       v-if="showMenuKindDialog"
       :visiable.sync="showMenuKindDialog"
@@ -788,12 +779,7 @@
                       class="search-input"
                       max="200"
                       v-model="referenceEntity"
-                      @clear="
-                        referenceKey = null;
-                        refServiceName = null;
-                        referenceShowFields = [];
-                        $forceUpdate();
-                      "
+                      @clear="clearReferenceEntity"
                       v-el-readonly
                       clearable
                     >
@@ -889,6 +875,7 @@
       :visiable.sync="showEntityFieldDialog1"
       @confirm="confirmEntityFieldDialog1"
       :taBm="referenceEntity"
+      :rows="referenceKeyRows"
       :multi="false"
     />
     <zdDialog
@@ -896,6 +883,7 @@
       :visiable.sync="showEntityFieldDialog2"
       @confirm="confirmEntityFieldDialog2"
       :taBm="referenceEntity"
+      :rows="referenceShowRows"
       :multi="true"
     />
     <preformDialog
@@ -982,10 +970,7 @@
                       class="search-input"
                       max="200"
                       v-model="toTaBmZdEntity"
-                      @clear="
-                        toTaBmZdEntity = null;
-                        toTaBmZdField = null;
-                      "
+                      @clear="toTaBmZdField = null"
                       v-el-readonly
                       clearable
                     >
@@ -1056,6 +1041,7 @@
       :visiable.sync="showEntityFieldDialog3"
       @confirm="confirmEntityFieldDialog3"
       :taBm="toTaBmZdEntity"
+      :rows="toTaBmZdFieldRows"
       :multi="false"
     />
     <!--end-->

package/src/views/bd/setting/table_model/mixins/edit.js

@@ -72,16 +72,17 @@ modules = {
       treeDefaultZds: [],
       productOption: {},
       showSzTaMbDialog: false,
-      showItemSzTaMbDialog: false,
       showMenuKindDialog: false,
       productCategoryCodes: [],
-      zdEnIndex: "",
 
       referenceEntity: null,
       referenceKey: null,
       referenceShowFields: null,
       refServiceName: null,
-      currentIndex: 0,
+      // 存行引用而不是行索引：两个弹框都是 modal=false（没有遮罩），
+      // 开着的时候还能点后面的「新增」，而 addTaMbItems 是 splice(0,0) 插到最前面，
+      // 存索引会当场整体错位，配置写到隔壁行上
+      currentRow: null,
       showReferenceZdDialog: false,
 
       showEntityDialog: false,
@@ -101,40 +102,18 @@ modules = {
       showTmDialog: false,
 
       showToTaBmZdDialog: false,
+      // 和 currentRow 分开存：两个弹框可以同时打开，共用一个会互相覆盖
+      toTaBmZdRow: null,
       toTaBmZdEntity: null,
       toTaBmZdField: null,
       showEntityDialog3: false,
       showEntityFieldDialog3: false,
 
-      inputValue: null,     // 当前值
-      preValue: null,        // 上一次的值（变更前的值）
+      preValue: null,        // 字段名输入框获得焦点时的原值（changeZdEn 用来迁移子行）
 
       sid: null,
       showOtherAuthDialog:false,
 
-      zdTypeMap: {
-        Boolean: "布尔",
-        Integer: "整数",
-        Long: "长整数",
-        Decimal: "精度小数",
-        Money: "金额",
-        Text: "文本",
-        TextArea: "长文本",
-        DateTime: "日期时间",
-        Reference: "关联表(文本)",
-        ReferenceLong: "关联表(长整型)",
-      },
-
-      treeFlagMap:{
-        name: "名称",
-        wbs: "WBS码",
-        parent: "上级ID",
-        treePath: "树ID路径",
-        treePathName: "树名称路径",
-        hasChild: "是否有下级",
-        grade: "层级",
-      },
-
       readonly: false,
       isCompare: false,
     };
@@ -143,6 +122,40 @@ modules = {
     ...mapGetters([
       "userFlag",
     ]),
+    // 这两张映射表只用于 fieldCompare 显示"旧值"，文案必须和模板里
+    // el-option 的 label 走同一套 $t1，否则英文环境下下拉是英文、对比值是中文
+    zdTypeMap() {
+      return {
+        Boolean: this.$t1("布尔"),
+        Integer: this.$t1("整数"),
+        Long: this.$t1("长整数"),
+        Decimal: this.$t1("精度小数"),
+        Money: this.$t1("金额"),
+        Text: this.$t1("文本"),
+        TextArea: this.$t1("长文本"),
+        DateTime: this.$t1("日期时间"),
+        Reference: this.$t1("关联表(文本)"),
+        ReferenceLong: this.$t1("关联表(长整型)"),
+      };
+    },
+    // 单选弹框存的是字段名字符串，zdDialog 的 rows 要的是行对象（按 fieldKey=taZdMc 匹配）
+    referenceKeyRows() {
+      return this.referenceKey ? [{taZdMc: this.referenceKey}] : [];
+    },
+    toTaBmZdFieldRows() {
+      return this.toTaBmZdField ? [{taZdMc: this.toTaBmZdField}] : [];
+    },
+    treeFlagMap() {
+      return {
+        name: this.$t1("名称"),
+        wbs: this.$t1("WBS码"),
+        parent: this.$t1("上级ID"),
+        treePath: this.$t1("树ID路径"),
+        treePathName: this.$t1("树名称路径"),
+        hasChild: this.$t1("是否有下级"),
+        grade: this.$t1("层级"),
+      };
+    },
   },
   created() {
     if(this.hData){
@@ -174,6 +187,12 @@ modules = {
     getData(callback) {
       if(this.extractedObj){
         this.dataId = this.extractedObj.id;
+        // callback 分支（getNewData → createModifyTable）不能在这里被吞掉，
+        // 否则从该入口进来点「创建/更新数据表」会静默无反应
+        if (callback) {
+          callback({objx: this.$baseLodash.cloneDeep(this.extractedObj)});
+          return;
+        }
         this.initData(this.extractedObj)
         //获取操作日志数据
         this.$refs["oplogTable"].initData({
@@ -222,10 +241,10 @@ modules = {
         });
       } else if (this.hData){
         this.dataId = this.hData.id
-        /* this.isEdit = true;
-        this.szTaMb = this.$baseLodash.cloneDeep(this.hData);
-        this.getMenuKindAuth(this.szTaMb.menuKindCode);
-        this.getCreatedTableColumns(); */
+        if (callback) {
+          callback({objx: this.$baseLodash.cloneDeep(this.hData)});
+          return;
+        }
         this.initData(this.$baseLodash.cloneDeep(this.hData));
         if (this.compareHData && this.$attrs.isCompare) {
           this.oldSzTaMb = this.$baseLodash.cloneDeep(this.compareHData);
@@ -240,34 +259,6 @@ modules = {
         this.getMenuKindAuth(this.szTaMb.menuKindCode);
       }
     },
-    updateStatus(status) {
-      let text;
-      if (status === 3) {
-        text = this.$t1("您确定要作废吗？");
-      }
-      this.$baseConfirm(text).then(() => {
-        this.$http({
-          aes: true,
-          url: USER_PREFIX + `/szTaMb/updateStatus`,
-          method: `post`,
-          data: {
-            id: this.dataId,
-            status: status,
-          },
-          isLoading: true,
-          success: (res) => {
-            this.$message({
-              message: res.content,
-              type: "success",
-              duration: 500,
-              onClose: (t) => {
-                this.$baseReload();
-              },
-            });
-          },
-        });
-      });
-    },
     saveData() {
       this.$refs.editForm.$baseValidate((valid) => {
         if (valid) {
@@ -277,11 +268,68 @@ modules = {
             this.$baseAlert(this.$t1("明细不能为空！"));
             return false;
           }
+          if (!this.validateItems(szTaZdMbDTOs)) {
+            return false;
+          }
           this.szTaMb.szTaZdMbDTOs = szTaZdMbDTOs;
           this.openPreformDialog();
         }
       });
     },
+    /**
+     * 明细必填校验。
+     *
+     * 表格开了虚拟滚动（initVxeTable 默认 scrollY.gt = 20），超过 20 行以后屏幕外的行
+     * 根本不会渲染，单元格里那些 el-form-item 也就没挂上去 —— el-form 的 validate
+     * 只能覆盖当前视口。字段数超过 20 的数据表模板是常态，所以必填必须自己按 fullData 走一遍。
+     */
+    validateItems(szTaZdMbDTOs) {
+      let requiredFields = [
+        {field: "zdEn", label: this.$t1("实体字段名称")},
+        {field: "zdCh", label: this.$t1("字段描述")},
+      ];
+      // Object.create(null) 而不是 {}：字段名可能叫 constructor / toString 之类，
+      // 普通对象会命中原型链上的同名属性，误判成重复
+      let seenZdEn = Object.create(null);
+      for (let i = 0; i < szTaZdMbDTOs.length; i++) {
+        let row = szTaZdMbDTOs[i];
+        for (let j = 0; j < requiredFields.length; j++) {
+          let {field, label} = requiredFields[j];
+          let value = row[field];
+          if (value === null || value === undefined || String(value).trim() === "") {
+            this.$baseAlert(
+              this.$t1("第{index}行的[{label}]不能为空！", {
+                index: i + 1,
+                label,
+              })
+            );
+            this.scrollToItemRow(row);
+            return false;
+          }
+        }
+        // 实体字段名重复的话建表时才会炸，这里提前拦住
+        let zdEn = String(row.zdEn).trim();
+        if (seenZdEn[zdEn] !== undefined) {
+          this.$baseAlert(
+            this.$t1("第{index}行的实体字段名称[{zdEn}]与第{index2}行重复！", {
+              index: i + 1,
+              zdEn,
+              index2: seenZdEn[zdEn] + 1,
+            })
+          );
+          this.scrollToItemRow(row);
+          return false;
+        }
+        seenZdEn[zdEn] = i;
+      }
+      return true;
+    },
+    scrollToItemRow(row) {
+      let $table = this.$refs["table-szTaZdMb"];
+      if ($table && $table.scrollToRow) {
+        $table.scrollToRow(row);
+      }
+    },
     saveDataHandle(preformData) {
       let formData = {
         ...this.szTaMb,
@@ -357,10 +405,10 @@ modules = {
                 let taZdMc = row.taZdMc;
                 let createdTableColumnArray = this.createdTableColumnArray;
                 let oldResult = createdTableColumnArray.includes(row?.hData?.taZdMc)
-                  ? "是"
+                  ? this.$t1("是")
                   : "_";
                 let result = taZdMc && createdTableColumnArray.includes(taZdMc)
-                  ? "是"
+                  ? this.$t1("是")
                   : "_";
                   return [
                     <el-form-item>
@@ -551,11 +599,6 @@ modules = {
             },
           },
         ],
-        config:{
-          // rowConfig:{
-          //   height: 60,
-          // }
-        }
       };
       this.$vxeTableUtil.initVxeTable(tableOption).then((opts) => {
         this.productOption = opts;
@@ -611,9 +654,14 @@ modules = {
     },
     deleteItem(row, rowIndex) {
       if (row.referenceZd) {
+        // clearReferenceZd 是 filter 出新数组赋值回去，传进来的 rowIndex 会失效，
+        // 所以下面必须重新按行引用定位
         this.clearReferenceZd(row);
       }
-      this.szTaMb.szTaZdMbDTOs.splice(rowIndex, 1);
+      let index = this.szTaMb.szTaZdMbDTOs.indexOf(row);
+      if (index >= 0) {
+        this.szTaMb.szTaZdMbDTOs.splice(index, 1);
+      }
     },
     confirmInsertSzTaMb(rows) {
       if (rows.length > 0) {
@@ -623,21 +671,27 @@ modules = {
         this.$set(this.szTaMb, "sszstBm", row.taBm);
       }
     },
-    confirmInsertItemSzTaMb(rows) {
-      if (rows.length > 0) {
-        let row = rows[0];
-        let szTaZdMbDTO = this.szTaMb.szTaZdMbDTOs[this.zdEnIndex];
-        this.$set(szTaZdMbDTO, "zdEn", row.taBm + "." + szTaZdMbDTO.zdEn);
-        this.$set(szTaZdMbDTO, "dybm", row.taEn);
-      }
-    },
     confirmInsertMenuKind(rows) {
       if (rows.length > 0) {
         let row = rows[0];
         this.$set(this.szTaMb, "menuKindCode", row.menuKindCode);
         this.$set(this.szTaMb, "menuKindName", row.name);
+        // 权限是按表单分类取的，换了分类必须重取：
+        // 否则新建单据（进来时 menuKindCode 为空、menuKindAuth 停在 editAuth:0）
+        // 手工选完分类后「保存」按钮依然不渲染，流程直接走不下去
+        this.getMenuKindAuth(row.menuKindCode);
       }
     },
+    clearSszst() {
+      // sszst 不在 szTaMb 的初始声明里（confirmInsertSzTaMb 也是 $set 写进去的），走 $set
+      this.$set(this.szTaMb, "sszst", null);
+      this.$set(this.szTaMb, "sszstBm", null);
+    },
+    clearMenuKind() {
+      this.szTaMb.menuKindCode = "";
+      // 反向同理：分类清空后旧分类的权限不能继续留着
+      this.menuKindAuth = { editAuth: 0 };
+    },
     getNewData(callback) {
       this.getData((res0) => {
         let szTaMb = res0.objx;
@@ -658,12 +712,14 @@ modules = {
       });
     },
     createModifyTable() {
+      let url = this.getServiceUrl("/dbTable/createUpdateTable");
+      if (!url) return;
       let text = this.$t1("您确定要创建/更新数据表吗？");
       this.$baseConfirm(text).then(() => {
         this.getNewData((data) => {
           this.$http({
             aes: true,
-            url: "/" + this.szTaMb.serviceName + `/dbTable/createUpdateTable`,
+            url: url,
             method: `post`,
             data: data,
             isLoading: true,
@@ -681,6 +737,18 @@ modules = {
         });
       });
     },
+    /**
+     * 拼「服务名 + 接口路径」。serviceName 为空时不要拼出 /null/... 打到后端，
+     * 直接提示并返回 null，由调用方中止。
+     */
+    getServiceUrl(path) {
+      let serviceName = this.szTaMb.serviceName;
+      if (!serviceName) {
+        this.$baseAlert(this.$t1("服务名不能为空，请先选择表单分类"));
+        return null;
+      }
+      return "/" + serviceName + path;
+    },
     isReferenceZdType(zdType) {
       return zdType === "Reference" || zdType === "ReferenceLong";
     },
@@ -691,37 +759,55 @@ modules = {
       let referenceKey = null;
       let referenceShowFields = [];
 
+      let referenceShowRows = [];
+
       if (referenceZd) {
         let index = referenceZd.indexOf(".");
         referenceEntity = referenceZd.substring(0, index);
         referenceKey = referenceZd.substr(index + 1);
-        referenceShowFields = this.szTaMb.szTaZdMbDTOs
+        // 回填已有的关联显示字段行时必须带上 zdEn / zdCh：
+        // confirmReferenceZdDialog 新建行要用它们拼 "ref_" + zdEn，
+        // 只回填 taZdMc 会生成 zdEn 为 "ref_undefined"、zdCh 为空的脏行
+        referenceShowRows = this.szTaMb.szTaZdMbDTOs
           .filter((item) => {
-            let flag = false;
-            if (item.relationZd === referenceZd || item.relationZd === referenceZd2) {
-              flag = true
-            }
-            return flag;
+            return item.relationZd === referenceZd || item.relationZd === referenceZd2;
           })
           .map((item) => {
-            return item.referenceZd.substr(index + 1);
+            let taZdMc = item.referenceZd ? item.referenceZd.substr(index + 1) : null;
+            return {
+              taZdMc,
+              zdEn: item.zdEn ? item.zdEn.replace(/^ref_/, "") : taZdMc,
+              zdCh: item.zdCh,
+            };
           });
+        referenceShowFields = referenceShowRows.map((item) => item.taZdMc);
       }
 
       this.referenceEntity = referenceEntity;
       this.referenceKey = referenceKey;
       this.referenceShowFields = referenceShowFields;
       this.refServiceName = row.refServiceName ?? null;
+      this.referenceShowRows = referenceShowRows;
 
-      this.referenceShowRows = referenceShowFields.map((item) => {
-        return {
-          taZdMc: item,
-        };
-      });
-
-      this.currentIndex = rowIndex;
+      this.currentRow = row;
       this.showReferenceZdDialog = true;
     },
+    /**
+     * item 是不是 parentRow 在 parentRefZd 这个关联配置下带出来的显示字段行。
+     *
+     * relationZd 历史上出现过三种写法（无后缀 / 后缀是主字段 zdEn / 后缀是子行自己的 zdEn），
+     * 这里全部认，避免漏匹配导致子行变成孤儿。
+     */
+    isReferenceChildRow(item, parentRow, parentRefZd) {
+      if (!parentRefZd || !item.relationZd) {
+        return false;
+      }
+      return (
+        item.relationZd === parentRefZd
+        || item.relationZd === parentRefZd + "." + parentRow.zdEn
+        || item.relationZd === parentRefZd + "." + item.zdEn
+      );
+    },
     changeZdType(row) {
       let map = {
         "Integer": "11",
@@ -736,23 +822,6 @@ modules = {
         this.clearReferenceZd(row);
       }
     },
-    getReferenceChildRows(row) {
-      let referenceZd = row.referenceZd;
-      if (!referenceZd && !row.zdEn) {
-        return [];
-      }
-      let referenceZd2 = referenceZd ? referenceZd + "." + row.zdEn : null;
-      let relationZdSuffix = row.zdEn ? "." + row.zdEn : null;
-      return this.szTaMb.szTaZdMbDTOs.filter((item) => {
-        if (referenceZd && (referenceZd === item.relationZd || referenceZd2 === item.relationZd)) {
-          return true;
-        }
-        if (relationZdSuffix && item.relationZd && item.relationZd.endsWith(relationZdSuffix)) {
-          return true;
-        }
-        return false;
-      });
-    },
     confirmClearReferenceZd(row) {
       if (!row.referenceZd) {
         return;
@@ -761,11 +830,9 @@ modules = {
         this.$baseAlert(this.$t1("该字段已在数据库中创建，不能清空关联配置"));
         return;
       }
-      let childRows = this.getReferenceChildRows(row);
-      if (childRows.some((item) => this.hasFieldCreated(item))) {
-        this.$baseAlert(this.$t1("关联显示字段已在数据库中创建，不能清空关联配置"));
-        return;
-      }
+      // 这里原来还有一道「关联显示字段已在数据库中创建」的检查，是死代码：
+      // 显示字段行不建库、taZdMc 恒为空，hasFieldCreated 永远返回 false。
+      // 连同它唯一的调用方 getReferenceChildRows 一并删掉。
       let text = this.$t1("清空关联配置将同时删除关联显示字段，您确定要继续吗？");
       this.$baseConfirm(text).then(() => {
         this.clearReferenceZd(row);
@@ -788,7 +855,11 @@ modules = {
       row.refServiceName = null;
     },
     confirmReferenceZdDialog() {
-      let row = this.szTaMb.szTaZdMbDTOs[this.currentIndex];
+      let row = this.currentRow;
+      if (!row) {
+        this.showReferenceZdDialog = false;
+        return;
+      }
       let oldReferenceZd = row.referenceZd;
       let oldReferenceZd2 = row.referenceZd + "." + row.zdEn;
 
@@ -799,6 +870,18 @@ modules = {
 
       let referenceShowFields = this.referenceShowFields;
 
+      // 关联表 / 关联字段任一为空都拼不出合法的 referenceZd，硬走下去
+      // 新建行的 relationZd 会拼成 "null.xxx"，父子彻底断开、之后再也认不回来。
+      // 两个都为空是"清空关联配置"，属于合法操作，放行走下面的删除分支。
+      if (referenceEntity && !referenceKey) {
+        this.$baseAlert(this.$t1("关联字段不能为空"));
+        return;
+      }
+      if (!referenceZd && referenceShowFields.length) {
+        this.$baseAlert(this.$t1("关联表不能为空"));
+        return;
+      }
+
       let keys = referenceShowFields.map((item) => {
         return referenceEntity + "." + item;
       });
@@ -819,6 +902,10 @@ modules = {
                 delIndex.push(index);
               } else {
                 item.refServiceName = refServiceName;
+                // 关联表没变、只换了关联字段时，保留下来的子行必须把 relationZd 迁到新的
+                // referenceZd 上。否则它们既变成认不回来的孤儿行，
+                // 又会因为下面 oldKeys 匹配不到而被当成"新字段"重复插入一遍。
+                item.relationZd = referenceZd ? referenceZd + "." + row.zdEn : null;
               }
             }
           });
@@ -831,7 +918,7 @@ modules = {
       }
 
       let oldKeys = this.szTaMb.szTaZdMbDTOs
-        .filter((item) => (referenceZd === item.relationZd || (referenceZd + "." + item.zdEn) === item.relationZd))
+        .filter((item) => this.isReferenceChildRow(item, row, referenceZd))
         .map((item) => item.referenceZd);
       let addReferenceShowFields = referenceShowFields.filter((item, index) => {
         return !oldKeys.includes(referenceEntity + "." + item);
@@ -839,23 +926,32 @@ modules = {
 
       let addIndex = -1;
       let lastIndex = this.szTaMb.szTaZdMbDTOs.findLastIndex((item) => {
-        return referenceZd === item.relationZd || (referenceZd + "." + item.zdEn) === item.relationZd;
+        return this.isReferenceChildRow(item, row, referenceZd);
       });
-      addIndex = lastIndex >= 0 ? lastIndex + 1 : this.currentIndex + 1;
+      addIndex = lastIndex >= 0
+        ? lastIndex + 1
+        : this.szTaMb.szTaZdMbDTOs.indexOf(row) + 1;
 
       let referenceShowRows = this.referenceShowRows;
 
       let addReferenceShowRows = referenceShowRows.filter((item, index) => {
         return addReferenceShowFields.includes(item.taZdMc);
       });
+      // 已占用的字段名，用来给新建行避让重名；本轮生成的也要边生成边记进去
+      let usedZdEns = this.szTaMb.szTaZdMbDTOs
+        .map((item) => item.zdEn)
+        .filter((item) => !!item);
       addReferenceShowRows.forEach((item, index) => {
         let rIndex = addIndex + index;
         let orders = (row.orders || 0) + index + 1;
 
+        let zdEn = this.buildReferenceZdEn(item.zdEn || item.taZdMc, row, usedZdEns);
+        usedZdEns.push(zdEn);
+
         let newItem = this.createRow();
         Object.assign(newItem, {
-          zdEn: "ref_" + item.zdEn,
-          zdCh: item.zdCh,
+          zdEn,
+          zdCh: item.zdCh || null,
           required: false,
           referenceZd: referenceEntity + "." + item.taZdMc,
           zdType: "Text",
@@ -873,6 +969,35 @@ modules = {
       this.handleReferenceOrders(row);
       this.showReferenceZdDialog = false;
     },
+    /**
+     * 生成关联显示字段行的实体字段名。
+     *
+     * 基础名是 ref_<源字段>。两个字段绑同一张表的同一个字段时会撞
+     * （典型：创建人 / 修改人都关联 sc_user.id 并显示 name，都想叫 ref_name），
+     * 撞了才退化成 ref_<父字段>_<源字段>；还撞就往后加序号。
+     * 先到先得，已存在的行不改名，所以存量数据不受影响。
+     *
+     * @param {String} srcName   源字段名
+     * @param {Object} parentRow 发起关联的主字段行
+     * @param {Array}  usedZdEns 已占用的字段名（含本轮刚生成的）
+     */
+    buildReferenceZdEn(srcName, parentRow, usedZdEns) {
+      let base = "ref_" + srcName;
+      if (!usedZdEns.includes(base)) {
+        return base;
+      }
+      let withParent = parentRow.zdEn
+        ? "ref_" + parentRow.zdEn + "_" + srcName
+        : base;
+      if (withParent !== base && !usedZdEns.includes(withParent)) {
+        return withParent;
+      }
+      let index = 2;
+      while (usedZdEns.includes(withParent + "_" + index)) {
+        index++;
+      }
+      return withParent + "_" + index;
+    },
     createRow(){
       let row = {
         "orders": null,
@@ -912,11 +1037,9 @@ modules = {
       let orders = row.orders || 0;
       if (referenceZd) {
         this.szTaMb.szTaZdMbDTOs
-          .filter((item) => referenceZd === item.relationZd || (referenceZd + "." + item.zdEn === item.relationZd))
+          .filter((item) => this.isReferenceChildRow(item, row, referenceZd))
           .forEach((item, index) => {
-            if (referenceZd === item.relationZd || (referenceZd + "." + item.zdEn === item.relationZd)) {
-              item.orders = orders + index + 1;
-            }
+            item.orders = orders + index + 1;
           });
       }
     },
@@ -926,14 +1049,23 @@ modules = {
         if (this.referenceEntity !== row.taBm) {
           this.referenceKey = null;
           this.referenceShowFields = [];
+          // 换了关联表，上一张表的显示字段行必须一起丢掉，
+          // 否则 confirmReferenceZdDialog 会拿旧表的 taZdMc 去拼新表的 referenceZd
+          this.referenceShowRows = [];
         }
         this.referenceEntity = row.taBm;
         this.refServiceName = row.serviceName;
       }
     },
+    clearReferenceEntity() {
+      this.referenceKey = null;
+      this.refServiceName = null;
+      this.referenceShowFields = [];
+      this.referenceShowRows = [];
+    },
     openEntityFieldDialog1() {
       if (!this.referenceEntity) {
-        this.$baseAlert("关联表不能为空");
+        this.$baseAlert(this.$t1("关联表不能为空"));
         return;
       }
       this.showEntityFieldDialog1 = true;
@@ -946,21 +1078,22 @@ modules = {
     },
     openEntityFieldDialog2() {
       if (!this.referenceEntity) {
-        this.$baseAlert("关联表不能为空");
+        this.$baseAlert(this.$t1("关联表不能为空"));
         return;
       }
       this.showEntityFieldDialog2 = true;
     },
     confirmEntityFieldDialog2(rows) {
-      if (rows.length) {
-        this.referenceShowRows = rows;
-        this.referenceShowFields = rows.map((row) => {
-          return row.taZdMc;
-        });
-      }
+      // 不能用 rows.length 兜底：回填可用之后，把勾选全部取消掉
+      // 就是"清空显示字段"的正常操作，必须让它生效
+      this.referenceShowRows = rows || [];
+      this.referenceShowFields = this.referenceShowRows.map((row) => {
+        return row.taZdMc;
+      });
     },
     getCreatedTableColumns() {
-      if (!this.szTaMb.taBm) return;
+      // 这里是首屏静默取数，serviceName 缺失时直接跳过，不弹提示打扰用户
+      if (!this.szTaMb.taBm || !this.szTaMb.serviceName) return;
       this.$http({
         aes: true,
         url: "/" + this.szTaMb.serviceName + "/dbTable/getTableColumns",
@@ -1044,9 +1177,6 @@ modules = {
       let min = 100;
       let szTaZdMbDTOs = this.szTaMb.szTaZdMbDTOs;
       let value = 0;
-      let allOrders = szTaZdMbDTOs
-        .filter((item) => item.orders !== null && item.orders !== undefined)
-        .map((item) => item.orders);
       szTaZdMbDTOs.forEach((item) => {
         let orders = item.orders;
         if (orders !== null && orders !== undefined && orders < 9000) {
@@ -1091,10 +1221,12 @@ modules = {
         this.$baseAlert(this.$t1("数据表不能为空"));
         return;
       }
+      let url = this.getServiceUrl("/dbTable/getSzTaZdMbs");
+      if (!url) return;
       this.showDtDialog = false;
       this.$http({
         // aes: true,
-        url: "/" + this.szTaMb.serviceName + `/dbTable/getSzTaZdMbs`,
+        url: url,
         method: `post`,
         data: {
           stringOne: dbTable,
@@ -1198,10 +1330,15 @@ modules = {
       }
       this.toTaBmZdEntity = toTaBmZdEntity;
       this.toTaBmZdField = toTaBmZdField;
-      this.currentIndex = rowIndex;
+      this.toTaBmZdRow = row;
       this.showToTaBmZdDialog = true;
     },
     confirmToTaBmZdDialog() {
+      let row = this.toTaBmZdRow;
+      if (!row) {
+        this.showToTaBmZdDialog = false;
+        return;
+      }
       let toTaBmZdEntity = this.toTaBmZdEntity;
       let toTaBmZdField = this.toTaBmZdField;
       if (!toTaBmZdEntity) {
@@ -1212,8 +1349,7 @@ modules = {
         this.$baseAlert(this.$t1("对应表字段不能为空"));
         return;
       }
-      this.szTaMb.szTaZdMbDTOs[this.currentIndex].toTaBmZd =
-        toTaBmZdEntity + "." + toTaBmZdField;
+      row.toTaBmZd = toTaBmZdEntity + "." + toTaBmZdField;
       this.showToTaBmZdDialog = false;
     },
     openEntityDialog3() {
@@ -1241,20 +1377,31 @@ modules = {
         this.toTaBmZdField = row.taZdMc;
       }
     },
-    inputZdEn(row) {
-
-      this.preValue = row.zdEn; // 更新旧值
-      this.fkey = true
+    /**
+     * 进入字段名输入框时记下原值。
+     *
+     * 原来是靠 keydown 开闸（fkey），但鼠标右键粘贴、拖拽填入、部分输入法提交路径
+     * 都不产生 keydown，那些场景下 changeZdEn 整个被跳过，子行的 relationZd
+     * 会停在旧字段名上变成孤儿行。改成 focus 播种，任何修改途径都覆盖得到。
+     */
+    cacheZdEn(row) {
+      this.preValue = row.zdEn;
     },
+    /**
+     * 改字段名时，把该行关联带出来的显示字段行的 relationZd 一起迁过去。
+     */
     changeZdEn(val, row) {
-      if(!this.fkey)return
       let oldVal = this.preValue;
-      let newVal = val
+      let newVal = val;
+      this.preValue = newVal;
+      if (oldVal === undefined || oldVal === null || oldVal === newVal) {
+        return;
+      }
       if (this.isReferenceZdType(row.zdType)) {
         let referenceZd = row.referenceZd;
         if (referenceZd) {
-          let referenceZd2 = row.referenceZd + "." + oldVal
-          let relationZd = row.referenceZd + "." + newVal
+          let referenceZd2 = referenceZd + "." + oldVal;
+          let relationZd = referenceZd + "." + newVal;
           this.szTaMb.szTaZdMbDTOs.forEach((item, index) => {
             if (referenceZd === item.relationZd || referenceZd2 === item.relationZd) {
               item.relationZd = relationZd;
@@ -1262,7 +1409,6 @@ modules = {
           });
         }
       }
-      this.fkey = false
     },
 
     getOtherMenuKindAuth() {
@@ -1287,7 +1433,7 @@ modules = {
       this.$baseReload()
     },
     excelExport(){
-      this.$excelExport({title: '数据表字段明细导出', targetRef: 'table-szTaZdMb', prefix: USER_PREFIX, type: 'selected'})
+      this.$excelExport({title: this.$t1('数据表字段明细导出'), targetRef: 'table-szTaZdMb', prefix: USER_PREFIX, type: 'selected'})
     },
     getHValue(row, column) {
       if (row.hData && row.hData.id) {

package/src/views/bd/setting/table_model/mixins/zdDialog.js

@@ -54,6 +54,9 @@ modules = {
             ...this.param,
           };
         },
+        callback: (rows) => {
+          this.restoreChecked(rows);
+        },
         columns: [
           { type: "checkbox", width: 48, resizable: false, fixed: "left" },
           {
@@ -111,6 +114,35 @@ modules = {
         that.vxeOption = opts;
       });
     },
+    /**
+     * 列表每次查询完，把已选中的字段重新勾上。
+     *
+     * selectDialogMixins.initSetting 只把 rows 播种进 checkRows（右侧已选列表），
+     * 表格自身的勾选状态没人恢复 —— 不补这一步，弹框打开时左边一个勾都没有，
+     * 用户再勾一个新字段就会把原有的显示字段整组顶掉。
+     */
+    restoreChecked(rows) {
+      let checkRows = this.checkRows;
+      if (!checkRows || !checkRows.length || !rows || !rows.length) {
+        return;
+      }
+      let fieldKey = this.fieldKey;
+      let keys = checkRows.map((item) => item[fieldKey]);
+      let targetRows = rows.filter((row) => keys.includes(row[fieldKey]));
+      if (!targetRows.length) {
+        return;
+      }
+      // 回填进来的可能只是 { taZdMc } 这样的占位行，用列表里的真实行替换掉，
+      // 保证「确定」抛给调用方的是带 zdEn / zdCh 的完整数据
+      this.checkRows = checkRows.map((item) => {
+        let real = targetRows.find((row) => row[fieldKey] === item[fieldKey]);
+        return real || item;
+      });
+      let $grid = this.$refs[this.defaultTableRefName];
+      if ($grid && $grid.setCheckboxRow) {
+        $grid.setCheckboxRow(targetRows, true);
+      }
+    },
   },
 };
 export default modules;