cloud-web-corejs 1.0.276 → 1.0.278

package/src/components/vb-tabs/x-tabs.vue

@@ -1,143 +1,167 @@
-<template>
-  <el-tabs
-    v-model="activeName"
-    class="tab-box tab-morenav"
-    @tab-remove="removeTab"
-    @tab-click="tabClick"
-    ref="tabs"
-  >
-    <slot name="default"></slot>
-    <template v-for="(tab, index) in tabs">
-      <slot name="editTab" v-bind="{ tab, index, tabs, reloadTabContent }"></slot>
-    </template>
-  </el-tabs>
-</template>
-<script>
-export default {
-  name: "x-tabs",
-  props: {
-    value: String,
-    paneKeyName: {
-      type: String,
-      default: () => "id",
-    },
-    tabNameEnable: {
-      type: Boolean,
-      default: () => false,
-    },
-  },
-  data() {
-    return {
-      activeName: "0",
-      tabs: [],
-    };
-  },
-  watch: {
-    value(val) {
-      this.activeName = val;
-    },
-    activeName(val) {
-      this.$emit("input", val);
-    },
-  },
-  created() {
-    if (this.value) {
-      this.activeName = this.value;
-    }
-  },
-  methods: {
-    openEditTab(row, param, option) {
-      let paneKeyName = this.paneKeyName;
-      let tab = this.tabs.find((tab) => tab.data[paneKeyName] === row[paneKeyName]);
-      let tabParam = option?.tabParam || {};
-      let dataId = row ? row[paneKeyName] : null;
-      let newTab = {
-        data: row,
-        showContent: false,
-        dataId: dataId,
-        param,
-        ...tabParam,
-      };
-      if (!tab) {
-        tab = newTab;
-        if (this.tabs.length >= 30) {
-          this.tabs.splice(0, 1, tab);
-        } else {
-          this.tabs.push(tab);
-        }
-        this.$nextTick(() => {
-          let paneName = this.getCurrentPaneName();
-          tab.paneName = paneName;
-        });
-      } else {
-        Object.assign(tab, newTab);
-      }
-      let tabNameEnable = this.tabNameEnable;
-      this.activeName = row ? (tabNameEnable ? tab.tabName : row[paneKeyName] + "") : "";
-      tab.showContent = false;
-      setTimeout(() => {
-        tab.showContent = true;
-      }, 200);
-    },
-    removeTab(targetName) {
-      let tabNameEnable = this.tabNameEnable;
-      let paneKeyName = this.paneKeyName;
-      let tabIndex = this.tabs.findIndex((tab) => {
-        if (tabNameEnable) {
-          return tab.tabName === targetName;
-        } else {
-          return tab.data[paneKeyName] + "" === targetName;
-        }
-      });
-      if (this.activeName === targetName) {
-        if (tabIndex > 0) {
-          let prev = this.tabs[tabIndex - 1];
-          this.activeName = tabNameEnable
-            ? prev.tabName
-            : prev.data[paneKeyName] + "";
-        } else {
-          this.activeName = "second";
-        }
-      }
-      if (tabIndex !== -1) {
-        this.tabs.splice(tabIndex, 1);
-      }
-      this.$emit("removeTab", targetName);
-    },
-    getCurrentPaneName() {
-      return this.getCurrntPaneTarget().paneName;
-    },
-    getCurrntPaneTarget() {
-      let panes = this.$refs.tabs.panes;
-      let target = panes.find((pane) => pane.active);
-      return target;
-    },
-    reloadTabContent(target, param, tab) {
-      let updateParam =
-        param != null && param.updateParam != null ? param.updateParam : {};
-      for (let key in updateParam) {
-        target.$emit("update:" + key, updateParam[key]);
-      }
-
-      if (!tab) {
-        let activeName = this.activeName;
-        tab = this.tabs.find((item) => item.paneName == activeName);
-      }
-      if (tab) {
-        tab.showContent = false;
-        return new Promise((resolve) => {
-          setTimeout(() => {
-            tab.showContent = true;
-            this.$nextTick(resolve);
-          }, 200);
-        });
-      }
-      return Promise.resolve();
-    },
-    tabClick(targetName) {
-      this.$emit("tabClick", targetName);
-    },
-  },
-};
-</script>
-<style scoped></style>
+<template>
+  <el-tabs
+    v-model="activeName"
+    class="tab-box tab-morenav"
+    @tab-remove="removeTab"
+    @tab-click="tabClick"
+    ref="tabs"
+  >
+    <slot name="default"></slot>
+    <template v-for="(tab, index) in tabs">
+      <slot name="editTab" v-bind="{ tab, index, tabs, reloadTabContent }"></slot>
+    </template>
+  </el-tabs>
+</template>
+<script>
+export default {
+  name: "x-tabs",
+  props: {
+    value: String,
+    paneKeyName: {
+      type: String,
+      default: () => "id",
+    },
+    tabNameEnable: {
+      type: Boolean,
+      default: () => false,
+    },
+    // 关闭页签前置钩子 beforeRemove(targetName, tab) => Boolean | Promise<Boolean>
+    // 返回 false（或 reject）则中止关闭，用于「未保存提示」。不传 = 行为与原来完全一致。
+    beforeRemove: Function,
+  },
+  data() {
+    return {
+      activeName: "0",
+      tabs: [],
+    };
+  },
+  watch: {
+    value(val) {
+      this.activeName = val;
+    },
+    activeName(val) {
+      this.$emit("input", val);
+    },
+  },
+  created() {
+    if (this.value) {
+      this.activeName = this.value;
+    }
+  },
+  methods: {
+    openEditTab(row, param, option) {
+      let paneKeyName = this.paneKeyName;
+      let tab = this.tabs.find((tab) => tab.data[paneKeyName] === row[paneKeyName]);
+      let tabParam = option?.tabParam || {};
+      let dataId = row ? row[paneKeyName] : null;
+      let newTab = {
+        data: row,
+        showContent: false,
+        dataId: dataId,
+        param,
+        ...tabParam,
+      };
+      if (!tab) {
+        tab = newTab;
+        if (this.tabs.length >= 30) {
+          this.tabs.splice(0, 1, tab);
+        } else {
+          this.tabs.push(tab);
+        }
+        this.$nextTick(() => {
+          let paneName = this.getCurrentPaneName();
+          tab.paneName = paneName;
+        });
+      } else {
+        Object.assign(tab, newTab);
+      }
+      let tabNameEnable = this.tabNameEnable;
+      this.activeName = row ? (tabNameEnable ? tab.tabName : row[paneKeyName] + "") : "";
+      tab.showContent = false;
+      setTimeout(() => {
+        tab.showContent = true;
+      }, 200);
+    },
+    // el-tabs 的 tab-remove 入口：先过 beforeRemove 钩子，通过后才真正关闭。
+    // 程序化关闭（如流程提交后自动关页签）应直接调 doRemoveTab 跳过确认。
+    removeTab(targetName) {
+      if (!this.beforeRemove) {
+        this.doRemoveTab(targetName);
+        return;
+      }
+      let tabNameEnable = this.tabNameEnable;
+      let paneKeyName = this.paneKeyName;
+      let tab = this.tabs.find((tab) => {
+        return tabNameEnable
+          ? tab.tabName === targetName
+          : tab.data[paneKeyName] + "" === targetName;
+      });
+      Promise.resolve(this.beforeRemove(targetName, tab)).then(
+        (pass) => {
+          if (pass !== false) this.doRemoveTab(targetName);
+        },
+        () => {} // reject 视为取消关闭（方便直接把 $baseConfirm 的 promise 丢回来）
+      );
+    },
+    doRemoveTab(targetName) {
+      let tabNameEnable = this.tabNameEnable;
+      let paneKeyName = this.paneKeyName;
+      let tabIndex = this.tabs.findIndex((tab) => {
+        if (tabNameEnable) {
+          return tab.tabName === targetName;
+        } else {
+          return tab.data[paneKeyName] + "" === targetName;
+        }
+      });
+      if (this.activeName === targetName) {
+        if (tabIndex > 0) {
+          let prev = this.tabs[tabIndex - 1];
+          this.activeName = tabNameEnable
+            ? prev.tabName
+            : prev.data[paneKeyName] + "";
+        } else {
+          this.activeName = "second";
+        }
+      }
+      if (tabIndex !== -1) {
+        this.tabs.splice(tabIndex, 1);
+      }
+      this.$emit("removeTab", targetName);
+    },
+    getCurrentPaneName() {
+      return this.getCurrntPaneTarget().paneName;
+    },
+    getCurrntPaneTarget() {
+      let panes = this.$refs.tabs.panes;
+      let target = panes.find((pane) => pane.active);
+      return target;
+    },
+    reloadTabContent(target, param, tab) {
+      let updateParam =
+        param != null && param.updateParam != null ? param.updateParam : {};
+      for (let key in updateParam) {
+        target.$emit("update:" + key, updateParam[key]);
+      }
+
+      if (!tab) {
+        let activeName = this.activeName;
+        tab = this.tabs.find((item) => item.paneName == activeName);
+      }
+      if (tab) {
+        tab.showContent = false;
+        return new Promise((resolve) => {
+          setTimeout(() => {
+            tab.showContent = true;
+            this.$nextTick(resolve);
+          }, 200);
+        });
+      }
+      return Promise.resolve();
+    },
+    tabClick(targetName) {
+      this.$emit("tabClick", targetName);
+    },
+  },
+};
+</script>
+<style scoped></style>

