cloud-web-corejs 1.1.0-dev.31 → 1.1.0-dev.33

package/package.json

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

package/src/components/bizTab/bizBillDetailMixin.js

@@ -43,6 +43,7 @@ import {
   isWfUserRangeEnabled,
   loadWfUserRange,
 } from "@base/components/wf/wfUserRange";
+import { loadWfTransferEnabled } from "@base/components/wf/wfTransferEnabled";
 
 // wf 组件回调 _handleCallback(flag) 的 flag → 页签行为类型
 const WF_FLAG_KIND = {
@@ -185,6 +186,7 @@ export default {
     //预热，点击路径上的 await 直接命中缓存
     loadWfAutoConfirm(this);
     loadWfUserRange(this);
+    loadWfTransferEnabled(this);
     this.checkBillHooks();
     // 登记到宿主：关页签确认要问详情脏没脏、翻单要按 tabName 找回实例
     let host = this.bizTabHost;

package/src/components/mobile/wf/content.vue

@@ -42,7 +42,7 @@
                      icon="iconfont icon-a-bohui1">{{ $t2('驳回', 'components.wf.reject') }}
           </el-button>
           <el-button type="primary" plain class="btn" @click="openChangeWfForm"
-                     v-show="(wfInfo.toTransfer===null || wfInfo.toTransfer===undefined) ? wfInfo.toSubmit: wfInfo.toTransfer"
+                     v-show="transferEnabled && ((wfInfo.toTransfer===null || wfInfo.toTransfer===undefined) ? wfInfo.toSubmit: wfInfo.toTransfer)"
                      icon="iconfont icon-zhuanban">{{ $t2('转办', 'components.wf.transfer') }}
           </el-button>
           <el-button type="primary" plain class="btn" @click="openUrgingDialog" v-show="wfInfo.toInterrupt"
@@ -93,12 +93,12 @@
           <div class="tit"><span>{{
               (wfInfo.createDate ? wfInfo.createDate.substring(0, 10) : '') + wfInfo.name
             }}</span></div>
-          <iframe
-            ref="wfPreviewFrame"
-            style="width: 100%;flex:1"
-            :src="wfImage"
-            @load="fitWorkflowPreview"
-          ></iframe>
+          <iframe
+            ref="wfPreviewFrame"
+            style="width: 100%;flex:1"
+            :src="wfImage"
+            @load="fitWorkflowPreview"
+          ></iframe>
         </el-form>
       </div>
       <span slot="footer" class="dialog-footer">
@@ -407,6 +407,7 @@ import Vue from "vue";
 import settingConfig from "@/settings";
 import commonMixin from "../../../mixins/mobile/common/index";
 import {getToken} from "../../../utils/auth";
+import {isWfTransferEnabled, loadWfTransferEnabled} from "../../wf/wfTransferEnabled";
 
 let configUtil = {
   baseUrl: process.env.VUE_APP_BASE_API,
@@ -464,6 +465,9 @@ export default {
       let that = this.viewTarget;
       let _hideWf = that._hideWf || that.$attrs._hideWf;
       return _hideWf === true || _hideWf === 'true';
+    },
+    transferEnabled() {
+      return isWfTransferEnabled();
     }
   },
   data() {
@@ -625,27 +629,27 @@ export default {
   mounted() {
     this.init();
   },
-  methods: {
-    fitWorkflowPreview() {
-      /* warm-flow-ui 是独立 iframe，窄屏下默认画布宽于视口，左右节点会被
-         它自己的 overflow:hidden 裁掉。复用其「自适应」能力，在数据逐步
-         渲染的几个时点重新 fit；跨域部署时访问 document 会抛错，静默跳过。 */
-      [0, 300, 800, 1500].forEach((delay) => {
-        window.setTimeout(() => {
-          try {
-            const frame = this.$refs.wfPreviewFrame;
-            const buttons = frame?.contentDocument?.querySelectorAll("button") || [];
-            const fitButton = Array.from(buttons).find(
-              (button) => button.textContent.trim() === "自适应"
-            );
-            fitButton?.click();
-          } catch (e) {
-            // 跨域 iframe 无法读取内部 DOM，保留 warm-flow-ui 原有交互。
-          }
-        }, delay);
-      });
-    },
-    getWfStatusLabel() {
+  methods: {
+    fitWorkflowPreview() {
+      /* warm-flow-ui 是独立 iframe，窄屏下默认画布宽于视口，左右节点会被
+         它自己的 overflow:hidden 裁掉。复用其「自适应」能力，在数据逐步
+         渲染的几个时点重新 fit；跨域部署时访问 document 会抛错，静默跳过。 */
+      [0, 300, 800, 1500].forEach((delay) => {
+        window.setTimeout(() => {
+          try {
+            const frame = this.$refs.wfPreviewFrame;
+            const buttons = frame?.contentDocument?.querySelectorAll("button") || [];
+            const fitButton = Array.from(buttons).find(
+              (button) => button.textContent.trim() === "自适应"
+            );
+            fitButton?.click();
+          } catch (e) {
+            // 跨域 iframe 无法读取内部 DOM，保留 warm-flow-ui 原有交互。
+          }
+        }, delay);
+      });
+    },
+    getWfStatusLabel() {
       return this.wfStatusMap[this.wfInfo.stat]?.label;
     },
     getWfStatusType() {
@@ -763,6 +767,7 @@ export default {
     },
     initForAll() {
       let that = getTarget(this);
+      loadWfTransferEnabled(that);
       this.initWf(() => {
         if (this.wfInfo.procInstId) {
           this.initCurrentTask(this.wfInfo.procInstId, () => {

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/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/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/xform/form-designer/widget-panel/widgetsConfig.js

@@ -123,7 +123,7 @@ export const containers = [
 }, {
   type: "grid-sub-form",
   category: "container",
-  icon: "sub-form",
+  icon: "sub-form",
   widgetList: [],
   options: {
     name: "",
@@ -141,7 +141,7 @@ export const containers = [
   {
     type: "grid-col",
     category: "container",
-    icon: "grid",
+    icon: "grid",
     internal: !0,
     widgetList: [],
     options: {
@@ -163,7 +163,7 @@ export const containers = [
   {
     type: "table-cell",
     category: "container",
-    icon: "table",
+    icon: "table",
     internal: !0,
     widgetList: [],
     merged: !1,
@@ -179,7 +179,7 @@ export const containers = [
   {
     type: "tab-pane",
     category: "container",
-    icon: "tab",
+    icon: "tab",
     internal: !0,
     widgetList: [],
     options: {
@@ -590,7 +590,7 @@ export const containers = [
      * 直接拖进 tab-pane(见 docs/详情模块标签承载方案.md) */
     type: "detail-pane",
     category: "container",
-    icon: "grid",
+    icon: "grid",
     buttonWidgetList: [],
     widgetList: [],
     options: {
@@ -800,7 +800,7 @@ export const containers = [
   {
     type: "h5-card-pane",
     category: "container",
-    icon: "tab",
+    icon: "tab",
     internal: !0,
     buttonWidgetList: [],
     widgetList: [],
@@ -830,7 +830,7 @@ export const containers = [
   {
     type: "h5-table-cell",
     category: "container",
-    icon: "table",
+    icon: "table",
     internal: !0,
     widgetList: [],
     merged: !1,
@@ -3863,7 +3863,7 @@ export const advancedFields = [
   },
   {
     type: "dropdown-item",
-    icon: "tab",
+    icon: "tab",
     internal: !0,
     options: {
       name: "",

package/src/components/xform/mixins/wfStart.js

@@ -2,6 +2,7 @@ import { openStartWfDialog } from "@base/components/wf/wfUtil";
 import { getWfButtonNames, loadWfButtonNames, DEFAULT_SUBMIT_BTN } from "@base/components/wf/wfButtonName";
 import { loadWfAutoConfirm } from "@base/components/wf/wfAutoConfirm";
 import { loadWfUserRange } from "@base/components/wf/wfUserRange";
+import { loadWfTransferEnabled } from "@base/components/wf/wfTransferEnabled";
 import settingConfig from "@/settings";
 
 // PC 与 H5 共用启动规则、校验和回调；容器提供 wfStart() 获取各自的流程状态。
@@ -17,6 +18,7 @@ export default {
         loadWfButtonNames(this);
         loadWfAutoConfirm(this);
         loadWfUserRange(this);
+        loadWfTransferEnabled(this);
       }
     },
     // 流程启动按钮：有启动信息、需要按钮(showStartBtn 未显式关闭)、未启动、非预览态才显示。

package/src/views/user/bill_setting/mixins/wf.js

@@ -1,3 +1,5 @@
+import {isWfTransferEnabled, loadWfTransferEnabled} from "@base/components/wf/wfTransferEnabled";
+
 export default {
   data() {
     return {
@@ -34,6 +36,11 @@ export default {
 
     }
   },
+  computed: {
+    transferEnabled() {
+      return isWfTransferEnabled();
+    }
+  },
   methods: {
     initCurrentPrefix() {
       let url = this.billJson.getUrl;
@@ -43,6 +50,7 @@ export default {
     },
     async initWf(option) {
       this.wfOption = option;
+      loadWfTransferEnabled(this);
       let hasWf = false;
       let wfInfo, currentTask, taskParam = {};
       await this.initWfInfo(option).then(res => {

package/src/views/user/bill_setting/render.vue

@@ -300,7 +300,7 @@
                    icon="iconfont icon-a-bohui1">{{ $t1('驳回') }}
         </el-button>
         <el-button class="btn" type="primary" @click="openChangeWfForm"
-                   v-if="wfEnabled && ((wfInfo.toTransfer===null || wfInfo.toTransfer===undefined) ? wfInfo.toSubmit: wfInfo.toTransfer)"
+                   v-if="wfEnabled && transferEnabled && ((wfInfo.toTransfer===null || wfInfo.toTransfer===undefined) ? wfInfo.toSubmit: wfInfo.toTransfer)"
                    icon="iconfont icon-zhuanban">{{ $t1('转办') }}
         </el-button>
         <!--end-->

package/src/views/user/wf/wf_diy_attribute/edit.vue

@@ -171,7 +171,7 @@ export default {
         success: res => {
           let resList = res.objx || [];
           let defaulItems = [];
-          for (let i = 1; i <= 20; i++) {
+          for (let i = 1; i <= 40; i++) {
             defaulItems.push({
               attributeKey: 'param' + i,
               attributeName: null,