cloud-web-corejs 1.0.276 → 1.0.277

package/src/views/user/form/view/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="containt">
-    <template v-if="layoutType == 'PC'">
+    <template v-if="layoutType === 'PC'">
       <x-tabs
         ref="xTabs"
         v-model="activeName"
@@ -59,16 +59,12 @@
               :param="item.param"
               v-if="item.showContent"
               :parent-target="_self"
-              @reload="
-                (...args) => {
-                  reloadAutoContent(...args);
-                }
-              "
+              @reload="(...args) => reloadAutoContent(...args)"
               :openEditDialog="openEditDialog1"
             ></vFormRender>
           </div>
         </el-tab-pane>
-        <template #editTab="{ tab, index, reloadTabContent }">
+        <template #editTab="{ tab }">
           <el-tab-pane
             :key="tab.tabName"
             :label="tab.data[tab.tabLabelField]"
@@ -82,19 +78,14 @@
               :param="tab.param"
               v-if="tab.showContent"
               :parent-target="_self"
-              @reload="
-                (...args) => {
-                  formData = {};
-                  reloadTabContent(...args);
-                }
-              "
+              @reload="(...args) => onEditTabReload(tab, ...args)"
               @openCopyEditTab="openCopyEditTab"
             ></vFormRender>
           </el-tab-pane>
         </template>
       </x-tabs>
     </template>
-    <template v-else-if="layoutType == 'H5'">
+    <template v-else-if="layoutType === 'H5'">
       <el-dialog
         :title="$t1('明细详情')"
         :modal-append-to-body="false"