package/src/components/wf/content.vue

@@ -6,9 +6,15 @@
     v-if="!isHideWf"
   >
     <template #default>
+      <!-- 审批按钮条：标题栏那份挂上后（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"
@@ -97,6 +103,7 @@
         </el-button>
         <addOpinionButton
           v-if="showAddOpinionButton"
+          ref="addOpinionBtn"
           @confirm="reloadContent()"
           :wfInfo="wfInfo"
           :wfSendTaskId="wfSendTaskId"
@@ -625,6 +632,8 @@
         </span>
       </el-dialog>
 
+      <!-- append-to-body 必须留着：本弹框在 baseTabPane 的 v-show 子树里，
+           「流程信息」一折叠就跟着 display:none，标题栏那份审批入口点了会毫无反应 -->
       <el-dialog
         v-if="rejectDialogVisible"
         :visible.sync="rejectDialogVisible"
@@ -634,6 +643,7 @@
         custom-class="dialog-style wf-dialog"
         v-el-drag-dialog
         v-el-dialog-center
+        :append-to-body="true"
       >
         <template #title>
           <span class="el-dialog__title"
@@ -711,6 +721,7 @@
           </el-button>
         </span>
       </el-dialog>
+      <!-- 同上：折叠态下要能弹出来，append-to-body 不能去掉 -->
       <el-dialog
         v-if="agreeDialogVisible"
         :visible.sync="agreeDialogVisible"
