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

package/src/components/table/vxeFilter/mixin.js

@@ -2,7 +2,8 @@
 // initVxeTable 只把 getCellValue/createParams 挂在初始化时的那个 xTable 实例上，
 // 页面若用 v-if 销毁重建 vxe-grid（如 product_problem_record/list.vue），
 // 新实例上没有这两个方法，筛选面板会报 $table.getCellValue is not a function
-import { getCellValue, createParams } from "../util/index";
+// （createParams 已不再直接使用：候选值取值统一走下面 load() 里的 readCellValue 缓存）
+import { getCellValue } from "../util/index";
 
 let modules = {};
 
@@ -54,15 +55,34 @@ modules = {
         let valMap =
           option.data && option.data.valMap ? option.data.valMap : null;
 
-        let lsm = {};
-        let colValList = [];
-        fullData.map((row, $rowIndex) => {
-          let cellValue = getCellValue({
+        // 取值可能落到 getCellValue 的兜底渲染：非 filterVal 白名单的组件列每个单元格
+        // 都要 new Vue + $mount + 爬 DOM，还会跑一遍用户的表单脚本。而本方法要把全表
+        // 跑三遍（候选值 → 按其他筛选列过滤 → 过滤后计数），行多列宽时打开一次筛选面板
+        // 就是几千次同步挂载，主线程直接定住。同一 (列, 行) 只算一次。
+        // 注：第三遍原本按过滤后子集的下标取值，改用缓存后统一为整表下标——只有依赖
+        // 行下标的自定义渲染列会有差异，而这类列本就不该出现在值列表筛选里。
+        let cellValueCache = new Map();
+        const readCellValue = (row, col, $rowIndex) => {
+          let colCache = cellValueCache.get(col);
+          if (!colCache) {
+            colCache = new Map();
+            cellValueCache.set(col, colCache);
+          }
+          if (colCache.has(row)) return colCache.get(row);
+          let value = getCellValue({
             row,
             $rowIndex,
             $table,
-            column,
+            column: col,
           });
+          colCache.set(row, value);
+          return value;
+        };
+
+        let lsm = {};
+        let colValList = [];
+        fullData.map((row, $rowIndex) => {
+          let cellValue = readCellValue(row, column, $rowIndex);
           let sortValue = cellValue
           let sortField = column.params?.sortField;
           if(sortField){
@@ -106,24 +126,14 @@ modules = {
               return false;
             }
             const vals = option1.data.vals || [];
-            let param = createParams({
-              $table: $table,
-              row,
-              column: filterColumn,
-            });
-            let cellValue = getCellValue(param);
+            let cellValue = readCellValue(row, filterColumn);
             return !vals.includes(cellValue);
           });
           return item == null;
         });
         let lsm2 = {};
         datas.map((row, $rowIndex) => {
-          let cellValue = getCellValue({
-            row,
-            $rowIndex,
-            $table,
-            column,
-          });
+          let cellValue = readCellValue(row, column, $rowIndex);
           if (lsm2[cellValue]) {
             lsm2[cellValue].count = lsm2[cellValue].count + 1;
           } else {

package/src/components/wf/content.vue

@@ -45,9 +45,10 @@
           class="button-sty"
           @click="openChangeWfForm"
           v-show="
-            wfInfo.toTransfer === null || wfInfo.toTransfer === undefined
+            transferEnabled &&
+            (wfInfo.toTransfer === null || wfInfo.toTransfer === undefined
               ? wfInfo.toSubmit
-              : wfInfo.toTransfer
+              : wfInfo.toTransfer)
           "
           icon="iconfont icon-zhuanban"
           >{{ $t2("转办", "components.wf.transfer") }}

package/src/components/wf/content2.vue

@@ -32,7 +32,7 @@
                      @click="rejectWfTask('reject')" v-show="wfInfo.toReject">驳回
           </el-button>
           <el-button type="primary" class="btn" :class="{on:operateType == 'transfer'}"
-                     @click="openChangeWfForm('transfer')" v-show="wfInfo.toSubmit">转办
+                     @click="openChangeWfForm('transfer')" v-show="transferEnabled && wfInfo.toSubmit">转办
           </el-button>
           <el-button type="primary" class="btn" :class="{on:operateType == 'urging'}"
                      @click="openUrgingDialog(null)" v-show="wfInfo.toInterrupt">催办

package/src/components/wf/style.scss

@@ -0,0 +1,265 @@
+// Core workflow panel chrome extracted from the app stylesheet.
+@import "~@base/styles/variables.scss";
+
+.task-situation {
+  font-size: $fontSizeBase;
+  .item {
+    display: -moz-box;
+    display: -webkit-box;
+    display: box;
+    line-height: 1.4;
+    padding: 6px 14px;
+    position: relative;
+    &:after {
+      content: "";
+      width: 2px;
+      position: absolute;
+      background: #e9e9e9;
+      top: 22px;
+      bottom: -10px;
+      left: 172px;
+      z-index: 2;
+    }
+    &:last-child:after {
+      display: none;
+    }
+    &:hover {
+      background: #fafdff;
+    }
+    .time {
+      color: #666;
+      width: 82px;
+    }
+    .status {
+      width: 50px;
+      line-height: 16px;
+      padding: 2px 0;
+      height: 100%;
+      text-align: center;
+      border-radius: 22px;
+      vertical-align: middle;
+      background: #fff;
+      border: 1px solid #dcdfe6;
+      color: #606266;
+      &.green {
+        border: solid 1px #acedc9;
+        background: #e7faf0;
+        color: #67c23a;
+      }
+      &.red {
+        border: solid 1px #ffcaca;
+        background: #ffeded;
+        color: #f56c6c;
+      }
+      &.gray {
+        color: #d6d6d6;
+        background: #f4f4f5;
+        border-color: #d3d4d6;
+      }
+      &.orgn {
+        color: #e6a23c;
+        background: #fdf6ec;
+        border-color: #f5dab1;
+      }
+      &.blue {
+        background-color: transparentize($baseColor, 0.94);
+        color: $baseColor;
+        border: solid 1px transparentize($baseColor, 0.72);
+      }
+    }
+    .circle {
+      background: $baseColor;
+      width: 14px;
+      height: 14px;
+      border-radius: 50%;
+      border: solid 3px #fff;
+      display: inline-block;
+      margin: 3px 20px;
+      z-index: 9;
+    }
+    .info {
+      -moz-box-flex: 1;
+      -webkit-box-flex: 1;
+      box-flex: 1;
+      p {
+        margin: 2px 0;
+        width: calc(100vw - 500px);
+        display: block;
+        > span {
+          margin-right: 25px;
+          min-width: 256px;
+          display: inline-block;
+          &.name {
+            font-weight: 600;
+          }
+          span {
+            width: 202px;
+            vertical-align: text-top;
+            display: inline-block;
+          }
+        }
+        &.t {
+          display: flex;
+          .t1 {
+            min-width: 65px;
+            margin-right: 0;
+            flex: none;
+          }
+          span {
+            flex: 1;
+            white-space: pre-line;
+          }
+        }
+      }
+    }
+  }
+}
+
+//flow
+.flow-tree {
+  position: relative;
+  padding-right: 240px;
+  .flow-box {
+    height: 380px;
+    vertical-align: middle;
+    width: 100%; /*display: table-cell;苹果有问题*/
+    img {
+      max-width: 100%;
+      max-height: 100%;
+    }
+    .btn-magnifier {
+      position: absolute;
+      background-color: #fff;
+      border-radius: 50%;
+      font-size: 32px;
+      right: 282px;
+      top: 0;
+      color: $baseColor;
+      cursor: pointer;
+    }
+  }
+  .flow-form {
+    position: absolute;
+    right: 20px;
+    top: 72px;
+    width: 238px;
+    border: solid 1px $borderColor;
+    border-radius: 4px;
+    padding: 8px 10px;
+    background: #f7f7f7;
+    font-size: $fontSizeBase;
+    .txt {
+      width: 100%;
+      height: 183px;
+      background: #fff;
+      border-radius: 4px;
+      border: solid 1px $borderColor;
+      padding: 8px;
+      line-height: 1.8;
+    }
+    .btn {
+      width: calc(50% - 10px);
+      display: inline-block;
+      float: left;
+      margin: 6px 5px;
+      font-size: $fontSizeBase;
+      &.b {
+        width: calc(100% - 10px);
+      }
+      &.el-button--warning {
+        &:active,
+        &:focus {
+          color: #e6a700;
+        }
+      }
+      &.el-button--success {
+        &:active,
+        &:focus {
+          color: #11b95c;
+        }
+      }
+      &.el-button--danger {
+        &:active,
+        &:focus {
+          color: #ff4949;
+        }
+      }
+      &.el-button--primary {
+        &:active,
+        &:focus {
+          color: $baseColor;
+        }
+      }
+    }
+  }
+}
+.flow-btn-opeaBtn {
+  margin-bottom: 14px;
+  margin-top: -7px;
+  .btn {
+    width: 74px;
+    height: 32px;
+    background: #eeeeee;
+    border-radius: 8px;
+    padding: 0;
+    font-size: $fontSizeBase;
+    border: none;
+    color: #808080;
+    outline: none !important;
+    position: relative;
+    box-shadow: none !important;
+    &:before {
+      content: "";
+      border: solid 3px #9e9e9e;
+      width: 10px;
+      height: 10px;
+      display: inline-block;
+      vertical-align: middle;
+      border-radius: 50%;
+      margin-right: 4px;
+    }
+    span {
+      vertical-align: middle;
+    }
+    &:hover {
+      color: $baseColor;
+      &:before {
+        border-color: $baseColor;
+      }
+    }
+    &.on {
+      background-color: $baseColor;
+      color: #fff;
+      &:after {
+        content: "";
+        position: absolute;
+        border-top: solid 4px $baseColor;
+        border-left: solid 5px transparent;
+        border-right: solid 5px transparent;
+        left: 50%;
+        margin-left: -4px;
+        bottom: -6px;
+      }
+      &:before {
+        border-color: #fff;
+      }
+    }
+  }
+}
+.flow-btn-opeaBox {
+  border: solid 1px #eee;
+  padding: 8px 0 10px;
+  margin-bottom: 12px;
+  .tit {
+    display: inline-block;
+    background: #edf0f2;
+    margin: 0 0 6px 12px;
+    padding: 4px 8px;
+    font-size: 13px;
+    color: #333;
+    i {
+      margin-right: 4px;
+      color: $baseColor;
+    }
+  }
+}

package/src/components/wf/wf.js

@@ -5,6 +5,7 @@ import {selectDialogMixins} from "../../mixins/selectDialog";
 import {requireViewAsync} from "@base/utils/resolveViewComponent";
 import {getWfButtonNames, loadWfButtonNames} from "./wfButtonName";
 import {isWfAutoConfirm, loadWfAutoConfirm} from "./wfAutoConfirm";
+import {isWfTransferEnabled, loadWfTransferEnabled} from "./wfTransferEnabled";
 
 let configUtil = {
   baseUrl: process.env.VUE_APP_BASE_API,
@@ -237,6 +238,10 @@ wfContentMixin = {
       let that = this.viewTarget;
       let _hideWf = that._hideWf || that.$attrs._hideWf;
       return _hideWf === true || _hideWf === 'true';
+    },
+    //转办：param20，未配置默认开启。读 observable，接口回来后按钮条会重算
+    transferEnabled() {
+      return isWfTransferEnabled();
     }
   },
   data() {
@@ -555,6 +560,8 @@ wfContentMixin = {
     },
     initForAll() {
       let that = getTarget(this);
+      //转办 param20：与 initWf 并行拉，未配置默认开
+      loadWfTransferEnabled(that);
       this.initWf(() => {
         if (this.wfInfo.procInstId) {
           this.initCurrentTask(this.wfInfo.procInstId, () => {

package/src/components/wf/wfActionItems.js

@@ -7,6 +7,7 @@
  * buttonType 只在「平铺成独立按钮」时用得上（见 HEADER_STANDALONE_KEYS），
  * 取值与流程模块按钮条里同名按钮保持一致。
  */
+import { isWfTransferEnabled } from "./wfTransferEnabled";
 
 /* 详情标题栏里不收进下拉、直接平铺成独立按钮的操作。
    顺序按 getWfActionItems 的定义序，不按这里的书写序。 */
@@ -18,6 +19,8 @@ export function getWfActionItems(vm) {
     = wfInfo.toTransfer === null || wfInfo.toTransfer === undefined
       ? !!wfInfo.toSubmit
       : !!wfInfo.toTransfer;
+  //param20 关掉时整项不出，哪怕节点本身允许转办
+  toTransfer = isWfTransferEnabled() && toTransfer;
 
   return [
     {

package/src/components/wf/wfStartDialog.vue

@@ -3,6 +3,7 @@
     <el-dialog
       :title="$t2('流程启动', 'components.wf.wfStart')"
       :visible.sync="showDialog"
+      :width="option && option.layoutType === 'H5' ? 'calc(100% - 32px)' : undefined"
       v-if="showDialog"
       :modal-append-to-body="false"
       @close="close"

package/src/components/wf/wfTransferEnabled.js

@@ -0,0 +1,54 @@
+/**
+ * 流程转办开关：后台 wf_diy_attribute 的 param20，全局拉取一次后缓存。
+ * 格式 true/false，未配置时默认开启。
+ */
+import Vue from "vue";
+
+const wfTransfer = Vue.observable({
+  enabled: true,
+});
+
+let pending = null;
+
+function parseEnabled(val) {
+  //只认明确关掉；布尔 false 和字符串 "false" 都关，其余(含没配)一律开
+  if (val === false || val === "false") return false;
+  return true;
+}
+
+export function isWfTransferEnabled() {
+  return wfTransfer.enabled !== false;
+}
+
+/**
+ * 拉取转办开关。全局只发一次请求，重复调用复用同一个 promise。
+ * @param {Object} vm 任意 Vue 实例(取 $http)，不传则退回 window.$vueRoot
+ * @returns {Promise<Boolean>}
+ */
+export function loadWfTransferEnabled(vm) {
+  if (pending) return pending;
+  let target = vm || window.$vueRoot;
+  if (!target || !target.$http) return Promise.resolve(wfTransfer.enabled);
+  let errored = false;
+  let request = new Promise((resolve) => {
+    target.$http({
+      url: USER_PREFIX + "/wf_diy_attribute/getValue",
+      method: "post",
+      data: { attributeKey: "param20" },
+      success: (res) => {
+        let val = res ? res.objx : null;
+        wfTransfer.enabled = parseEnabled(val);
+        resolve(wfTransfer.enabled);
+      },
+      fail: () => resolve(wfTransfer.enabled),
+      error: () => {
+        errored = true;
+        pending = null; //失败不锁死，下次进流程表单可重试
+        resolve(wfTransfer.enabled);
+      },
+    });
+  });
+  //回调若是同步回来的(拦截器短路、单测桩)，上面那句 pending = null 会被下面这句盖掉
+  pending = errored ? null : request;
+  return request;
+}

package/src/components/wf/wfUtil.js

@@ -1,6 +1,7 @@
 import Vue from 'vue';
 import settingConfig from '@/settings.js'
-import { scrollIntoScrollParent } from '@base/utils/scrollUtil';
+import { scrollIntoScrollParent } from '@base/utils/scrollUtil';
+import { isWfInfoHidden } from '@base/components/wf/wfVisibility';
 
 let f;
 let configUtil = {
@@ -48,26 +49,36 @@ f = async function (option) {
        content.vue 里的 $http 回调/定时器还会回来调宿主方法，
        它内部那些 append-to-body 的 popover/dialog 的 DOM 也没人收。
        页签模式下详情会被反复重挂载，一次一份，所以统一登记、挂到宿主的销毁钩子上回收。 */
-    let instances = [];
-    let disposed = false;
-    let registerDispose = () => {
-      if (!instances.length || !that.$once) return;
-      that.$once("hook:beforeDestroy", () => {
-        disposed = true;
-        instances.forEach((vm) => {
-          try {
-            vm.$destroy(); //会级联销毁子组件，append-to-body 的那些 el 由它们自己的 destroyed 摘掉
-            //$destroy 不管 DOM，自己收一下（宿主子树里的那份本来也会被父级移除）
-            if (vm.$el && vm.$el.parentNode) vm.$el.parentNode.removeChild(vm.$el);
-          } catch (e) {
-            //拆的时候出问题不要拖累宿主销毁
-          }
-        });
-        instances.length = 0;
-      });
-    };
-
-    let done = () => {
+    let instances = [];
+    let disposed = false;
+    let disposeRegistered = false;
+    let renderRevision = 0;
+    let clearInstances = () => {
+      renderRevision++;
+      instances.forEach((vm) => {
+        try {
+          vm.$destroy();
+          if (vm.$el && vm.$el.parentNode) vm.$el.parentNode.removeChild(vm.$el);
+        } catch (e) {
+          //显隐切换或宿主销毁时，单个流程实例回收失败不能影响其余实例
+        }
+      });
+      instances.length = 0;
+    };
+    let registerDispose = () => {
+      if (disposeRegistered || !that.$once) return;
+      disposeRegistered = true;
+      that.$once("hook:beforeDestroy", () => {
+        disposed = true;
+        clearInstances();
+        if (that._refreshWfInfoVisibility === refreshVisibility) {
+          delete that._refreshWfInfoVisibility;
+        }
+      });
+    };
+
+    let done = () => {
+      let currentRevision = ++renderRevision;
       let $wfBtnRegion = that.$refs[option.wfBtnRegion || "wfBtnRegion"];
       let $wfViewRegion = that.$refs[(option.wfViewRegion || "wfViewRegion")];
 
@@ -83,10 +94,9 @@ f = async function (option) {
       let showModifyBtn = option.showModifyBtn != null ? option.showModifyBtn : true;
       let contentInstance = null; //流程面板实例，标题栏下拉要点它的方法
       //宿主声明「不挂流程信息面板」：面板整棵 v-if 掉，标题栏那份审批入口也不能挂
-      let _hideWf = that._hideWf || that.$attrs._hideWf;
-      let isHideWf = _hideWf === true || _hideWf === 'true';
+      let isHideWf = isWfInfoHidden(that, option);
 
-      if (wfInfo) {
+      if (wfInfo && !isHideWf) {
         let wfModel = configUtil.settingConfig.wfModel || 1;
         let url = wfModel == 2 ? '/content2.vue' : '/content.vue';
         let a = configUtil.Vue.extend(configUtil.getWfObj(url));
@@ -106,7 +116,7 @@ f = async function (option) {
         });
         instances.push(instance);
         contentInstance = instance;
-        if (!_hideWf && slideWrap) {
+        if (slideWrap) {
           let navVm = new configUtil.Vue({
             render: function (h) {
               let node = h("div", {}, [
@@ -137,8 +147,8 @@ f = async function (option) {
           if (settingConfig.version == 'oa') {
             slideWrap = slideWrap.children[0];
           }
-          setTimeout(() => {
-            if (disposed) return; //这一步延后了 500ms，期间宿主可能已经销毁
+          setTimeout(() => {
+            if (disposed || currentRevision !== renderRevision) return;
             slideWrap.append(navDom);
             if (that.$attrs.toWfArea) {
               //待办进来，直接跳到流程模块
@@ -225,8 +235,16 @@ f = async function (option) {
         contentInstance.headerActionsMounted = true;
       }
 
-      registerDispose();
-    }
+      registerDispose();
+    }
+
+    let refreshVisibility = () => {
+      if (disposed) return;
+      clearInstances();
+      done();
+    };
+    // xform 的 setWfInfoHidden 可在流程初始化前后调用；初始化后即时重建流程展示区。
+    that._refreshWfInfoVisibility = refreshVisibility;
 
     if (true || wfInfo) {
       if (option.callback) {

package/src/components/wf/wfVisibility.js

@@ -0,0 +1,6 @@
+// 面板显隐独立于流程初始化和启动权限；兼容既有宿主属性。
+export function isWfInfoHidden(host, option = {}) {
+  const attrs = (host && host.$attrs) || {};
+  return [host && host._hideWf, attrs._hideWf, option.hideWfInfo]
+    .some(value => value === true || value === "true");
+}