cloud-web-corejs 1.0.276 → 1.0.277

package/src/components/micro-view-host/index.vue

@@ -0,0 +1,148 @@
+<template>
+  <div :id="containerId" class="micro-view-host" style="height: 100%"></div>
+</template>
+
+<script>
+/**
+ * 详情承载宿主：在弹框/容器内用 qiankun loadMicroApp 装载归属子应用，
+ * 渲染其私有详情页（组件不在当前 bundle，本地 require 拿不到）。
+ * 契约见 ./contract.js 与 docs/qiankun动态详情页承载方案.md 第 5 节。
+ *
+ * ⚠ 依赖子应用侧实现「详情承载入口」（方案 §5.5）：mount 时识别 props.microDetailHost，
+ *   按 targetPath 解析自身组件、用 bizParams/viewMeta 绑 props、装 parentVue shim 渲染。
+ *   在子应用支持该入口前，本组件装载出的仍是子应用默认渲染，未必是目标详情页。
+ *   因此暂不接入各弹框站点——它们仍走 $message 短期提示兜底。
+ *
+ * 多实例：宿主实例名带唯一后缀，与路由保活实例（name=appCode）隔离；
+ *   同一 appCode 的保活实例与若干宿主实例可并存。要求子应用容忍多实例并发。
+ */
+import { loadMicroApp } from "qiankun";
+import { getToken } from "@base/utils/auth";
+import { getAppRegistry, DEBUG_ENTRY } from "@base/microRouter";
+import { buildDetailHostProps } from "./contract";
+
+// 注册表一次会话内不变，缓存首个成功结果，避免每次开弹框都打逻辑参数接口
+let registryCache = null;
+function loadRegistry() {
+  if (!registryCache) {
+    registryCache = getAppRegistry().catch((e) => {
+      registryCache = null; // 失败不缓存，允许下次重试
+      return Promise.reject(e);
+    });
+  }
+  return registryCache;
+}
+
+let hostSeq = 0;
+
+export default {
+  name: "MicroViewHost",
+  props: {
+    // 归属子应用 appCode（helper 的 remote 结果透出）
+    owner: { type: String, required: true },
+    // 剥掉 /micro/<appCode> 后的子应用内路径
+    targetPath: { type: String, default: "" },
+    // 业务字段整包
+    bizParams: { type: Object, default: () => ({}) },
+    // 承载元数据
+    viewMeta: { type: Object, default: () => ({}) },
+    // outParam 初值
+    initialOutParam: { default: undefined },
+  },
+  data() {
+    hostSeq += 1;
+    return {
+      containerId: "micro-viewhost-" + this.owner + "-" + hostSeq,
+      instance: null,
+      failed: false,
+    };
+  },
+  mounted() {
+    this.load();
+  },
+  beforeDestroy() {
+    this.unmount();
+  },
+  methods: {
+    load() {
+      loadRegistry()
+        .then((apps) => {
+          if (this._isDestroyed || this._isBeingDestroyed) return;
+          const app = (apps || []).find((a) => a.appCode === this.owner);
+          if (!app || !app.entry) {
+            this.fail("未在应用注册表找到子应用或缺 entry：" + this.owner);
+            return;
+          }
+          // 逻辑参数 micro_debug_enabled=true 时，与路由整站装载一致：改用本机约定端口，
+          // 不动注册表 entry。本机联调 detail-host 时子应用 devServer 起在 17527 即可。
+          const entry = app.debugEnabled ? DEBUG_ENTRY : app.entry;
+          if (app.debugEnabled) {
+            // eslint-disable-next-line no-console
+            console.warn(
+              "[MicroViewHost] ⚠ 调试装载：" + this.owner + " → " + entry
+            );
+          }
+          this.mountApp(entry);
+        })
+        .catch((e) => {
+          this.fail("读取应用注册表失败", e);
+        });
+    },
+    mountApp(entry) {
+      const props = buildDetailHostProps({
+        appCode: this.owner,
+        targetPath: this.targetPath,
+        bizParams: this.bizParams,
+        viewMeta: this.viewMeta,
+        initialOutParam: this.initialOutParam,
+        baseProps: {
+          token: getToken(),
+          lang: localStorage.getItem("i18n-lang") || "",
+        },
+        callbacks: {
+          onReload: () => this.$emit("reload"),
+          onHandleCallback: (flag) => this.$emit("handle-callback", flag),
+          onClose: () => this.$emit("close"),
+          onUpdateOutParam: (v) => this.$emit("update-out-param", v),
+          onEmit: (name, ...args) => this.$emit("bridge-emit", name, args),
+        },
+      });
+      try {
+        this.instance = loadMicroApp({
+          name: this.owner + "@detailhost-" + this.containerId,
+          entry,
+          container: this.$el,
+          props,
+        });
+        const p = this.instance.mountPromise;
+        if (p && typeof p.then === "function") {
+          p.then(() => this.$emit("mounted")).catch((e) => {
+            this.fail("子应用挂载失败：" + this.owner, e);
+          });
+        }
+      } catch (e) {
+        this.fail("loadMicroApp 失败：" + this.owner, e);
+      }
+    },
+    unmount() {
+      const inst = this.instance;
+      if (!inst) return;
+      this.instance = null;
+      const p = inst.mountPromise || Promise.resolve();
+      p.then(() => inst.unmount()).catch(() => {});
+    },
+    fail(msg, err) {
+      this.failed = true;
+      // eslint-disable-next-line no-console
+      console.error("[MicroViewHost] " + msg, err || "");
+      this.$emit("load-error", this.owner);
+    },
+  },
+};
+</script>
+
+<style scoped>
+.micro-view-host {
+  width: 100%;
+}
+</style>