@@ -191,7 +182,7 @@ export default {
   },
   methods: {
     handleTabChange(tabName) {
-      if (tabName == "second") {
+      if (tabName === "second") {
         this.$refs.list.dataTableSearch();
       } else if (tabName.startsWith("otherTab")) {
         let refName = tabName.replace("otherTab", "list");
@@ -255,13 +246,15 @@ export default {
     },
     openOtherTab(row, param, option) {
       let dataId = row && row.id ? row.id : null;
-      let formCode = option.formCode;
-      let otherTab = this.otherTabList.find(
-        (item) => item.formCode == formCode
-      );
+      let formCode = option?.formCode;
       let otherTabIndex = this.otherTabList.findIndex(
-        (item) => item.formCode == formCode
+        (item) => item.formCode === formCode
       );
+      if (otherTabIndex < 0) {
+        this.$message.error(`未配置对应的关联页签: ${formCode}`);
+        return;
+      }
+      let otherTab = this.otherTabList[otherTabIndex];
       this.activeName = `otherTab${otherTabIndex}`;
 
       otherTab.dataId = dataId;
@@ -278,7 +271,7 @@ export default {
         this.openOtherTab(row, param, option);
         return;
       }
-      if (this.layoutType == "H5") {
+      if (this.layoutType === "H5") {
         this.openEditH5Dialog(row, param);
         return;
       }
@@ -299,26 +292,41 @@ export default {
 
       let dataId = row && row.id ? row.id : null;
       this.dataId = dataId;
+      let isAdd = !dataId;
       let formCode = null;
-      if (!dataId) {
+      if (isAdd) {
         formCode = option?.formCode || this.addFormCode;
       } else {
         formCode = option?.formCode || this.formCode2;
       }
-      if (multiTabEnabled && dataId) {
-        this.$refs.xTabs.openEditTab(row, param, {
+      // 新增页签门控：需先启用「列表启用详情多标签」，再叠加 addTabEnabled、新增、配了标题字段
+      let addTab =
+        multiTabEnabled && formConfig.addTabEnabled && isAdd && tabLabelField;
+      if ((multiTabEnabled && dataId) || addTab) {
+        // 归一：新增/编辑都走 openEditTab
+        // 新增合成唯一 id，让去重(paneKeyName='id')/tabName/paneName 三者对齐
+        let key = isAdd
+          ? "add_" + Date.now() + "_" + Math.random().toString(36).slice(2, 6)
+          : dataId;
+        let openRow = isAdd
+          ? { ...row, id: key, [tabLabelField]: "新增" }
+          : row;
+        this.$refs.xTabs.openEditTab(openRow, param, {
           tabParam: {
             formCode,
             tabLabelField,
-            tabName: formCode + dataId,
-            // 翻单快照：随页签保存，供 getActiveBillNavState 读取
+            tabName: String(key), // el-tabs 的 name 需为 String,dataId 可能是 Number
+            isAdd,
+            // 新增时 dataId 必须为 null，避免 vFormRender 把合成 id 当真实单号去 getOne
+            ...(isAdd ? { dataId: null } : {}),
+            // 翻单快照：新增也带(navIndex=-1),保存后把新单插入序列首位
             navRows: option?.navRows || null,
             navIndex: option?.navIndex ?? -1,
           },
         });
       } else {
         this.formCode1 = formCode;
-        this.activeName = option.activeName || "first";
+        this.activeName = option?.activeName || "first";
         this.showEdit = false;
         this.showEditDialog = true;
         this.param = param;
@@ -366,6 +374,86 @@ export default {
       }
       return reloadTask;
     },
+    reload2() {
+      this.formData = {};
+      this.$reloadHandle(...arguments);
+    },
+    // 逐级解析真实表单的 formDataModel（target 可能是包裹组件，真实表单在内层 vFormRef 上）
+    resolveFormModel(target) {
+      return (
+        (target && target.formDataModel) ||
+        (target && target.$refs && target.$refs.vFormRef
+          ? target.$refs.vFormRef.formDataModel
+          : null) ||
+        (target && target.getFormRef && target.getFormRef()
+          ? target.getFormRef().formDataModel
+          : null) ||
+        {}
+      );
+    },
+    // 应用保存结果到页签「元数据」：升级编辑态 + 同步标题。不含内容重渲染。
+    applyTabSaveResult(tab, dataId, formCode, formModel) {
+      // ① 首次新增保存：就地升级本页签为编辑态
+      if (tab.isAdd && dataId) {
+        tab.data.id = dataId; // 从列表再打开同单号可复用本页签
+        tab.dataId = dataId; // 表单不 watch dataId，此处不会触发内容重载
+        tab.isAdd = false;
+        if (formCode) tab.formCode = formCode;
+        // 新增保存:把新单插入翻单序列首位(新数组,不改动列表原 fullData 引用)
+        if (Array.isArray(tab.navRows)) {
+          tab.navRows = [tab.data, ...tab.navRows];
+          tab.navIndex = 0;
+        }
+      }
+      // ② 同步标题为「标签名称字段」最新值；无值则保持原标题，不回退用单号
+      let labelField = tab.tabLabelField;
+      let labelVal =
+        labelField != null &&
+        formModel &&
+        formModel[labelField] != null &&
+        formModel[labelField] !== ""
+          ? formModel[labelField]
+          : null;
+      if (labelVal != null) {
+        this.$set(tab.data, labelField, labelVal);
+      }
+    },
+    onEditTabReload(tab, target, param) {
+      // 动态页签（新增/编辑）表单保存后回调，tab 直接在作用域内
+      this.formData = {};
+      let dataId =
+        param != null && param.updateParam != null
+          ? param.updateParam.dataId
+          : null;
+      let formCode =
+        param != null && param.updateParam != null
+          ? param.updateParam.formCode
+          : null;
+      this.applyTabSaveResult(tab, dataId, formCode, this.resolveFormModel(target));
+      return this.$refs.xTabs.reloadTabContent(target, param, tab); // 重载编辑态（内容重渲染）
+    },
+    // 供「保存并提交」路径调用：只升级当前活动新增页签的元数据，不重渲染详情内容。
+    // 目的：保存成功即升级为编辑态（防止提交失败/取消后重复入库），且不多刷一次详情。
+    promoteActiveAddTab(dataId, formCode, target) {
+      // 常规「first」页签新增(addTabEnabled 关时新增走此)保存后:升级 dataId 为编辑态,
+      // 并把新单插入翻单序列首位,使提交后「刷新当前页签」能显示详情。
+      if (this.activeName === "first") {
+        if (dataId) {
+          this.dataId = dataId;
+          if (formCode) this.formCode1 = formCode;
+          if (Array.isArray(this.firstNavRows) && this.firstNavIndex === -1) {
+            this.firstNavRows = [{ id: dataId }, ...this.firstNavRows];
+            this.firstNavIndex = 0;
+          }
+        }
+        return;
+      }
+      let xTabs = this.$refs.xTabs;
+      if (!xTabs) return;
+      let tab = xTabs.tabs.find((t) => t.tabName === xTabs.activeName);
+      if (!tab) return;
+      this.applyTabSaveResult(tab, dataId, formCode, this.resolveFormModel(target));
+    },
     // ===== 上一单/下一单：宿主 API，供详情表单 detail-item 的按钮区调用 =====
     // 返回当前活动详情的翻单快照 {rows, index} —— 兼容多标签页签与常规「first」页签；无快照返回 null。
     getActiveBillNavState() {
@@ -384,7 +472,12 @@ export default {
       // 多标签动态编辑页签
       let xTabs = this.$refs.xTabs;
       let tab = xTabs && xTabs.tabs.find((t) => t.tabName === activeName);
-      if (tab && Array.isArray(tab.navRows) && tab.navRows.length > 0) {
+      if (
+        tab &&
+        !tab.isAdd &&
+        Array.isArray(tab.navRows) &&
+        tab.navRows.length > 0
+      ) {
         return { rows: tab.navRows, index: tab.navIndex ?? -1, tab };
       }
       return null;
@@ -412,13 +505,9 @@ export default {
         this.$openEditView("showEdit"); // toggle 重挂载 → 按新 dataId getOne
       }
     },
-    reload2() {
-      this.formData = {};
-      this.$reloadHandle(...arguments);
-    },
     initOtherTabList() {
       if (!this.formJson.formConfig.otherTabEnabled) return;
-      this.otherTabList = this.formJson.formConfig.otherTabList
+      this.otherTabList = (this.formJson.formConfig.otherTabList || [])
         .filter((item) => !!item.formCode && !!item.label)
         .map((item) => {
           return {
@@ -438,15 +527,23 @@ export default {
       }
 
       if (!tab) {
+        // 未显式传 tab 时按当前激活页签名(otherTab{N})定位到 otherTabList 对应项
         let activeName = this.activeName;
-        tab = this.tabs.find((item) => item.label == activeName);
+        if (activeName && activeName.startsWith("otherTab")) {
+          let num = Number(activeName.substring("otherTab".length));
+          tab = this.otherTabList[num] || null;
+        }
       }
       if (tab) {
         tab.showContent = false;
-        setTimeout(() => {
-          tab.showContent = true;
-        }, 200);
+        return new Promise((resolve) => {
+          setTimeout(() => {
+            tab.showContent = true;
+            this.$nextTick(resolve);
+          }, 200);
+        });
       }
+      return Promise.resolve();
     },
   },
 };

package/src/views/user/wf/wfReport/index.vue

@@ -526,8 +526,31 @@ export default {
   }
 }
 .filter-btns {
+  display: flex;
+  align-items: center;
+  flex-wrap: nowrap;
+  gap: 8px;
   .f-btn {
-    margin-right: 25px;
+    margin-right: 0;
+  }
+  // 内联的 128px !important 无法被覆盖，但 flex-shrink 依然生效，
+  // 让各查询项按比例收缩，保证刷新/搜索按钮不换行掉下去
+  ::v-deep .el-select,
+  ::v-deep .el-input,
+  ::v-deep .el-date-editor {
+    flex: 0 1 auto;
+    min-width: 76px;
+  }
+  .button-sty {
+    display: flex;
+    align-items: center;
+    gap: 4px;
+    min-width: 0;
+    margin: 0;
+  }
+  > .el-button {
+    flex: none;
+    white-space: nowrap;
   }
 }
 .sum-statistics {

package/src/views/user/wf/wf_manage/list.vue

@@ -222,7 +222,7 @@
                     type="primary"
                     class="button-sty"
                     @click="openCurrentTaskUserDialog"
-                    >{{ $t1("处理当前任务用户") }}
+                    >{{ $t1("处理任务用户") }}
                   </el-button>
                 </div>
                 <div class="fr">
@@ -345,7 +345,7 @@
       :multi="false"
     ></wfObjConfigDialog>
     <el-dialog
-      :title="$t1('处理当前任务用户')"
+      :title="$t1('处理任务用户')"
       :append-to-body="true"
       :modal-append-to-body="true"
       :close-on-click-modal="false"
@@ -687,7 +687,11 @@ export default {
                 owner: res.owner,
                 targetPath: res.targetPath,
                 bizParams: this.param,
-                viewMeta: { visibleKey: "showWfContent", defaultShowWfContent: true, viewType: 1 },
+                viewMeta: {
+                  visibleKey: "showWfContent",
+                  defaultShowWfContent: true,
+                  viewType: 1,
+                },
               }
             : null;
         this.wfContent = res.component;
@@ -1083,7 +1087,7 @@ export default {
         this.$message.error(this.$t1("请选择删除用户"));
         return;
       }
-      this.$baseConfirm(this.$t1("您确定要处理当前任务用户吗？")).then(() => {
+      this.$baseConfirm(this.$t1("您确定要处理任务用户吗？")).then(() => {
         this.$http({
           url: USER_PREFIX + "/wf_info/updateCurrentTaskUsers",
           method: "post",

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

@@ -1,209 +0,0 @@
-<template>
-  <el-drawer v-bind="dialogConfig" @close="close" :visible.sync="showDialog">
-    <div class="cont" v-bind="bodyConfig" id="containt">
-      <v-form-render :form-json.sync="formJson" :form-data="formData" :option-data="optionData" ref="vFormRef"
-                     :reportTemplate.sync="formTemplate" :conditionParam.sync="conditionParam"
-                     :formInsData.sync="formInsData" v-if="showRender" visible-key="showRender" :parent-target="_self"
-                     @reload="reload" :param="dialogParam"
-                     class="data-table_height"/>
-    </div>
-    <span class="dialog-footer" v-if="option.showFooter!==false" v-bind="option.footerConfig">
-			<el-button type="primary" plain class="button-sty" @click="close">
-				<i class="el-icon-close el-icon"></i>
-				{{ $t2('取 消', 'system.button.cancel2') }}
-			</el-button>
-			<el-button type="primary" @click="dialogSubmit" class="button-sty">
-				<i class="el-icon-check el-icon"></i>
-				{{ $t2('确 定', 'system.button.confirm2') }}
-			</el-button>
-		</span>
-  </el-drawer>
-</template>
-
-<script>
-import VFormRender from "../../../../../components/xform/form-render/index.vue";
-
-export default {
-  // name: "vabSearchDialog",
-  components: {VFormRender},
-  props: {
-    visiable: Boolean,
-    option: Object
-  },
-  mixins: [],
-  inject: ["getFormConfig"],
-  mounted() {
-
-  },
-  data() {
-    var that = this;
-    return {
-      showFormField: "_tt",
-      showDialog: true,
-      falseValue: false,
-      selectMulti: true,
-
-      formJson: {},
-      formData: {},
-      optionData: {},
-      showRender: false,
-      formTemplate: {},
-      /*      formCode: null,*/
-      layoutType: null,
-      conditionParam: null,
-      formInsData: null,
-      $grid: null,
-      currentLayoutType: null
-    };
-  },
-  computed: {
-    formCode() {
-      return this.option.formCode;
-    },
-    dialogParam() {
-      return this.option?.param;
-    },
-    dialogConfig() {
-      let customClass = "dialog-style list-dialog dialog-checkbox pd_0";
-      if (this.option.dialogConfig?.customClass) {
-        customClass = customClass + " " + this.option.dialogConfig.customClass
-      }
-      let config = {
-        title: this.formTemplate.formName,
-        appendToBody: false,
-        // modalAppendToBody: true,
-        // closeOnClickModal: false,
-        modal: false,
-        destroyOnClose:true,
-        // width: "1200px",
-        // fullscreen: this.option.fullscreen,
-        size:"80%",
-        direction:"btt"
-      };
-      config = Object.assign({}, config, this.option.dialogConfig, {customClass});
-      config.title = this.$t1(config.title);
-      return config;
-    },
-    bodyConfig() {
-      let config = {};
-      let classStr = this.currentLayoutType
-      if (this.option.bodyConfig?.class) {
-        classStr = classStr + " " + this.option.bodyConfig.class;
-      }
-      if (this.option.showFooter == false) {
-        classStr = classStr + " nfootBtn";
-      }
-      config = Object.assign({}, config, this.option.bodyConfig, {class: classStr});
-      return config;
-    }
-  },
-  created() {
-    let currentFormConfig = this.getFormConfig();
-    this.currentLayoutType = currentFormConfig.layoutType
-
-    this.selectMulti = this.option.multiple ?? true;
-    this.getReportTemplate();
-  },
-  methods: {
-    reload(){
-      this.showRender = false;
-      this.getReportTemplate();
-    },
-    async getReportTemplate() {
-      let param = {
-        objTypeCode: this.$attrs.objTypeCode,
-        objId: this.$attrs.objId,
-        taskId: this.$attrs.taskId
-      };
-      this.conditionParam = param;
-      let url, data;
-      url = USER_PREFIX + `/formTemplate/getByFormCode`;
-      data = {stringOne: this.formCode}
-
-      let that = this;
-      this.$http({
-        url: url,
-        method: `post`,
-        data: data,
-        isLoading: true,
-        loadingTarget: document.body,
-        modalStrictly: true,
-        success: res => {
-          let formTemplate = res.objx || {};
-          this.formTemplate = formTemplate;
-          this.formJson = formTemplate.formViewContent ? JSON.parse(formTemplate.formViewContent) : {};
-          this.layoutType = this.formJson.formConfig.layoutType
-          let formConfig = this.formJson.formConfig;
-          if (formConfig.searchDialogUniqueField) {
-            this.fieldKey = formConfig.searchDialogUniqueField;
-          }
-
-          this.showRender = true;
-
-
-        }
-      });
-    },
-    close() {
-      let formRef = this.$refs.vFormRef;
-      this.showDialog = false;
-      this.$emit('update:visiable', false);
-      this.option.close && this.option.close(formRef, this);
-    },
-    dialogSubmit() {
-      let formRef = this.$refs.vFormRef;
-      if (this.option.confirm) {
-        if (this.option.confirm(formRef, this) !== false) {
-          this.close();
-        }
-      } else {
-        this.close();
-      }
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-::v-deep .H5 .h5-fixed-bottom-btns {
-  bottom: 95px;
-}
-
-.list-dialog {
-  .el-dialog__body {
-    height: calc(100% - 42px);
-
-    .cont {
-      height: calc(100vh - 210px);
-
-      &.nfootBtn {
-        height: calc(100vh - 158px)
-      }
-
-      &#containt {
-        padding: 0;
-
-        ::v-deep .grid-container {
-          outline: none;
-
-          &.detail-wrap .d-cont {
-            .title .field-wrapper {
-              display: inline-block !important
-            }
-          }
-        }
-      }
-    }
-  }
-
-  &.is-fullscreen .el-dialog__body {
-    .cont {
-      height: calc(100vh - 110px);
-
-      &.nfootBtn {
-        height: calc(100vh - 58px)
-      }
-    }
-  }
-}
-</style>