cloud-web-corejs 1.1.0-dev.22 → 1.1.0-dev.23

package/src/components/xform/form-render/fieldControlMixin.js

@@ -1,4 +1,5 @@
 import cloneDeep from "lodash/cloneDeep";
+import { applyBusinessLock } from '@base/components/xform/mixins/businessLock';
 import {
   collectFieldControlTargets, readFieldState, writeStateOptions, computeFieldStates,
   resolveScriptStates, resolveRunMode, applyFieldState, isEntryVisible, sameValue,
@@ -410,6 +411,7 @@ export default {
         this.handleWidgetShowRule(projected);
         if (entry && states?.[entry.key]) writeStateOptions(projected.options, states[entry.key]);
         this.applyWorkflowFieldControl(projected);
+        applyBusinessLock(projected, this);
         if (widget.formItemFlag && this.disabledMode) projected.options.disabled = true;
         const effective = readFieldState(projected);
         // 非输入按钮不在动态目标范围，但仍应用流程自身的 disabled。

package/src/components/xform/form-render/indexMixin.js

@@ -45,6 +45,8 @@ import {
 } from "../../../components/xform/form-designer/widget-panel/widgetsConfig.js";
 import { isUrlValueColumn } from "../../../components/xform/utils/attachmentValueUtil";
 import scriptHttpMixin from "../../../components/xform/mixins/scriptHttp";
+import wfVisibilityMixin from "@base/components/xform/mixins/wfVisibility";
+import businessLockMixin from "@base/components/xform/mixins/businessLock";
 import defaultHandleMixin from "../../../components/xform/mixins/defaultHandle";
 import xeUtils from "xe-utils";
 import { extendDeeply } from "@base/utils/index.js";
@@ -103,6 +105,8 @@ modules = {
     baseFormulaDialog,
   },
   mixins: [
+    wfVisibilityMixin,
+    businessLockMixin,
     baseRefUtil.emitter,
     baseRefUtil.i18n,
     scriptHttpMixin,
@@ -234,6 +238,9 @@ modules = {
       currentFormData: {},
       timerMap: {},
       hasWf: false,
+      // 未启动流程时 hasWf 仍为 false，启动参数必须自身可响应，才能让详情按钮及时出现。
+      wfStartOption: null,
+      wfStartCtx: null,
       showFormContent: false,
 
       showFormDialog: false,
@@ -765,7 +772,7 @@ modules = {
       let widgetEditOnWf = this.hanldeWfWidgetNew0(); //是否有流程时，当前用户特定流程节点是否可全局可编辑
       this.widgetEditOnWf = widgetEditOnWf;
 
-      traverseAllWidgetsNew(this.formJson.widgetList, (widget) => {
+      traverseAllWidgetsNew(this.formJson.widgetList, (widget) => this.withBusinessLock(widget, () => {
         //修复data-table旧数据表格列widget与editWidget为空的问题
         this.handleTableColumnWidget(widget);
 
@@ -800,9 +807,9 @@ modules = {
             }
           }
         }
-      });
+      }));
 
-      this.wfModifyEnabled = hasModifyItem;
+      this.wfModifyEnabled = hasModifyItem && !this.businessLocked;
     },
     getFieldControlWidgets() {
       const widgets = [];
@@ -841,18 +848,20 @@ modules = {
 
       const processWidget = (widget) => {
         if (!widget) return;
-        this.handleWidgetShowRule(widget);
-        if (wfParam.hasWf && widget?.options?.saveSubmitWfButton) {
-          widget.options.hidden = true;
-          return;
-        }
-        if (!wfParam.hasWf || widgetEditOnWf) return;
-        this.hanldeWfWidgetNew1(widget);
-        if (wfInfo.taskStep === "9999") {
-          this.hanldeWfWidgetItemNew(widget);
-        } else if (toModify && taskDefinitionKey) {
-          this.hanldeWfWidgetItemNew(widget);
-        }
+        return this.withBusinessLock(widget, () => {
+          this.handleWidgetShowRule(widget);
+          if (wfParam.hasWf && widget?.options?.saveSubmitWfButton) {
+            widget.options.hidden = true;
+            return;
+          }
+          if (!wfParam.hasWf || widgetEditOnWf) return;
+          this.hanldeWfWidgetNew1(widget);
+          if (wfInfo.taskStep === "9999") {
+            this.hanldeWfWidgetItemNew(widget);
+          } else if (toModify && taskDefinitionKey) {
+            this.hanldeWfWidgetItemNew(widget);
+          }
+        });
       };
 
       const columnLoopDo = (column) => {
@@ -1463,6 +1472,7 @@ modules = {
               showStartBtn: true, //需要启动按钮(语义不变)
               injectStartBtn: false, //但不走 wfUtil 的 DOM 强制注入,改由 detail-item 模板声明式渲染
               showWfFold: true,
+              layoutType: formConfig.layoutType,
               formCode: formCode,
               startConfirmText: () => this.getWfStartConfirmText(),
               callback: (wfParam) => {

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

@@ -0,0 +1,59 @@
+import { applyFieldState } from '@base/components/xform/form-render/fieldControlEngine';
+
+// 最后叠加业务限制，不改变真实流程状态，也不放宽既有字段规则。
+export function applyBusinessLock(widget, host) {
+  if (!host.businessLocked || !widget?.options) return;
+  const deleteColumn = ['editDelete', 'removeTreeRow'].includes(widget.columnType);
+  if (widget.options.saveSubmitWfButton || deleteColumn) {
+    widget.options.hidden = true;
+  } else if (!host.getIsfreeWidgetTypesOfWf(widget)) {
+    if (host.getIsHiddenWidgetTypesOfWf(widget)) widget.options.hidden = true;
+    else if (widget.formItemFlag) widget.options.disabled = true;
+  }
+}
+
+export default {
+  data() {
+    return { businessLocked: false };
+  },
+  methods: {
+    // 可在表单事件脚本中调用；返回的 Promise 在本次视图更新后完成。
+    setBusinessLocked(locked = true) {
+      this.businessLocked = locked === true;
+      if (this.isFieldControlEnabled()) {
+        // 初始化前仅记录锁定意图，避免将锁定结果当成模板基线。
+        if (this.fieldControlInitialized) {
+          this.prepareFieldControlTargets();
+          this.applyFieldControlStates(this.getFieldControlRuntime().dynamicStates);
+        }
+      } else {
+        this.hanldeCommonWidget2();
+      }
+      return this.$nextTick();
+    },
+    withBusinessLock(widget, evaluate) {
+      if (!widget?.options) return evaluate();
+      if (!this._businessLockBaseline) this._businessLockBaseline = new WeakMap();
+      const previous = this._businessLockBaseline.get(widget);
+      if (previous) {
+        Object.keys(previous).forEach(key => {
+          if (previous[key] === undefined) this.$delete(widget.options, key);
+          else this.$set(widget.options, key, previous[key]);
+        });
+        this._businessLockBaseline.delete(widget);
+      }
+      try {
+        return evaluate();
+      } finally {
+        const baseline = { hidden: widget.options.hidden, disabled: widget.options.disabled };
+        applyBusinessLock(widget, this);
+        if (this.businessLocked) this._businessLockBaseline.set(widget, baseline);
+        if (this.businessLocked || previous) {
+          applyFieldState({ widget, refKey: widget.options.name, isContainer: widget.category === 'container' },
+            { visible: !widget.options.hidden, disabled: !!widget.options.disabled },
+            name => this.getWidgetRef(name));
+        }
+      }
+    },
+  },
+};

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

@@ -0,0 +1,103 @@
+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 settingConfig from "@base/settings";
+
+// PC 与 H5 共用启动规则、校验和回调；容器提供 wfStart() 获取各自的流程状态。
+export default {
+  computed: {
+    wfStartButtonName() {
+      return getWfButtonNames().submitBtn || settingConfig.wfStartButtonName || this.$t1(DEFAULT_SUBMIT_BTN);
+    },
+  },
+  methods: {
+    initWfStartSettings() {
+      if (this.getFormRef()?.formConfig?.wfEnabled) {
+        loadWfButtonNames(this);
+        loadWfAutoConfirm(this);
+        loadWfUserRange(this);
+      }
+    },
+    // 流程启动按钮：有启动信息、需要按钮(showStartBtn 未显式关闭)、未启动、非预览态才显示。
+    // 声明式渲染,替代 wfUtil 的 DOM 强制注入。
+    showWfStartBtn() {
+      if (this.getFormRef()?.businessLocked) return false;
+      let ws = this.wfStart();
+      if (!ws || this.previewState) return false;
+      let opt = ws.option || {};
+      if (opt.showStartBtn === false || ws.hasWf) return false;
+      return this.evalWfStartBtnShow();
+    },
+    /**
+     * 「提交流程」按钮显隐脚本(formConfig.wfStartBtnShow)：return false 隐藏，不配则显示。
+     * 在渲染期求值，好处是随表单数据自动更新，代价是脚本会被反复执行——所以：
+     *   1) 编译结果按脚本原文缓存，避免每次渲染都 new Function；
+     *   2) 编译/执行异常一律放行(返回 true)，不能因为脚本写错就把提交入口挡死；
+     *   3) formData 取轻量的 formRef.formData，不走 getSysFormData/getRealFormData 那套重加工。
+     * 脚本里务必只读数据、返回布尔，改数据会引发渲染循环。
+     */
+    evalWfStartBtnShow() {
+      let formRef = this.getFormRef && this.getFormRef();
+      let src = formRef && formRef.formConfig && formRef.formConfig.wfStartBtnShow;
+      if (!src) return true;
+      let cache = this._wfStartShowFn; //挂实例属性即可，不需要响应式
+      if (!cache || cache.src !== src) {
+        try {
+          cache = {
+            src,
+            fn: new Function("dataId", "formCode", "formData", src),
+          };
+        } catch (error) {
+          console.error("wfStartBtnShow 脚本编译失败", error);
+          return true;
+        }
+        this._wfStartShowFn = cache;
+      }
+      try {
+        let ret = cache.fn.call(
+          formRef,
+          formRef.dataId,
+          formRef.reportTemplate && formRef.reportTemplate.formCode,
+          formRef.formData
+        );
+        return ret !== false;
+      } catch (error) {
+        console.error("wfStartBtnShow 脚本执行异常", error);
+        return true;
+      }
+    },
+    // 声明式触发流程启动(替代原注入按钮的点击),复用 wfUtil 的 openStartWfDialog
+    startWf() {
+      if (this.getFormRef()?.businessLocked) return;
+      let ws = this.wfStart();
+      if (!ws || !ws.option || !ws.ctx) return;
+      // startConfirmText 原样透传:它只承载模板脚本 wfStartConfirmText 的文案(见 indexMixin
+      // 的 option 构造)。按钮名拼接与「后台 param19 自动确认」都由 wf.js 统一处理——
+      // 在这里替它拼默认文案的话,wf.js 会把它当成脚本自定义的告警,自动确认就失效了。
+      let innerOnStart = ws.option.onStart;
+      let formRef = this.getFormRef && this.getFormRef();
+      openStartWfDialog(ws.ctx, {
+        ...ws.option, //浅拷贝:wfStartOption 是 formRef 上的共享对象,不可原地改
+        // 提交前置处理：确认框在 wfStartDialog 内部，这里(打开弹框前)是唯一能拦的位置。
+        // 既有的 onStart 是表单校验(仅 wfStartBindSave 开启时注入)，把它的 done 换成
+        // 「跑前置脚本」，即得到「先校验、后脚本、再确认框」；没开自动保存时直接跑脚本。
+        onStart: (done) => {
+          let runBefore = () => {
+            if (!formRef || typeof formRef.runBeforeSubmitWf !== "function") {
+              return done();
+            }
+            formRef.runBeforeSubmitWf("wfStart").then((pass) => {
+              if (pass) done();
+            });
+          };
+          if (typeof innerOnStart === "function") {
+            innerOnStart(runBefore);
+          } else {
+            runBefore();
+          }
+        },
+      });
+    },
+  },
+};

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

@@ -0,0 +1,33 @@
+// 与组件显隐规则一致：只匹配当前公司的角色，命中任意角色即隐藏。
+export default {
+  data() {
+    return {
+      // 脚本态与角色配置分开保存；脚本取消隐藏时不会越过角色限制。
+      wfInfoHiddenByScript: false,
+    };
+  },
+  computed: {
+    _hideWf() {
+      const inherited = this.$attrs && this.$attrs._hideWf;
+      if (inherited === true || inherited === "true") return true;
+      if (this.wfInfoHiddenByScript) return true;
+      const configured = this.formConfig && this.formConfig.wfInfoHiddenRoleCodes;
+      const codes = (Array.isArray(configured) ? configured : String(configured || "").split(","))
+        .map(code => String(code).trim()).filter(Boolean);
+      return (this.userRoleDTO2s || []).some(role => codes.includes(role.roleCode));
+    },
+  },
+  methods: {
+    /**
+     * 给表单事件脚本调用：this.setWfInfoHidden(true/false)。
+     * 只控制流程信息、导航和依赖面板的审批入口，不影响流程初始化及启动按钮。
+     */
+    setWfInfoHidden(hidden = true) {
+      this.wfInfoHiddenByScript = hidden === true || hidden === "true";
+      if (typeof this._refreshWfInfoVisibility === "function") {
+        this._refreshWfInfoVisibility();
+      }
+      return this.$nextTick();
+    },
+  },
+};

package/src/components/xform/styles/h5.scss

@@ -180,7 +180,8 @@ $xformH5Size:14px;
      那条正是块 C1 依赖的前提。 */
   .el-form-item {
     display: flex;
-    align-items: flex-start;
+    /* 单行字段与移动端基本信息表格保持一致：标签和值都落在字段行中线。 */
+    align-items: center;
     position: relative;
     min-height: $xformH5RowHeight;
     margin-bottom: 0;
@@ -189,6 +190,8 @@ $xformH5Size:14px;
   /* 对手：style.scss:13854 `.h5-detail-wrap .h5-item .el-form-item__label` (0,3,0)
      带 text-align:left !important，且把 &:after 设成 display:none；本方 (0,5,0)。 */
   .el-form-item > .el-form-item__label {
+    display: flex !important;
+    align-items: center;
     width: $xformH5LabelWidth;
     padding: 0 5px 0 0;
     margin: 0;
@@ -1750,6 +1753,8 @@ $xformH5Size:14px;
   border-radius: 0;
 
   > .el-dialog__body {
+    display: flex;
+    flex-direction: column;
     flex: 1;
     min-height: 0;
     overflow-y: auto;

package/src/components/xform/utils/util.js

@@ -1116,6 +1116,8 @@ export function getDefaultFormConfig() {
     onBeforeSubmitWf: null,
     // 「提交流程」按钮显隐脚本：return false 隐藏，不配则显示
     wfStartBtnShow: null,
+    // 当前公司角色编码，逗号分隔；命中任意角色只隐藏流程信息，保留启动入口。
+    wfInfoHiddenRoleCodes: "",
     wfAgreenBindSave: false,
     wfAgreeConfigData: [],
     wfConfigDataEnabled: false,

package/src/views/user/home/index.vue

@@ -90,7 +90,7 @@ export default {
             url =  defaultHomePage || settingConfig.defaultHomePage || '@base/views/user/home/default.vue'
           }
           // 首页菜单不会归属别的子应用，无需 remote 兜底；归属解析见 @base/utils/resolveViewComponent
-          this.homeContent = (await loadViewComponentAsync(url)).component;
+          this.homeContent = (await loadViewComponentAsync(url)).component;
 
           this.showHomeContent = true;
           this.flag = 1;