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

package/package.json

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

package/src/components/bizTab/BizTabListPage.vue

@@ -163,33 +163,34 @@ export default {
       return key;
     },
     /**
-     * 打开「详情/编辑」页签。同一单据已开则复用并激活，不重复开。
+     * 打开「详情/编辑」页签。同一单据已开则复用并重新加载，不检查未保存修改。
      * option.navRows / option.navIndex 传了就能用「上一单/下一单」翻单，
      * 一般直接把列表的 fullData 和当前行下标丢进来。
      */
     openDetail(row, param, option) {
       let dataId = row ? row.id : null;
       if (dataId == null || dataId === "") return this.openAdd(param, option);
-      if (!this.hasTab(dataId) && !this.checkTabLimit()) return null;
-      let key = String(dataId);
-      // 这单已经开着、而且里面有没保存的修改：只激活，不重新取数。
-      // openEditTab 的复用分支会 showContent 置 false 再置 true（等于重挂载），
-      // 从列表再点一次就把用户改了半天的内容无声冲掉了。
-      if (this.hasTab(key) && this.isDetailDirty(this.getTab(key))) {
-        this.activeName = key;
-        return key;
-      }
-      this.$refs.xTabs.openEditTab(row, param || null, {
-        tabParam: {
-          tabName: key,
-          tabLabelField: this.titleField,
-          isAdd: false,
-          dataId: dataId,
-          navRows: (option && option.navRows) || null,
-          navIndex: (option && option.navIndex != null) ? option.navIndex : -1,
-          ...((option && option.tabParam) || {}),
-        },
-      });
+      let tab = this.getTabByDataId(dataId);
+      if (!tab && !this.checkTabLimit()) return null;
+      let key = tab ? tab.tabName : this.getAvailableTabName(option?.tabParam?.tabName || dataId);
+      let tabParam = {
+        tabLabelField: this.titleField,
+        navRows: (option && option.navRows) || null,
+        navIndex: (option && option.navIndex != null) ? option.navIndex : -1,
+        ...((option && option.tabParam) || {}),
+        tabName: key,
+        isAdd: false,
+        dataId,
+      };
+      if (tab) {
+        // 已按当前单据定位，直接更新原页签，避免 x-tabs 按 row.id 严格比较时
+        // 把数字/字符串 ID 当成两张单据；tabName 始终保留，详情登记关系不变。
+        Object.assign(tab, { data: row, param: param || null }, tabParam);
+        this.activeName = key;
+        this.refreshTab(tab);
+      } else {
+        this.$refs.xTabs.openEditTab(row, param || null, { tabParam });
+      }
       return key;
     },
 
@@ -215,7 +216,7 @@ export default {
           tab.navIndex = 0;
         }
         // 页签 key(tabName) 仍是当初的合成 id：换掉会连带 el-tab-pane 重建、详情被迫重挂载，
-        // 正好破坏「保存后不刷详情」的设计。重复打开的去重靠 tab.data.id，它已是真单号。
+        // 正好破坏「保存后不刷详情」的设计。重复打开按当前 dataId 去重。
       }
       this.syncTabTitle(tab, info ? info.title : null);
     },
