cloud-web-corejs 1.1.0-dev.30 → 1.1.0-dev.32

package/package.json

@@ -1,10 +1,12 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.1.0-dev.30",
+  "version": "1.1.0-dev.32",
   "scripts": {
     "dev": "vue-cli-service serve",
     "dev:micro": "vue-cli-service serve --port 17527",
+    "check:package-resources": "node build/check-package-resources.js",
+    "check:minimal-consumer": "node build/check-minimal-consumer-build.js",
     "lint": "eslint --ext .js,.vue src",
     "build:prod": "vue-cli-service build",
     "build:stage": "vue-cli-service build --mode staging",
@@ -13,7 +15,7 @@
     "new": "plop",
     "svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml",
     "test:unit": "jest --clearCache && vue-cli-service test:unit",
-    "test:ci": "npm run lint && npm run test:unit",
+    "test:ci": "npm run check:package-resources && npm run check:minimal-consumer && npm run lint && npm run test:unit",
     "updateCorejs": "npm install cloud-web-corejs --registry https://registry.npmjs.org",
     "publishDev": "npm publish --tag dev"
   },
@@ -175,7 +177,6 @@
     "src/components/bizTab",
     "src/api",
     "src/views/bd",
-    "src/views/demo",
     "src/views/support",
     "src/views/user",
     "src/views/mobile/user",
@@ -183,10 +184,9 @@
     "src/mixins",
     "src/directive",
     "src/store",
+    "src/core-resources",
     "src/styles",
     "src/icons",
-    "src/core-resources",
-    "src/resources/js",
     "src/lang/index.js",
     "src/lang/locale/en/login.js",
     "src/lang/locale/zh/login.js",

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/designer.js

@@ -1756,22 +1756,68 @@ let chartContainers = [],
         newGridCol.id = "detail-pane-" + tmpId;
         newGridCol.options.name = "detailPane" + tmpId;
         newGridCol.options.label = "detailPane" + tmpId;
