cloud-web-corejs 1.0.285 → 1.0.287

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.285",
+  "version": "1.0.287",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

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"
@@ -402,6 +402,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,
@@ -459,6 +460,9 @@ export default {
       let that = this.viewTarget;
       let _hideWf = that._hideWf || that.$attrs._hideWf;
       return _hideWf === true || _hideWf === 'true';
+    },
+    transferEnabled() {
+      return isWfTransferEnabled();
     }
   },
   data() {
@@ -739,6 +743,7 @@ export default {
     },
     initForAll() {
       let that = getTarget(this);
+      loadWfTransferEnabled(that);
       this.initWf(() => {
         if (this.wfInfo.procInstId) {
           this.initCurrentTask(this.wfInfo.procInstId, () => {

package/src/components/table/index.js

@@ -97,7 +97,7 @@ async function initVxeTable(option) {
   let searchColumns = null;
   if (tableName) {
     setTableState($grid, "tableName", tableName);
-    if (option.path) {
+    if (option.path && option.readQueryAllPage !== false) {
       await getTableData(that, option.tableRef, "isQueryAllPage", (res1) => {
         let result = res1.objx ? res1.objx.data : null;
         if (result !== null && result !== undefined) {
@@ -1252,7 +1252,10 @@ function checkQueryTotal(that, tableRef, value) {
   let pagerConfig = $grid.pagerConfig;
 
   $grid.pagerConfig.layouts = pagerConfig.layouts || [];
-  addTableData(that, tableRef, value);
+  let originOption = $grid.params && $grid.params.originOption;
+  if (!originOption || originOption.readQueryAllPage !== false) {
+    addTableData(that, tableRef, value);
+  }
   $grid.commitProxy("query");
 }
 

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 {requireViewCompat} 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,
@@ -235,6 +236,10 @@ wfContentMixin = {
       let that = this.viewTarget;
       let _hideWf = that._hideWf || that.$attrs._hideWf;
       return _hideWf === true || _hideWf === 'true';
+    },
+    //转办：param20，未配置默认开启。读 observable，接口回来后按钮条会重算
+    transferEnabled() {
+      return isWfTransferEnabled();
     }
   },
   data() {
@@ -553,6 +558,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/form-widget/container-widget/data-table-widget.vue

@@ -212,6 +212,7 @@ export default {
   },
   created() {
     if(this.widget.options.isNotQueryAllPage===undefined)this.widget.options.isNotQueryAllPage = false;
+    if(this.widget.options.isNotReadQueryAllPage===undefined)this.widget.options.isNotReadQueryAllPage = false;
   }
 };
 </script>

package/src/components/xform/form-designer/setting-panel/property-editor/container-data-table/data-table-editor.vue

@@ -62,6 +62,9 @@
     <el-form-item label="是否查询总页数">
       <el-switch v-model="isQueryAllPage"></el-switch>
     </el-form-item>
+    <el-form-item label="是否读取总页数记忆">
+      <el-switch v-model="isReadQueryAllPage"></el-switch>
+    </el-form-item>
     <el-form-item label="默认每页查询数" class="form-item-label-top">
       <base-input-number
         v-model="optionModel.gridPageSize"
@@ -741,6 +744,14 @@ export default {
         this.optionModel.isNotQueryAllPage = !val;
       },
     },
+    isReadQueryAllPage: {
+      get() {
+        return !this.optionModel.isNotReadQueryAllPage;
+      },
+      set(val) {
+        this.optionModel.isNotReadQueryAllPage = !val;
+      },
+    },
     isShowQueryButton: {
       get() {
         return !this.optionModel.isNotShowQueryButton;
@@ -1107,15 +1118,15 @@ export default {
 </style>
 
 <style scoped>
-.form-section-label {
-  margin: 16px 0 8px;
-  padding-left: 8px;
-  color: rgba(0, 0, 0, 0.65);
-  font-size: 13px;
-  font-weight: 600;
-  line-height: 1.3;
-  background: rgba(0, 0, 0, 0.04);
-  padding: 4px 0 4px 8px;
+.form-section-label {
+  margin: 16px 0 8px;
+  padding-left: 8px;
+  color: rgba(0, 0, 0, 0.65);
+  font-size: 13px;
+  font-weight: 600;
+  line-height: 1.3;
+  background: rgba(0, 0, 0, 0.04);
+  padding: 4px 0 4px 8px;
 }
 
 .label-tip-icon {

package/src/components/xform/form-designer/widget-panel/widgetsConfig.js

@@ -329,6 +329,7 @@ export const containers = [
       showRules: [],
       hideGridCheckBox: false,
       isNotQueryAllPage: false,
+      isNotReadQueryAllPage: false,
       isNotShowQueryButton: false,
 
       exportItemColumns: [],

package/src/components/xform/form-render/container-item/data-table-mixin.js

@@ -2686,6 +2686,7 @@ modules = {
         columns: columns,
         searchColumns: searchColumns,
         isQueryAllPage,
+        readQueryAllPage: !this.widget.options.isNotReadQueryAllPage,
         exportItemConfig,
         vform: true,
         ...(this.getDynamicColumnSourceType() !== "none"

package/src/components/xform/form-render/container-item/detail-item.vue

@@ -177,6 +177,7 @@ import {
 } from "../../../../components/wf/wfButtonName";
 import { loadWfAutoConfirm } from "../../../../components/wf/wfAutoConfirm";
 import { loadWfUserRange } from "../../../../components/wf/wfUserRange";
+import { loadWfTransferEnabled } from "../../../../components/wf/wfTransferEnabled";
 import settingConfig from "@/settings.js";
 
 export default {
@@ -200,6 +201,7 @@ export default {
       loadWfButtonNames(this);
       loadWfAutoConfirm(this);
       loadWfUserRange(this);
+      loadWfTransferEnabled(this);
     }
   },
   mounted() {

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,