package/src/components/table/tableForm.vue

@@ -222,13 +222,18 @@
         <el-table
           ref="singleTable"
           width="100%"
-          :data="tableColumns"
+          :data="dialogColumns"
           border=""
           row-key="field"
           stripe=""
+          :row-class-name="dialogRowClassName"
         >
           <el-table-column type="index" width="35" fixed="left"></el-table-column>
-          <el-table-column label="" width="38"><i class="iconfont icon-tuodongweizhi drag-option"></i></el-table-column>
+          <el-table-column label="" width="38">
+            <template slot-scope="scope">
+              <i v-if="!scope.row.lockValue" class="iconfont icon-tuodongweizhi drag-option"></i>
+            </template>
+          </el-table-column>
           <el-table-column :label="$t2('名称', 'components.table.name')" width="150" prop="title">
             <template slot-scope="scope">
               {{ scope.row.title }}
@@ -236,8 +241,12 @@
           </el-table-column>
           <el-table-column :label="$t2('默认值', 'components.table.defaultValue')" width="375" prop="defaultValue">
             <template slot-scope="scope">
+              <!-- 固定查询条件的值由业务通道注入，这里不给改，也不参与还原/确定的写值 -->
+              <span v-if="scope.row.lockValue" class="text-tip">
+                {{ $t1('固定条件') }}
+              </span>
               <template
-                v-if="scope.row.defaultValueEnabled!==false && (scope.row.defaultValueEnabled || !scope.row.slot)">
+                v-else-if="scope.row.defaultValueEnabled!==false && (scope.row.defaultValueEnabled || !scope.row.slot)">
                 <template v-if="scope.row.type =='input'">
                   <el-input v-model="scope.row.defaultValue" size="small" clearable></el-input>
                 </template>
@@ -280,7 +289,7 @@
           </el-table-column>
           <el-table-column :label="$t2('是否常用', 'components.table.common')" width="70" prop="common">
             <template slot-scope="scope">
-              <el-switch v-model="scope.row.common"></el-switch>
+              <el-switch v-model="scope.row.common" :disabled="scope.row.lockValue === true"></el-switch>
             </template>
           </el-table-column>
         </el-table>
