cloud-web-corejs 1.0.276 → 1.0.277

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>

package/src/components/wf/wfActionItems.js

@@ -0,0 +1,136 @@
+/**
+ * 流程审批操作清单。详情标题栏下拉与流程模块按钮条共用同一套显隐条件，
+ * 避免两处各写一遍之后漂移。
+ *
+ * vm 是 content.vue 实例（挂了 wfContentMixin）。
+ *
+ * buttonType 只在「平铺成独立按钮」时用得上（见 HEADER_STANDALONE_KEYS），
+ * 取值与流程模块按钮条里同名按钮保持一致。
+ */
+
+/* 详情标题栏里不收进下拉、直接平铺成独立按钮的操作。
+   顺序按 getWfActionItems 的定义序，不按这里的书写序。 */
+export const HEADER_STANDALONE_KEYS = ["agree", "reject", "revoke"];
+
+export function getWfActionItems(vm) {
+  let wfInfo = (vm && vm.wfInfo) || {};
+  let toTransfer
+    = wfInfo.toTransfer === null || wfInfo.toTransfer === undefined
+      ? !!wfInfo.toSubmit
+      : !!wfInfo.toTransfer;
+
+  return [
+    {
+      key: "agree",
+      buttonType: "success",
+      show: !!wfInfo.toSubmit,
+      defaultLabel: "通过",
+      i18nPath: "components.wf.agree",
+      iconClass: "iconfont icon-tongguo",
+      run: (wfVm) => wfVm.openAgreeDialog(),
+    },
+    {
+      key: "manual",
+      buttonType: "warning",
+      show: !!wfInfo.toInterrupt,
+      defaultLabel: "中断",
+      i18nPath: "components.wf.manual",
+      iconClass: "iconfont icon-caozuozhongduan",
+      run: (wfVm) => wfVm.openManualDialog(),
+    },
+    {
+      key: "reject",
+      buttonType: "danger",
+      show: !!wfInfo.toReject,
+      defaultLabel: "驳回",
+      i18nPath: "components.wf.reject",
+      iconClass: "iconfont icon-a-bohui1",
+      run: (wfVm) => wfVm.rejectWfTask(),
+    },
+    {
+      key: "transfer",
+      buttonType: "primary",
+      show: toTransfer,
+      defaultLabel: "转办",
+      i18nPath: "components.wf.transfer",
+      iconClass: "iconfont icon-zhuanban",
+      run: (wfVm) => wfVm.openChangeWfForm(),
+    },
+    {
+      key: "urging",
+      buttonType: "primary",
+      show: !!wfInfo.toInterrupt,
+      defaultLabel: "催办",
+      i18nPath: "components.wf.urging",
+      iconClass: "iconfont icon-cuiban",
+      run: (wfVm) => wfVm.openUrgingDialog(),
+    },
+    {
+      key: "addIncreaseSign",
+      buttonType: "primary",
+      show: !!(vm.increaseSignEnabled && wfInfo.toAddIncreaseSign),
+      defaultLabel: "加签",
+      i18nPath: "components.wf.addIncreaseSign",
+      elIcon: "el-icon-plus",
+      run: (wfVm) => wfVm.openAddIncreaseSign(),
+    },
+    {
+      key: "deleteIncreaseSign",
+      buttonType: "primary",
+      show: !!(vm.increaseSignEnabled && wfInfo.toDeleteIncreaseSign),
+      defaultLabel: "减签",
+      i18nPath: "components.wf.deleteIncreaseSign",
+      elIcon: "el-icon-delete",
+      run: (wfVm) => wfVm.openDeleteTaskUserDialog(),
+    },
+    {
+      key: "talk",
+      buttonType: "primary",
+      show: !!(vm.toTalk && wfInfo.toLinkup),
+      defaultLabel: "沟通",
+      i18nPath: "components.wf.talk",
+      elIcon: "el-icon-chat-dot-square",
+      run: (wfVm) => wfVm.openTalkDialog(),
+    },
+    {
+      key: "setCandidate",
+      buttonType: "primary",
+      show: !!wfInfo.toSetCandidate,
+      defaultLabel: "修改候选人",
+      i18nPath: "components.wf.setCandidate",
+      elIcon: "el-icon-user",
+      run: (wfVm) => wfVm.openSetCandidateDialog(null),
+    },
+    {
+      key: "revoke",
+      buttonType: "danger",
+      show: !!wfInfo.toRevoke,
+      defaultLabel: "撤回",
+      i18nPath: "components.wf.revoke",
+      elIcon: "el-icon-document-delete",
+      run: (wfVm) => wfVm.openRevokeDialog(null),
+    },
+    {
+      key: "addOpinion",
+      buttonType: "primary",
+      show: !!vm.showAddOpinionButton,
+      defaultLabel: "补充意见",
+      run: (wfVm) => {
+        let btn = wfVm.$refs && wfVm.$refs.addOpinionBtn;
+        if (btn && btn.openDialog) btn.openDialog();
+      },
+    },
+    {
+      key: "editScript",
+      buttonType: "primary",
+      show: !!wfInfo.wfAdmin,
+      defaultLabel: "修改脚本",
+      elIcon: "el-icon-edit",
+      run: (wfVm) => wfVm.openWfFlowEleScriptDialog(),
+    },
+  ];
+}
+
+export function getVisibleWfActionItems(vm) {
+  return getWfActionItems(vm).filter((item) => item.show);
+}