@@ -288,14 +289,28 @@ export default {
      * 翻单会丢掉未保存的修改，所以先过一遍脏数据确认（与关页签同一判据）。
      * @returns {Promise<Boolean>} 是否真的翻了
      */
-    navigateTab(tab, step) {
-      let idx = this.canNavigate(tab, step);
-      if (idx < 0) return Promise.resolve(false);
-      return this.confirmLeaveDetail(tab).then((pass) => {
+    navigateTab(tab, step) {
+      let idx = this.canNavigate(tab, step);
+      if (idx < 0) return Promise.resolve(false);
+      let existing = this.getTabByDataId(tab.navRows[idx].id);
+      if (existing && existing !== tab) {
+        // 与重复打开一致：直接重新加载目标详情，不检查其未保存修改。
+        this.activeName = existing.tabName;
+        this.refreshTab(existing);
+        return Promise.resolve(true);
+      }
+      return this.confirmLeaveDetail(tab).then((pass) => {
         if (!pass) return false;
         // 确认期间可能已经被关掉或翻走了，重新校一次
-        let target = this.canNavigate(tab, step);
-        if (target < 0 || !this.isLiveTab(tab)) return false;
+        let target = this.canNavigate(tab, step);
+        if (target < 0 || !this.isLiveTab(tab)) return false;
+        // 确认期间目标单据可能已从其他入口打开。
+        let existing = this.getTabByDataId(tab.navRows[target].id);
+        if (existing && existing !== tab) {
+          this.activeName = existing.tabName;
+          this.refreshTab(existing);
+          return true;
+        }
         tab.navIndex = target;
         tab.data = tab.navRows[target];
         tab.dataId = tab.data.id; // 详情不 watch dataId，靠下面的重挂载按新单号取数
@@ -338,14 +353,32 @@ export default {
     getTabs() {
       return this.$refs.xTabs ? this.$refs.xTabs.tabs : [];
     },
-    getTab(tabName) {
-      return this.getTabs().find((tab) => tab.tabName === tabName) || null;
-    },
+    getTab(tabName) {
+      return this.getTabs().find((tab) => tab.tabName === tabName) || null;
+    },
+    getTabByDataId(dataId) {
+      if (dataId == null || dataId === "") return null;
+      return this.getTabs().find((tab) => {
+        if (tab.isAdd) return false;
+        const currentId = tab.dataId ?? tab.data?.id;
+        return currentId != null && String(currentId) === String(dataId);
+      }) || null;
+    },
+    getAvailableTabName(preferredName) {
+      const baseName = String(preferredName);
+      let name = baseName;
+      let suffix = 1;
+      // 翻单后旧页签仍占用原名称；列表页签名称也不可复用。
+      while (name === LIST_TAB_NAME || this.getTab(name)) {
+        name = baseName + "_" + suffix++;
+      }
+      return name;
+    },
     isLiveTab(tab) {
       return this.getTabs().indexOf(tab) >= 0;
     },
-    hasTab(dataId) {
-      return this.getTabs().some((tab) => tab.tabName === String(dataId));
+    hasTab(dataId) {
+      return !!this.getTabByDataId(dataId);
     },
     getTabLabel(tab) {
       let label = tab.data ? tab.data[this.titleField] : null;

package/src/components/bizTab/README.md

@@ -94,7 +94,9 @@ this.$refs.bizTab.openAdd(null, { navRows: rows });
 
 内置关闭确认的判定顺序：详情实现了 `isBillDirty()` → 问它；否则只拦「还没保存过的新增页签」。
 
-**未保存的修改在三条路径上都会拦**（都以 `isBillDirty()` 为判据）：关页签要确认；**翻单**要确认（放弃修改才翻）；**从列表重复打开同一单**时若详情是脏的，只激活页签、不重新取数（否则 `openEditTab` 的复用分支会重挂载，把改了半天的内容无声冲掉）。详情没实现 `isBillDirty()` 时后两条不拦。
+**重复打开单据时直接重新加载**：按当前 `dataId` 复用页签，不检查 `isBillDirty()`、不弹确认，未保存的修改会被重新加载的数据覆盖。翻单目标已在其他页签打开时，同样激活并重新加载目标页签，源页签内容保留。关闭页签、在原页签内翻到未打开的单据时，仍按 `isBillDirty()` 判断是否需要放弃修改确认；详情没实现该方法时不拦。
+
+单据查找按当前 `dataId` 匹配（数字与字符串 ID 等价）；`tabName` 是稳定的页签标识，翻单和新增保存时保持不变。`getTab(tabName)` 用于按页签名称查找，`getTabByDataId(dataId)` / `hasTab(dataId)` 用于按当前单据查找。`openDetail()` 返回实际页签名称，可能与单据 ID 不同，应使用返回值激活页签。重新打开翻单前的单据时，会为新页签分配未占用的名称。
 
 #### behavior
 

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

@@ -93,7 +93,12 @@
           <div class="tit"><span>{{
               (wfInfo.createDate ? wfInfo.createDate.substring(0, 10) : '') + wfInfo.name
             }}</span></div>
-          <iframe style="width: 100%;flex:1" :src="wfImage"></iframe>
+          <iframe
+            ref="wfPreviewFrame"
+            style="width: 100%;flex:1"
+            :src="wfImage"
+            @load="fitWorkflowPreview"
+          ></iframe>
         </el-form>
       </div>
       <span slot="footer" class="dialog-footer">
@@ -620,8 +625,27 @@ export default {
   mounted() {
     this.init();
   },
-  methods: {
-    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() {

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/table/plugins/cell-area/index.js

@@ -464,8 +464,8 @@ function clearAreaValues($table, area) {
 }
 
 /**
- * 粘贴落盘。必须整段同步执行：业务的 pasteMethod 里会读 window.event.clipboardData
- * 取粘贴进来的图片文件，一旦跨出原生事件派发（setTimeout/await/$nextTick）就读不到了。
+ * 粘贴落盘。必须整段同步执行：clipboardData 会随 clipData 传给业务 pasteMethod，
+ * 一旦跨出原生事件派发（setTimeout/await/$nextTick），部分浏览器就读不到图片文件了。
  */
 function applyPaste($table, pasteCells, clipData) {
   let store = getStore($table);
@@ -499,8 +499,11 @@ function applyPaste($table, pasteCells, clipData) {
       let newRows = insertRows;
       if (clipOpts.createRowsMethod) {
         let created = clipOpts.createRowsMethod({
+          $table: $table,
           insertRows: insertRows,
           pasteCells: pasteCells,
+          startRowIndex: startRowIndex,
+          targetRow: rows[startRowIndex] || null,
         });
         newRows = created || insertRows;
       }
@@ -887,7 +890,11 @@ const cellAreaMixin = {
         pasteCells = [[""]];
       }
       evnt.preventDefault();
-      applyPaste($table, pasteCells, { text: text, html: html });
+      applyPaste($table, pasteCells, {
+        text: text,
+        html: html,
+        clipboardData: clipboardData,
+      });
       if (store.isCut) {
         store.isCut = false;
         store.copyArea = null;

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/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");
+}

package/src/components/xform/form-designer/form-widget/container-widget/data-table-mixin.js

@@ -63,6 +63,13 @@ modules = {
     customClass() {
       return this.widget.options.customClass || "";
     },
+    dataTableStyle() {
+      let width = this.widget.options.tableWidth;
+      if (width === null || width === undefined || width === "") return {};
+      width = String(width).trim();
+      if (/^\d+(?:\.\d+)?$/.test(width)) width += "px";
+      return { width };
+    },
     columns() {
       let tableColumns = this.widget.options.tableColumns;
       let newColumns = [];

package/src/components/xform/form-designer/form-widget/container-widget/data-table-widget.vue

@@ -12,6 +12,7 @@
   <container-wrapper :designer="designer" :widget="widget" :parent-widget="parentWidget" :parent-list="parentList"
                      :index-of-parent-list="indexOfParentList">
     <div :key="widget.id" class="table-container" :class="[selected ? 'selected' : '', customClass]"
+         :style="dataTableStyle"
          @click.stop="selectWidget(widget)">
       <vxe-grid v-bind="gridOptions" :data="widget.options.tableData" :auto-resize="true">
         <template #form>
@@ -68,7 +69,7 @@
                             plain>刷新
                 </vxe-button>
 
-                <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">搜索
+                <vxe-button v-if="!widget.options.isNotShowQueryButton" status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">搜索
                 </vxe-button>
               </div>
             </div>
@@ -212,6 +213,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/form-widget/field-widget/fieldMixin.js

@@ -155,7 +155,21 @@ modules = {
       },
     },
     isReadMode: function () {
-      return !!this.getReadMode() || this.fieldReadonlyFlag;
+      return !!this.getReadMode()
+        || this.fieldReadonlyFlag
+        || this.tableCellReadonly;
+    },
+    tableCellReadonly: function () {
+      if (!this.tableParam?.row || !this.tableParam?.$table) {
+        return false;
+      }
+      if (!this.tableParam.$table.isActiveByRow?.(this.tableParam.row)) {
+        return false;
+      }
+      let tableTarget = this.getParentTarget();
+      return typeof tableTarget?.isTableCellEditable === "function"
+        ? !tableTarget.isTableCellEditable(this.tableParam, true)
+        : false;
     },
     optionLabel() {
       return this.getOptionLabel();
@@ -1277,6 +1291,7 @@ modules = {
         this.emitFieldDataChange(e, this.oldFieldValue),
         (this.oldFieldValue = baseRefUtil.deepClone(e)),
         this.dispatch("VFormRender", "fieldValidation", [this.getPropName()]);
+      this.requestTableAutoSave("change");
     },
     handleFocusCustomEvent: function (e) {
       if (
@@ -1292,6 +1307,15 @@ modules = {
         let t = new Function("event", this.field.options.onBlur);
         t.call(this, e);
       }
+      this.requestTableAutoSave("blur");
+    },
+    /** @param {String} trigger 自动保存触发来源。 */
+    requestTableAutoSave(trigger) {
+      if (this.designState || !this.tableParam?.row) return;
+      let tableTarget = this.getParentTarget();
+      if (typeof tableTarget?.scheduleEditRowAutoSave === "function") {
+        tableTarget.scheduleEditRowAutoSave(this.tableParam, trigger);
+      }
     },
     handleInputCustomEvent: function (e) {
       if (

package/src/components/xform/form-designer/setting-panel/form-setting.vue

@@ -202,12 +202,24 @@
               @change="changeWfEnabled"
             ></el-switch>
           </el-form-item>
-          <el-form-item class="form-item-label-top" :label="i18nt('默认流程单据类型名称')">
+          <el-form-item class="form-item-label-top" :label="i18nt('默认流程单据类型名称')">
             <el-input
               type="text"
               v-model="designer.vueInstance.reportTemplate.objTypeName"
             ></el-input>
-          </el-form-item>
+          </el-form-item>
+          <el-form-item v-if="formConfig.wfEnabled" label="隐藏流程信息的角色">
+            <el-input
+              :value="formConfig.wfInfoHiddenRoleCodes"
+              @input="$set(formConfig, 'wfInfoHiddenRoleCodes', $event)"
+              placeholder="角色编码，多个用英文逗号分隔"
+              clearable
+            />
+            <div style="line-height: 1.6; color: #909399; font-size: 12px">
+              当前公司角色命中任意编码时，隐藏流程信息及审批入口，保留启动流程按钮；脚本可调用
+              this.setWfInfoHidden(true/false)。
+            </div>
+          </el-form-item>
           <el-form-item>
             <span slot="label"
               >流程主题