@@ -720,6 +731,7 @@
         custom-class="dialog-style wf-dialog"
         v-el-drag-dialog
         v-el-dialog-center
+        :append-to-body="true"
       >
         <template #title>
           <span class="el-dialog__title"
@@ -935,6 +947,7 @@
           >
         </span>
       </el-dialog>
+      <!-- 同上：折叠态下要能弹出来，append-to-body 不能去掉 -->
       <el-dialog
         v-if="revokeDialogVisible"
         :visible.sync="revokeDialogVisible"
@@ -944,6 +957,7 @@
         custom-class="dialog-style wf-dialog"
         v-el-drag-dialog
         v-el-dialog-center
+        :append-to-body="true"
       >
         <template #title>
           <span class="el-dialog__title"

package/src/components/wf/content2.vue

@@ -38,10 +38,12 @@
                      @click="openUrgingDialog(null)" v-show="wfInfo.toInterrupt">催办
           </el-button>
           <el-button type="primary" class="btn" :class="{on:operateType == 'addIncreaseSign'}"
-                     @click="openAddIncreaseSign('addIncreaseSign')" v-show="wfInfo.toAddIncreaseSign">加签
+                     @click="openAddIncreaseSign('addIncreaseSign')"
+                     v-show="increaseSignEnabled && wfInfo.toAddIncreaseSign">加签
           </el-button>
           <el-button type="primary" class="btn" :class="{on:operateType == 'deleteIncreaseSign'}"
-                     @click="openDeleteTaskUserDialog(null)" v-show="wfInfo.toDeleteIncreaseSign">
+                     @click="openDeleteTaskUserDialog(null)"
+                     v-show="increaseSignEnabled && wfInfo.toDeleteIncreaseSign">
             减签
           </el-button>
           <el-button type="primary" class="btn" :class="{on:operateType == 'setCandidate'}"

package/src/components/wf/wf.js

@@ -3,6 +3,8 @@ import {getToken} from "../../utils/auth";
 import settingConfig from "@/settings.js";
 import {selectDialogMixins} from "../../mixins/selectDialog";
 import {requireViewCompat} from "@base/utils/resolveViewComponent";