package/src/components/wf/wfAutoConfirm.js

@@ -0,0 +1,55 @@
+/**
+ * 流程提交确认框自动确认：由后台 wf_diy_attribute 的 param19 统一维护，全局拉取一次后缓存。
+ * 返回 true 时，「提交流程」「保存并提交流程」的系统默认确认框不再弹，直接按「确定」处理。
+ *
+ * 不含表单模板脚本 wfStartConfirmText 自定义的提示语——业务方常拿它做金额超限之类的告警，
+ * 那种提示必须由人确认，不能被这个全局开关吞掉(判定在 wf.js 的启动确认分支)。
+ */
+import Vue from "vue";
+
+/* 与 wfButtonName.js 同款：缓存必须是响应式的，值后到时读取方才能重算。
+   这里语义是「没配就不自动确认」，所以初值直接给 false，不需要区分未配置。 */
+const wfAutoConfirm = Vue.observable({
+  enabled: false,
+});
+
+let pending = null;
+
+export function isWfAutoConfirm() {
+  return wfAutoConfirm.enabled === true;
+}
+
+/**
+ * 拉取自动确认开关。全局只发一次请求，重复调用复用同一个 promise。
+ * @param {Object} vm 任意 Vue 实例(取 $http)，不传则退回 window.$vueRoot
+ * @returns {Promise<Boolean>}
+ */
+export function loadWfAutoConfirm(vm) {
+  if (pending) return pending;
+  let target = vm || window.$vueRoot;
+  if (!target || !target.$http) return Promise.resolve(wfAutoConfirm.enabled);
+  let errored = false;
+  let request = new Promise((resolve) => {
+    target.$http({
+      url: USER_PREFIX + "/wf_diy_attribute/getValue",
+      method: "post",
+      data: { attributeKey: "param19" },
+      success: (res) => {
+        let val = res ? res.objx : null;
+        //后台可能回布尔也可能回字符串，两种都认；其余(含没配)一律当关
+        wfAutoConfirm.enabled = val === true || val === "true";
+        resolve(wfAutoConfirm.enabled);
+      },
+      fail: () => resolve(wfAutoConfirm.enabled),
+      error: () => {
+        errored = true;
+        pending = null; //失败不锁死，下次进流程表单可重试
+        resolve(wfAutoConfirm.enabled);
+      },
+    });
+  });
+  //回调若是同步回来的(拦截器短路、单测桩)，上面那句 pending = null 会被下面这句盖掉，
+  //于是重试永远拿到那个已 settle 的旧 promise —— 用 errored 补一刀。
+  pending = errored ? null : request;
+  return request;
+}

package/src/components/wf/wfButtonName.js