-        // 默认添加一个栅格控件到新 pane 的 widgetList 中，含3列平均分布
+        // 默认添加一个栅格控件到新 pane 的 widgetList 中，列数取模板模块配置的行列数
+        let colCount = gridWidget.options.rowColCount || 3;
+        let defaultGrid = this.createDefaultGridOfDetailTemp(colCount);
+        newGridCol.widgetList.push(defaultGrid);
+        gridWidget.panes.push(newGridCol);
+      },
+
+      // 模板模块(detail-temp)自动生成的默认栅格：colCount 列平均分布(24 栏均分)。
+      // autoLayout 标记用于行列数变更时识别并同步这些默认栅格，用户手动拖入的栅格不受影响。
+      createDefaultGridOfDetailTemp(colCount) {
         let defaultGrid = baseRefUtil.deepClone(
           this.getContainerByType("grid")
         );
         defaultGrid.id = "grid-" + baseRefUtil.generateId();
-        // 添加3列，每列 span=8（24栏栅格均分）
-        for (let i = 0; i < 3; i++) {
+        defaultGrid.options.autoLayout = true;
+        let span = Math.floor(24 / colCount);
+        for (let i = 0; i < colCount; i++) {
           let col = baseRefUtil.deepClone(
             this.getContainerByType("grid-col")
           );
           col.id = "grid-col-" + baseRefUtil.generateId();
-          col.options.span = 8;
+          col.options.span = span;
           defaultGrid.cols.push(col);
         }
-        newGridCol.widgetList.push(defaultGrid);
-        gridWidget.panes.push(newGridCol);
+        return defaultGrid;
+      },
+
+      // 行列数下拉变化：写回配置，并同步所有模块里自动生成的默认栅格
+      changeDetailTempRowCol(gridWidget, colCount) {
+        if (!gridWidget || !gridWidget.options) return;
+        gridWidget.options.rowColCount = colCount;
+        let span = Math.floor(24 / colCount);
+        (gridWidget.panes || []).forEach((paneWidget) => {
+          (paneWidget.widgetList || []).forEach((subWidget) => {
+            if (
+              subWidget.type === "grid" &&
+              subWidget.options &&
+              subWidget.options.autoLayout
+            ) {
+              let gridCols = subWidget.cols || (subWidget.cols = []);
+              // 已有列统一为新的均分 span（列内已拖入的内容保留）
+              gridCols.forEach((col) => {
+                col.options.span = span;
+              });
+              // 列数不足：补齐新列
+              while (gridCols.length < colCount) {
+                let col = baseRefUtil.deepClone(
+                  this.getContainerByType("grid-col")
+                );
+                col.id = "grid-col-" + baseRefUtil.generateId();
+                col.options.span = span;
+                gridCols.push(col);
+              }
+              // 列数超出：仅移除尾部空列，非空列保留，避免丢失已拖入的组件
+              while (gridCols.length > colCount) {
+                let lastCol = gridCols[gridCols.length - 1];
+                if (lastCol.widgetList && lastCol.widgetList.length > 0) break;
+                gridCols.pop();
+              }
+            }
+          });
+        });
       },
 
       deleteColOfGrid(gridWidget, colIdx) {

package/src/components/xform/form-designer/form-widget/field-widget/row-col-select-widget.vue

@@ -0,0 +1,64 @@
+<!--
+/**
+ * 行列数下拉控件
+ * 用于「模板模块(detail-temp)」属性面板，选择默认栅格的行列布局：
+ *   1 = 一行一列(span 24)，2 = 一行两列(span 12)，3 = 一行三列(span 8)
+ * 支持 v-model。
+ */
+-->
+<template>
+  <el-select
+    :value="value"
+    class="row-col-select"
+    :placeholder="placeholder"
+    @input="handleInput"
+    @change="handleChange"
+  >
+    <el-option
+      v-for="item in rowColOptions"
+      :key="item.value"
+      :label="item.label"
+      :value="item.value"
+    ></el-option>
+  </el-select>
+</template>
+
+<script>
+  export default {
+    name: "row-col-select-widget",
+    props: {
+      // 当前行列数：1 / 2 / 3
+      value: {
+        type: Number,
+        default: 3,
+      },
+      placeholder: {
+        type: String,
+        default: "请选择",
+      },
+    },
+    data() {
+      return {
+        rowColOptions: [
+          { label: "一行一列", value: 1 },
+          { label: "一行两列", value: 2 },
+          { label: "一行三列", value: 3 },
+        ],
+      }
+    },
+    methods: {
+      handleInput(val) {
+        this.$emit("input", val)
+      },
+      handleChange(val) {
+        this.$emit("change", val)
+      },
+    },
+  }
+</script>
+
+<style lang="scss" scoped>
+  .row-col-select {
+    width: 100%;
+  }
+</style>

package/src/components/xform/form-designer/setting-panel/property-editor/container-detail/detail-temp-edito.vue

@@ -3,8 +3,12 @@
     <el-form-item label-width="0">
       <el-divider class="custom-divider">{{ i18nt('designer.setting.columnSetting') }}</el-divider>
     </el-form-item>
-    <el-form-item :label="i18nt('隐藏标题栏')">
+    <!-- <el-form-item :label="i18nt('隐藏标题栏')">
       <el-switch v-model="optionModel.hideHeader"></el-switch>
+    </el-form-item> -->
+    <el-form-item :label="i18nt('行列数')">
+      <row-col-select-widget v-model="optionModel.rowColCount"
+                             @change="onRowColChange"></row-col-select-widget>
     </el-form-item>
     <el-form-item :label="i18nt('designer.setting.colsOfGrid')"></el-form-item>
     <el-form-item class="form-item-label-top" label-width="0">
@@ -36,12 +40,14 @@
 <script>
 import Draggable from 'vuedraggable';
 import i18n from "../../../../../../components/xform/utils/i18n"
+import RowColSelectWidget from "../../../form-widget/field-widget/row-col-select-widget"
 
 export default {
   name: "detail-temp-editor",
   mixins: [i18n],
   components: {
     Draggable,
+    RowColSelectWidget,
   },
   props: {
     designer: Object,
@@ -49,6 +55,12 @@ export default {
     optionModel: Object,
   },
   methods: {
+    // 行列数变化：同步已有模块里自动生成的默认栅格列数，并记录历史
+    onRowColChange(colCount) {
+      this.designer.changeDetailTempRowCol(this.selectedWidget, colCount)
+      this.designer.emitHistoryChange()
+    },
+
     deleteCol(curGrid, colItem) {
       // 传 widget 引用而非下标：列表里混着内容模块和其它容器，下标语义不如引用直白
       this.designer.deletePaneOfDetail(curGrid, colItem)

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

@@ -509,6 +509,8 @@ export const containers = [
       label: "模板模块",
       detailTempContainer: true,
       styleTempClass: 'd-temp-1',
+      // 默认栅格行列数：1=一行一列 2=一行两列 3=一行三列
+      rowColCount: 3,
       customClass: "",
       wfEnabled: false,
       onCreated: "",

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/demo/bizTab/bill/billConfig.js

@@ -1,41 +0,0 @@
-import prefixConfig from "@/prefixConfig.js";
-
-/**
- * demo B 接的是真实单据：PMD 的「产品变更申请」，走通用 bd_api（getPage / getOne / getList / saveUpdate）。
- * 换成你自己的单据只改这里：表单编码、表名、流程编码、页签标题字段。
- *
- * 请求写法逐条对齐 stdxx 的真实页面 `views/pmd/product/product_change/{list,edit,productItemDialog}.vue`，
- * 那边跑得通这边就跑得通（连 getOne/saveUpdate 不带 formVersion 都是照它来的）。
- *
- * ⚠️ 前置条件（跑不起来先核对这几条）：
- *    1. 表单模板 item_change（列表）/ item_change_edit（详情），且配了脚本
- *       getPage / getOne / getList / saveUpdate / findItemPage；
- *    2. 表 pcp_item_change / pcp_item_change_item 存在；
- *    3. 流程 product_change_edit 存在，且至少有一个允许改单据(toModify)的节点，
- *       否则「通过自动保存」这条验不到。
- *    真实页面还会写第三张表 pcp_product_properties_change（产品参数），demo 不带它——
- *    saveUpdate 只写 data 里出现的表，不传即不动，所以参数不会被清空。
- *    不吃这些前置条件的版本看 ../simple/（前端 mock，不打后台）。
- *
- * ⚠️ 保存是整表提交：saveUpdate 的 data 里带哪几张表，后台就按哪几张表落库。
- *    所以 detail.vue 把子表 pcp_item_change_item 一起读出来、原样带回，
- *    不然拿真实单据试保存会把子表冲掉。你自己的单据有子表时照此办理。
- */
-export const BILL = {
-  prefix: prefixConfig.PMD_PREFIX,
-  listFormCode: "item_change", // 列表分页用的表单编码
-  formCode: "item_change_edit", // 详情取数/保存用的表单编码
-  taBm: "pcp_item_change", // 主表表名
-  itemTaBm: "pcp_item_change_item", // 子表表名
-  wfCode: "div_form_item_change_edit", // 流程编码
-  titleField: "sn", // 页签标题字段（变更单号）
-  type: 0, // 业务过滤条件：0 产品变更 / 1 零件变更
-};
-
-export const STATUS_MAP = {
-  0: { label: "未审核", cls: "list-tag warning" },
-  1: { label: "审核中", cls: "list-tag" },
-  2: { label: "已审核", cls: "list-tag success" },
-};
-
-export default BILL;