+import {getWfButtonNames, loadWfButtonNames} from "./wfButtonName";
+import {isWfAutoConfirm, loadWfAutoConfirm} from "./wfAutoConfirm";
 
 let configUtil = {
   baseUrl: process.env.VUE_APP_BASE_API,
@@ -384,6 +386,8 @@ wfContentMixin = {
       candidateDatas:[],
       wfSendTaskId: null,
       showAddOpinionButton: false,
+      //标题栏那份审批入口挂上后为 true，流程模块按钮条据此 v-show 隐藏
+      headerActionsMounted: false,
 
       addOpinionEnabled: false,
       modifyCurrentCandidateEnabled: false,
@@ -1681,7 +1685,9 @@ wfStartMixin = {
       wfUserRangeEnabled: false,
       preStartResult:[],
       showSetCandidateDialog2:false,
-      wfSubmitted: false
+      wfSubmitted: false,
+      //param19 自动确认：确认框延后到 subWfStartForm(保存之后、preStart 之后)再决定弹不弹
+      deferStartConfirm: false
     };
   },
   computed: {
@@ -1707,6 +1713,50 @@ wfStartMixin = {
         });
       })
     },
+    buildStartFormData(){
+      return {
+        modelId: this.wfStartForm.modelId,
+        objTypeCode: this.code,
+        objId: this.dataId,
+        formData: this.startParam || {},
+        formCode: this.formCode || null
+        // name:this.wfName
+      };
+    },
+    //启动确认框的默认文案。param18 配了按钮名就跟随它，没配维持原有的 $t2 兜底链。
+    async getDefaultStartTip(){
+      await loadWfButtonNames(getTarget(this));
+      let btnName = getWfButtonNames().submitBtn;
+      if (btnName) {
+        //只能用 $t1(找不到 key 原样返回)，$t2 在 i18n 命中 key 时会把拼进去的名字吞掉
+        return this.$t1(`您确定要${btnName}吗？`);
+      }
+      let wfStartOperateName =
+        settingConfig.wfStartOperateName ||
+        settingConfig.wfStartButtonName ||
+        "启动流程";
+      return this.$t2(
+        "您确定要" + wfStartOperateName + "吗？",
+        'components.wf.startTip'
+      );
+    },
+    /**
+     * param19 延后的那道确认框，由 subWfStartForm 在 preStart 之后调。
+     * @returns {Promise<Boolean>} true 继续启动，false 已取消
+     */
+    async confirmDeferredStart(){
+      let that = getTarget(this);
+      let startTip = await this.getDefaultStartTip();
+      try {
+        await that.$baseConfirm(startTip);
+        return true;
+      } catch (e) {
+        //这时候单据可能已经被自动保存过了，必须走 close() 触发 onCancel，
+        //否则宿主那边的提交态(bizTab 的 billSubmitting 之类)没人来解，保存按钮会永久禁用。
+        this.close();
+        return false;
+      }
+    },
     initWfUserRangeParam(){
       let that = getTarget(this);
       return that.$http({
@@ -1783,16 +1833,25 @@ wfStartMixin = {
               }
             );
           }
-          let wfStartOperateName =
-            settingConfig.wfStartOperateName ||
-            settingConfig.wfStartButtonName ||
-            "启动流程";
-          let defaultStartTip = "您确定要" + wfStartOperateName + "吗？";
           let startTip;
           if (typeof customStartTip === "string" && customStartTip.trim()) {
+            //模板脚本 wfStartConfirmText 自定义的提示语：多是金额超限之类的业务告警，
+            //必须由人确认，不受 param19 自动确认影响。
             startTip = customStartTip;
           } else {
-            startTip = this.$t2(defaultStartTip, 'components.wf.startTip');
+            //系统默认文案才受自动确认开关管
+            await loadWfAutoConfirm(that);
+            //param12 关着时压根不会有「修改候选人」弹框，延后就没有意义，
+            //确认框留在原位(保存之前)；两个开关都为 true 才延后。
+            if (isWfAutoConfirm() && this.wfUserRangeEnabled) {
+              //确认框延后到 subWfStartForm：那里才是「单据已保存(如果开了自动保存)、
+              //preStart 也探过」的时点。探到候选人就由「修改候选人」弹框顶替这道确认框，
+              //探不到才把它补上——没有候选人弹框时它是唯一的把关，不能省。
+              this.deferStartConfirm = true;
+              this.startSubmit();
+              return;
+            }
+            startTip = await this.getDefaultStartTip();
           }
           that
             .$baseConfirm(startTip)
@@ -1827,30 +1886,22 @@ wfStartMixin = {
         return false;
       }
 
-      let option = this.option;
-
-      var objId = this.dataId;
-
-      let startParam = this.startParam || {};
-      let formCode = this.formCode || null;
-
-      var data = {
-        modelId: modelId,
-        objTypeCode: this.code,
-        objId: objId,
-        formData: startParam,
-        formCode: formCode
-        // name:this.wfName
-      };
-      this.startFormData = data;
+      this.startFormData = this.buildStartFormData();
 
       if(this.wfUserRangeEnabled){
         this.preStartResult = await this.preStart() || []
         if(this.preStartResult.length){
+          //有候选人弹框顶替确认框，param19 延后的那道就不用补了
+          this.deferStartConfirm = false;
           this.openSetCandidateDialog()
           return
         }
       }
+      //没有候选人弹框 → 把 param19 延后的确认框补上（见 initWfInfo）
+      if (this.deferStartConfirm) {
+        this.deferStartConfirm = false;
+        if (!(await this.confirmDeferredStart())) return;
+      }
       this.startSubmitHanlde(this.startFormData);
 
     },