@@ -0,0 +1,60 @@
+/**
+ * 流程按钮名：由后台 wf_diy_attribute 的 param18 统一维护，全局拉取一次后缓存。
+ * 接口返回形如 {submitBtn: "提交流程", saveSubmitBtn: "保存并提交流程"}，未配置时用下面的默认值。
+ */
+import Vue from "vue";
+
+export const DEFAULT_SUBMIT_BTN = "提交流程";
+export const DEFAULT_SAVE_SUBMIT_BTN = "保存并提交流程";
+
+/* 按钮通常先渲染、接口值后到，所以缓存必须是响应式的，读取方(computed)才能在值回来后自动重算。
+   初值留 null 是为了区分「后台没配」与「后台配的正好是默认值」——没配时才轮得到下游兜底。 */
+const wfButtonNames = Vue.observable({
+  submitBtn: null,
+  saveSubmitBtn: null,
+});
+
+let pending = null;
+
+export function getWfButtonNames() {
+  return wfButtonNames;
+}
+
+/**
+ * 拉取按钮名。全局只发一次请求，重复调用复用同一个 promise。
+ * @param {Object} vm 任意 Vue 实例(取 $http)，不传则退回 window.$vueRoot
+ */
+export function loadWfButtonNames(vm) {
+  if (pending) return pending;
+  let target = vm || window.$vueRoot;
+  if (!target || !target.$http) return Promise.resolve(wfButtonNames);
+  pending = new Promise((resolve) => {
+    target.$http({
+      url: USER_PREFIX + "/wf_diy_attribute/getValue",
+      method: "post",
+      data: { attributeKey: "param18" },
+      success: (res) => {
+        let val = res ? res.objx : null;
+        if (typeof val === "string") {
+          //后台可能存的是 JSON 文本，解析不出就当没配
+          try {
+            val = JSON.parse(val);
+          } catch (e) {
+            val = null;
+          }
+        }
+        if (val && typeof val === "object") {
+          wfButtonNames.submitBtn = val.submitBtn || null;
+          wfButtonNames.saveSubmitBtn = val.saveSubmitBtn || null;
+        }
+        resolve(wfButtonNames);
+      },
+      fail: () => resolve(wfButtonNames),
+      error: () => {
+        pending = null; //失败不锁死，下次进流程表单可重试
+        resolve(wfButtonNames);
+      },
+    });
+  });
+  return pending;
+}

package/src/components/wf/wfUserRange.js

@@ -0,0 +1,53 @@
+/**
+ * 「节点候选人范围」开关：后台 wf_diy_attribute 的 param12，全局拉取一次后缓存。
+ * 开着时启动流程会先打 /wf/preStart，返回候选人则弹「修改候选人」弹框(见 wf.js subWfStartForm)。
+ *
+ * wfStartDialog 内部另有一份 initWfUserRangeParam()，每次开弹框现取，那份是启动流程的权威判定，
+ * 不动它。这里这份只服务于弹框之外的调用方——「保存并提交」要在**保存之前**就知道这个开关，
+ * 才能决定确认框是当场弹(param12 关，后面不可能有候选人弹框)还是延后给弹框(param12 开)。
+ */
+import Vue from "vue";
+
+const wfUserRange = Vue.observable({
+  enabled: false,
+});
+
+let pending = null;
+
+export function isWfUserRangeEnabled() {
+  return wfUserRange.enabled === true;
+}
+
+/**
+ * 拉取开关。全局只发一次请求，重复调用复用同一个 promise。
+ * @param {Object} vm 任意 Vue 实例(取 $http)，不传则退回 window.$vueRoot
+ * @returns {Promise<Boolean>}
+ */
+export function loadWfUserRange(vm) {
+  if (pending) return pending;
+  let target = vm || window.$vueRoot;
+  if (!target || !target.$http) return Promise.resolve(wfUserRange.enabled);
+  let errored = false;
+  let request = new Promise((resolve) => {
+    target.$http({
+      url: USER_PREFIX + "/wf_diy_attribute/getValue",
+      method: "post",
+      data: { attributeKey: "param12" },
+      success: (res) => {
+        let val = res ? res.objx : null;
+        //与 wf.js initWfUserRangeParam 同口径，字符串 "true" 一并认
+        wfUserRange.enabled = val === true || val === "true";
+        resolve(wfUserRange.enabled);
+      },
+      fail: () => resolve(wfUserRange.enabled),
+      error: () => {
+        errored = true;
+        pending = null; //失败不锁死，下次进流程表单可重试
+        resolve(wfUserRange.enabled);
+      },
+    });
+  });
+  //回调同步回来时(拦截器短路、单测桩)，上面那句 pending = null 会被下面这句盖掉，补一刀
+  pending = errored ? null : request;
+  return request;
+}