@@ -315,5 +324,7 @@ export default {
 </script>
 
 <style scoped>
-
+.text-tip {
+  color: #909399;
+}
 </style>

package/src/components/table/tableFormMixin.js

@@ -15,7 +15,10 @@ modules = {
       showAdvancedSearch: false,
       form1Fields: [],
       form2Fields: [],
+      /* 全量列，「确定」按它回写，隐藏列也在里面（不能丢，它照样往上送条件） */
       tableColumns: [],
+      /* 弹框实际渲染的列，是 tableColumns 里非隐藏项的**引用**（同一批对象，改默认值直接生效） */
+      dialogColumns: [],
       dialogVisible: false,
       advancedFormData: {},
       formDataClone: {},
@@ -213,13 +216,17 @@ modules = {
     },
     openTableColumnsDialog() {
       let $grid = this.$parent;
-      let tableColumns = (tableColumns = this.$baseLodash.cloneDeep(
+      // 原写法 let tableColumns = (tableColumns = ...) 自引用触发 TDZ，
+      // 只因 Babel 把 let 降成 var 才没在浏览器里炸
+      let tableColumns = this.$baseLodash.cloneDeep(
         $grid.params.searchColumns || []
-      ));
+      );
       tableColumns.forEach((item) => {
         if (!item.widgetConfig) item.widgetConfig = {};
       });
       this.tableColumns = tableColumns;
+      // 隐藏字段（如查询区里存树ID的隐藏输入框）是内部条件，不给用户看也不给拖
+      this.dialogColumns = tableColumns.filter((item) => !item.hidden);
       this.dialogVisible = true;
       this.$nextTick(() => {
         this.$nextTick(() => {
@@ -231,20 +238,34 @@ modules = {
       let e = this.$refs.singleTable.$el.querySelectorAll(
           ".el-table__body-wrapper > table > tbody"
         )[0],
-        t = this.tableColumns;
+        t = this.tableColumns,
+        visible = this.dialogColumns;
       this.sortable = Sortable.create(e, {
         ghostClass: "sortable-ghost",
+        // 固定查询条件不可拖动（它的位置由配置决定，个性化也不该记）
+        filter: ".drag-disabled",
         setData: function (e) {
           e.setData("Text", "");
         },
         onEnd: function (e) {
-          let i = t.splice(e.oldIndex, 1)[0];
-          t.splice(e.newIndex, 0, i);
-          /*t[e.newIndex].value;
-          t[e.newIndex - 1] && t[e.newIndex - 1].value, t[e.newIndex + 1] && t[e.newIndex + 1].value;*/
+          // 拖拽发生在「可见列」上，隐藏列不在其中，所以要把新次序同步回全量列：
+          // 先在可见列里挪好，再按「新位置的后一个可见列」定位插到全量列的哪里。
+          let moved = visible.splice(e.oldIndex, 1)[0];
+          visible.splice(e.newIndex, 0, moved);
+          let fullIndex = t.indexOf(moved);
+          if (fullIndex > -1) {
+            t.splice(fullIndex, 1);
+          }
+          let nextVisible = visible[e.newIndex + 1];
+          let insertAt = nextVisible ? t.indexOf(nextVisible) : t.length;
+          t.splice(insertAt < 0 ? t.length : insertAt, 0, moved);
         },
       });
     },
+    /** 固定查询条件行加标记类：禁拖拽（Sortable filter）+ 视觉上区分 */
+    dialogRowClassName({ row }) {
+      return row && row.lockValue ? "drag-disabled" : "";
+    },
     dialogPrimary(newTableColumns) {
       let searchColumns = this.$baseLodash.cloneDeep(
         newTableColumns || this.tableColumns
@@ -266,6 +287,13 @@ modules = {
       // this.$set(this, "formData", {});
       // this.$set(this, "advancedFormData", {});
       searchColumns.forEach((form1Field) => {
+        // 固定查询条件：值由业务通道（树点选 / 脚本 setValue / 页面回填）注入，
+        // 「确定」「还原」都不许覆盖它，否则一点设置就把当前上下文查丢了。
+        // 注意只认 lockValue，不认 fixed —— 手写页面的 fixed 列（如分支）
+        // 正是靠这里按 defaultValue 回填的，跳过它们会打掉原有行为。
+        if (form1Field.lockValue) {
+          return;
+        }
         let nullValue = this.getNullValue(form1Field);
         let defaultValue = nullValue;
         if (form1Field.defaultValueEnabled !== false) {

package/src/components/vb-tabs/x-tabs.vue

@@ -1,143 +1,167 @@
-<template>
-  <el-tabs
-    v-model="activeName"
-    class="tab-box tab-morenav"
-    @tab-remove="removeTab"
-    @tab-click="tabClick"
-    ref="tabs"
-  >
-    <slot name="default"></slot>
-    <template v-for="(tab, index) in tabs">
-      <slot name="editTab" v-bind="{ tab, index, tabs, reloadTabContent }"></slot>
-    </template>
-  </el-tabs>
-</template>
-<script>
-export default {
-  name: "x-tabs",
-  props: {
-    value: String,
-    paneKeyName: {
-      type: String,
-      default: () => "id",
-    },
-    tabNameEnable: {
-      type: Boolean,
-      default: () => false,
-    },
-  },
-  data() {
-    return {
-      activeName: "0",
-      tabs: [],
-    };
-  },
-  watch: {
-    value(val) {
-      this.activeName = val;
-    },
-    activeName(val) {
-      this.$emit("input", val);
-    },
-  },
-  created() {
-    if (this.value) {
-      this.activeName = this.value;
-    }
-  },
-  methods: {
-    openEditTab(row, param, option) {
-      let paneKeyName = this.paneKeyName;
-      let tab = this.tabs.find((tab) => tab.data[paneKeyName] === row[paneKeyName]);
-      let tabParam = option?.tabParam || {};
-      let dataId = row ? row[paneKeyName] : null;
-      let newTab = {
-        data: row,
-        showContent: false,
-        dataId: dataId,
-        param,
-        ...tabParam,
-      };
-      if (!tab) {
-        tab = newTab;
-        if (this.tabs.length >= 30) {
-          this.tabs.splice(0, 1, tab);
-        } else {
-          this.tabs.push(tab);
-        }
-        this.$nextTick(() => {
-          let paneName = this.getCurrentPaneName();
-          tab.paneName = paneName;
-        });
-      } else {
-        Object.assign(tab, newTab);
-      }
-      let tabNameEnable = this.tabNameEnable;
-      this.activeName = row ? (tabNameEnable ? tab.tabName : row[paneKeyName] + "") : "";
-      tab.showContent = false;
-      setTimeout(() => {
-        tab.showContent = true;
-      }, 200);
-    },
-    removeTab(targetName) {
-      let tabNameEnable = this.tabNameEnable;
-      let paneKeyName = this.paneKeyName;
-      let tabIndex = this.tabs.findIndex((tab) => {
-        if (tabNameEnable) {
-          return tab.tabName === targetName;
-        } else {
-          return tab.data[paneKeyName] + "" === targetName;
-        }
-      });
-      if (this.activeName === targetName) {
-        if (tabIndex > 0) {
-          let prev = this.tabs[tabIndex - 1];
-          this.activeName = tabNameEnable
-            ? prev.tabName
-            : prev.data[paneKeyName] + "";
-        } else {
-          this.activeName = "second";
-        }
-      }
-      if (tabIndex !== -1) {
-        this.tabs.splice(tabIndex, 1);
-      }
-      this.$emit("removeTab", targetName);
-    },
-    getCurrentPaneName() {
-      return this.getCurrntPaneTarget().paneName;
-    },
-    getCurrntPaneTarget() {
-      let panes = this.$refs.tabs.panes;
-      let target = panes.find((pane) => pane.active);
-      return target;
-    },
-    reloadTabContent(target, param, tab) {
-      let updateParam =
-        param != null && param.updateParam != null ? param.updateParam : {};
-      for (let key in updateParam) {
-        target.$emit("update:" + key, updateParam[key]);
-      }
-
-      if (!tab) {
-        let activeName = this.activeName;
-        tab = this.tabs.find((item) => item.paneName == activeName);
-      }
-      if (tab) {
-        tab.showContent = false;
-        return new Promise((resolve) => {
-          setTimeout(() => {
-            tab.showContent = true;
-            this.$nextTick(resolve);
-          }, 200);
-        });
-      }
-      return Promise.resolve();
-    },
-    tabClick(targetName) {
-      this.$emit("tabClick", targetName);
-    },
-  },
-};
-</script>
-<style scoped></style>
+<template>
+  <el-tabs
+    v-model="activeName"
+    class="tab-box tab-morenav"
+    @tab-remove="removeTab"
+    @tab-click="tabClick"
+    ref="tabs"
+  >
+    <slot name="default"></slot>
+    <template v-for="(tab, index) in tabs">
+      <slot name="editTab" v-bind="{ tab, index, tabs, reloadTabContent }"></slot>
+    </template>
+  </el-tabs>
+</template>
+<script>
+export default {
+  name: "x-tabs",
+  props: {
+    value: String,
+    paneKeyName: {
+      type: String,
+      default: () => "id",
+    },
+    tabNameEnable: {
+      type: Boolean,
+      default: () => false,
+    },
+    // 关闭页签前置钩子 beforeRemove(targetName, tab) => Boolean | Promise<Boolean>
+    // 返回 false（或 reject）则中止关闭，用于「未保存提示」。不传 = 行为与原来完全一致。
+    beforeRemove: Function,
+  },
+  data() {
+    return {
+      activeName: "0",
+      tabs: [],
+    };
+  },
+  watch: {
+    value(val) {
+      this.activeName = val;
+    },
+    activeName(val) {
+      this.$emit("input", val);
+    },
+  },
+  created() {
+    if (this.value) {
+      this.activeName = this.value;
+    }
+  },
+  methods: {
+    openEditTab(row, param, option) {
+      let paneKeyName = this.paneKeyName;
+      let tab = this.tabs.find((tab) => tab.data[paneKeyName] === row[paneKeyName]);
+      let tabParam = option?.tabParam || {};
+      let dataId = row ? row[paneKeyName] : null;
+      let newTab = {
+        data: row,
+        showContent: false,
+        dataId: dataId,
+        param,
+        ...tabParam,
+      };
+      if (!tab) {
+        tab = newTab;
+        if (this.tabs.length >= 30) {
+          this.tabs.splice(0, 1, tab);
+        } else {
+          this.tabs.push(tab);
+        }
+        this.$nextTick(() => {
+          let paneName = this.getCurrentPaneName();
+          tab.paneName = paneName;
+        });
+      } else {
+        Object.assign(tab, newTab);
+      }
+      let tabNameEnable = this.tabNameEnable;
+      this.activeName = row ? (tabNameEnable ? tab.tabName : row[paneKeyName] + "") : "";
+      tab.showContent = false;
+      setTimeout(() => {
+        tab.showContent = true;
+      }, 200);
+    },
+    // el-tabs 的 tab-remove 入口：先过 beforeRemove 钩子，通过后才真正关闭。
+    // 程序化关闭（如流程提交后自动关页签）应直接调 doRemoveTab 跳过确认。
+    removeTab(targetName) {
+      if (!this.beforeRemove) {
+        this.doRemoveTab(targetName);
+        return;
+      }
+      let tabNameEnable = this.tabNameEnable;
+      let paneKeyName = this.paneKeyName;
+      let tab = this.tabs.find((tab) => {
+        return tabNameEnable
+          ? tab.tabName === targetName
+          : tab.data[paneKeyName] + "" === targetName;
+      });
+      Promise.resolve(this.beforeRemove(targetName, tab)).then(
+        (pass) => {
+          if (pass !== false) this.doRemoveTab(targetName);
+        },
+        () => {} // reject 视为取消关闭（方便直接把 $baseConfirm 的 promise 丢回来）
+      );
+    },
+    doRemoveTab(targetName) {
+      let tabNameEnable = this.tabNameEnable;
+      let paneKeyName = this.paneKeyName;
+      let tabIndex = this.tabs.findIndex((tab) => {
+        if (tabNameEnable) {
+          return tab.tabName === targetName;
+        } else {
+          return tab.data[paneKeyName] + "" === targetName;
+        }
+      });
+      if (this.activeName === targetName) {
+        if (tabIndex > 0) {
+          let prev = this.tabs[tabIndex - 1];
+          this.activeName = tabNameEnable
+            ? prev.tabName
+            : prev.data[paneKeyName] + "";
+        } else {
+          this.activeName = "second";
+        }
+      }
+      if (tabIndex !== -1) {
+        this.tabs.splice(tabIndex, 1);
+      }
+      this.$emit("removeTab", targetName);
+    },
+    getCurrentPaneName() {
+      return this.getCurrntPaneTarget().paneName;
+    },
+    getCurrntPaneTarget() {
+      let panes = this.$refs.tabs.panes;
+      let target = panes.find((pane) => pane.active);
+      return target;
+    },
+    reloadTabContent(target, param, tab) {
+      let updateParam =
+        param != null && param.updateParam != null ? param.updateParam : {};
+      for (let key in updateParam) {
+        target.$emit("update:" + key, updateParam[key]);
+      }
+
+      if (!tab) {
+        let activeName = this.activeName;
+        tab = this.tabs.find((item) => item.paneName == activeName);
+      }
+      if (tab) {
+        tab.showContent = false;
+        return new Promise((resolve) => {
+          setTimeout(() => {
+            tab.showContent = true;
+            this.$nextTick(resolve);
+          }, 200);
+        });
+      }
+      return Promise.resolve();
+    },
+    tabClick(targetName) {
+      this.$emit("tabClick", targetName);
+    },
+  },
+};
+</script>
+<style scoped></style>

package/src/components/wf/content.vue

@@ -6,9 +6,15 @@
     v-if="!isHideWf"
   >
     <template #default>
+      <!-- 审批按钮条：标题栏那份挂上后（headerActionsMounted）整条 v-show 藏掉。
+           用 v-show 而不是 v-if，是为了保住 addOpinionBtn——下拉里「补充意见」走的是
+           $refs.addOpinionBtn.openDialog()。开了 wfActionInHeaderEnabled 时，详情标题栏
+           另挂一份（wfActionDropdown.vue）：通过/驳回/撤回平铺，其余收进「更多」下拉。 -->
       <div
+        ref="wfActionBar"
         style="margin: -36px 0 8px 124px; position: relative; z-index: 2; height: 28px"
         v-if="!wfConfig.hiddenAllButton"
+        v-show="!headerActionsMounted"
       >
         <el-button
           type="success"
@@ -97,6 +103,7 @@
         </el-button>
         <addOpinionButton
           v-if="showAddOpinionButton"
+          ref="addOpinionBtn"
           @confirm="reloadContent()"
           :wfInfo="wfInfo"
           :wfSendTaskId="wfSendTaskId"
@@ -625,6 +632,8 @@
         </span>
       </el-dialog>
 
+      <!-- append-to-body 必须留着：本弹框在 baseTabPane 的 v-show 子树里，
+           「流程信息」一折叠就跟着 display:none，标题栏那份审批入口点了会毫无反应 -->
       <el-dialog
         v-if="rejectDialogVisible"
         :visible.sync="rejectDialogVisible"
@@ -634,6 +643,7 @@
         custom-class="dialog-style wf-dialog"
         v-el-drag-dialog
         v-el-dialog-center
+        :append-to-body="true"
       >
         <template #title>
           <span class="el-dialog__title"
@@ -711,6 +721,7 @@
           </el-button>
         </span>
       </el-dialog>
+      <!-- 同上：折叠态下要能弹出来，append-to-body 不能去掉 -->
       <el-dialog
         v-if="agreeDialogVisible"
         :visible.sync="agreeDialogVisible"
@@ -720,6 +731,7 @@
         custom-class="dialog-style wf-dialog"
         v-el-drag-dialog
         v-el-dialog-center
+        :append-to-body="true"
       >
         <template #title>
           <span class="el-dialog__title"
@@ -935,6 +947,7 @@
           >
         </span>
       </el-dialog>
+      <!-- 同上：折叠态下要能弹出来，append-to-body 不能去掉 -->
       <el-dialog
         v-if="revokeDialogVisible"
         :visible.sync="revokeDialogVisible"
@@ -944,6 +957,7 @@
         custom-class="dialog-style wf-dialog"
         v-el-drag-dialog
         v-el-dialog-center
+        :append-to-body="true"
       >
         <template #title>
           <span class="el-dialog__title"