package/src/components/wf/wfActionDropdown.vue

@@ -0,0 +1,85 @@
+<template>
+  <div class="wf-action-dropdown-wrap button-sty" v-show="items.length">
+    <!-- 通过 / 驳回 / 撤回 挪出下拉，在标题栏直接平铺；其余操作仍收在「更多」下拉里 -->
+    <el-button
+      v-for="item in standaloneItems"
+      :key="item.key"
+      :type="item.buttonType || 'primary'"
+      :icon="item.iconClass || item.elIcon"
+      class="button-sty"
+      @click="item.run(wfVm)"
+      >{{ itemLabel(item) }}
+    </el-button>
+    <el-dropdown trigger="hover" v-if="dropdownItems.length">
+      <el-button type="primary" class="button-sty">
+        {{ $t1("更多") }}
+        <i class="el-icon-arrow-down el-icon--right"></i>
+      </el-button>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item
+          v-for="item in dropdownItems"
+          :key="item.key"
+          :icon="item.elIcon"
+          @click.native="item.run(wfVm)"
+        >
+          <i v-if="item.iconClass" :class="item.iconClass"></i>
+          {{ itemLabel(item) }}
+        </el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+  </div>
+</template>
+
+<script>
+import {
+  getVisibleWfActionItems,
+  HEADER_STANDALONE_KEYS,
+} from "./wfActionItems";
+
+export default {
+  name: "WfActionDropdown",
+  props: {
+    // 流程面板实例（content.vue），下拉项显隐读它的 wfInfo，点击调它的方法
+    wfVm: {
+      type: Object,
+      required: true,
+    },
+    // 不收进下拉、直接平铺成独立按钮的操作 key
+    standaloneKeys: {
+      type: Array,
+      default: () => HEADER_STANDALONE_KEYS,
+    },
+  },
+  computed: {
+    // 求值时会读 wfVm 上的响应式字段，跨实例也能跟着流程状态更新
+    items() {
+      return getVisibleWfActionItems(this.wfVm);
+    },
+    standaloneItems() {
+      return this.items.filter((item) => this.isStandalone(item));
+    },
+    dropdownItems() {
+      return this.items.filter((item) => !this.isStandalone(item));
+    },
+  },
+  methods: {
+    isStandalone(item) {
+      return (this.standaloneKeys || []).indexOf(item.key) > -1;
+    },
+    itemLabel(item) {
+      if (item.i18nPath) {
+        return this.$t2(item.defaultLabel, item.i18nPath);
+      }
+      return this.$t1 ? this.$t1(item.defaultLabel) : item.defaultLabel;
+    },
+  },
+};
+</script>
+
+<style scoped>
+/* 标题栏 .fr 内其余按钮都是行内元素，包裹层必须跟着行内排，否则会另起一行 */
+.wf-action-dropdown-wrap {
+  display: inline-block;
+  vertical-align: middle;
+}
+</style>