cloud-web-corejs 1.0.268 → 1.0.270

package/src/components/table/config.js

@@ -1,3 +1,5 @@
+import { getTableStateValue } from './state';
+
 let modules = {};
 
 modules = {
@@ -33,7 +35,7 @@ modules = {
           }, ' ' + tableDataInfo.visibleData.length + ' ')
         ];
         if (pager) {
-          if (pager && $grid.isQueryAllPage) {
+          if (pager && getTableStateValue($grid, 'isQueryAllPage')) {
             celems.push(h('span', '/'));
             celems.push(h('span', {
               attrs: {
@@ -42,7 +44,7 @@ modules = {
             }, ' ' + pager.total));
           }
 
-          let iconClass = $grid.isQueryAllPage ? 'icon-yincang' : 'el-icon-view';
+          let iconClass = getTableStateValue($grid, 'isQueryAllPage') ? 'icon-yincang' : 'el-icon-view';
 
           celems.push(h('i', {
             attrs: {
@@ -53,8 +55,8 @@ modules = {
                 let refTarget = $grid.$vnode.data.ref;
                 let that = $grid.params.originOption.vue;
                 let tableName = $grid.params.originOption.tableName;
-                $grid.$vxeTableUtil.checkQueryTotal(that, refTarget, !$grid
-                  .isQueryAllPage);
+                $grid.$vxeTableUtil.checkQueryTotal(that, refTarget,
+                  !getTableStateValue($grid, 'isQueryAllPage'));
               }
             }
           }));

package/src/components/table/index.js

@@ -8,6 +8,7 @@ import { extendDeeply } from "../../utils/index.js";
 import corejsConfig from "@/corejsConfig";
 import settingConfig from "@/settings.js";
 import { getCellValue, createParams } from "./util/index";
+import { getTableStateValue, setTableState } from "./state";
 
 let configUtil = {
   Sortable,
@@ -78,6 +79,15 @@ async function initVxeTable(option) {
   $grid.originOption = originOption;
   option.vue = that;
 
+  // 运行时状态先收集到局部对象，末尾并入 nOption.params 随 vxeOption 传给表格实例，
+  // 保证页面 v-if 销毁重建 grid 后状态不丢（详见 ./state.js）
+  let tableState = {
+    tableName: tableName || null,
+    isQueryAllPage: true,
+    exportColumns: null,
+    exportItemColumns: null,
+  };
+
   let isQueryAllPage = true;
   if (option.isQueryAllPage !== null && option.isQueryAllPage !== undefined) {
     isQueryAllPage = option.isQueryAllPage;
@@ -85,7 +95,7 @@ async function initVxeTable(option) {
 
   let searchColumns = null;
   if (tableName) {
-    $grid.tableName = tableName;
+    setTableState($grid, "tableName", tableName);
     if (option.path) {
       await getTableData(that, option.tableRef, "isQueryAllPage", (res1) => {
         let result = res1.objx ? res1.objx.data : null;
@@ -113,7 +123,7 @@ async function initVxeTable(option) {
             json.searchColumns
           );
           $grid.searchColumns = searchColumns;
-          initExportColumns($grid, json);
+          initExportColumns($grid, tableState, json);
         }
       }
       if (!searchColumns || !searchColumns.length) {
@@ -137,10 +147,11 @@ async function initVxeTable(option) {
   option.isQueryAllPage = isQueryAllPage;
   let nOption = initOption(option);
 
-  // isQueryAllPage 的唯一事实源是表格实例（checkQueryTotal 也写这里），
-  // pager 插槽与代理 ajax.query 均读 $grid.isQueryAllPage，初始化必须回写，
+  // isQueryAllPage 的事实源是 $grid.params（checkQueryTotal 也写这里），
+  // pager 插槽与代理 ajax.query 均读它，初始化必须回写，
   // 否则首屏恒为 undefined：既丢用户存的偏好，也让页面配置的 false 不生效。
-  $grid.isQueryAllPage = isQueryAllPage;
+  tableState.isQueryAllPage = isQueryAllPage;
+  setTableState($grid, "isQueryAllPage", isQueryAllPage);
 
   if (tableName) {
     nOption.tableName = tableName;
@@ -157,12 +168,14 @@ async function initVxeTable(option) {
   // nOption.getCellValue = getCellValue;
   // nOption.createParams = createParams;
   // nOption.searchColumns = searchColumns;
-  // 注意：isQueryAllPage 不放 params——它是运行时可变状态，事实源在 $grid 上（见上方回写）
+  // 运行时可变状态（tableName / isQueryAllPage / exportColumns / exportItemColumns）
+  // 一并放进 params：params 随 vxeOption 由页面持有，grid 被 v-if 销毁重建后依然带着这些值
   let params = {
     originOption,
     getCellValue,
     createParams,
     searchColumns,
+    ...tableState,
   };
   if (!nOption.params) nOption.params = {};
   Object.assign(nOption.params, params);
@@ -193,6 +206,35 @@ function handleToolbar($grid, option) {
   }
 }
 
+/**
+ * grid 被 v-if 销毁重建后调用（页面把 showTable 从 false 切回 true 之类）。
+ *
+ * 状态类（tableName / isQueryAllPage / exportColumns…）已经随 params 跨重建存活，
+ * 这里只重做「绑在实例或 DOM 上、params 带不走」的那部分：
+ *   - columnDrop：Sortable 绑的是旧表头 DOM，重建后新表头上什么都没有，列拖拽会静默失效；
+ *   - handleToolbar：$grid.connect(toolbar) 是实例间的连接，重建后失联。
+ * 必须等新 grid 渲染出表头再绑，所以整体放在 $nextTick 里。
+ */
+function rebindGrid(that, tableRef) {
+  let $grid = getGrid(that, tableRef);
+  let originOption = $grid && $grid.params && $grid.params.originOption;
+  if (!originOption) {
+    // 没走过 initVxeTable 的表格没有 params.originOption，无从重绑
+    return Promise.resolve(false);
+  }
+  $grid.originOption = originOption;
+  // vxeFilter 已改为直接 import 工具函数，这里补挂只为兼容直接读 $table.getCellValue 的业务代码
+  if ($grid.$refs && $grid.$refs.xTable) {
+    $grid.$refs.xTable.getCellValue = getCellValue;
+    $grid.$refs.xTable.createParams = createParams;
+  }
+  return $grid.$nextTick().then(() => {
+    columnDrop(that, originOption.tableName, tableRef);
+    handleToolbar($grid, originOption);
+    return true;
+  });
+}
+
 //操作列自动补全
 function handleCustomAlign(option) {
   let selfConfig = getSelfConfig();
@@ -270,6 +312,16 @@ function columnDrop(t, tableName, tableRef) {
   if (!$table) {
     return;
   }
+  // 表头尚未渲染（grid 刚被 v-if 重建、DOM 还没就绪）时 querySelector 返回 null，
+  // Sortable.create(null) 会直接抛错，这里降级为不绑定，由调用方在 $nextTick 后重试
+  const headerElem =
+    $table.$el &&
+    $table.$el.querySelector(
+      ".body--wrapper>.vxe-table--header .vxe-header--row"
+    );
+  if (!headerElem) {
+    return;
+  }
   // if (!$table.params) $table.params = {};
   if ($table.sortable) {
     $table.sortable.destroy();
@@ -278,9 +330,7 @@ function columnDrop(t, tableName, tableRef) {
   let dragStartIndex = -1;
   let dragEndIndex = -1;
   $table.sortable = configUtil.Sortable.create(
-    $table.$el.querySelector(
-      ".body--wrapper>.vxe-table--header .vxe-header--row"
-    ),
+    headerElem,
     {
       handle: ".vxe-header--column:not(.col--fixed)",
       onMove: (a, b, c) => {
@@ -546,7 +596,7 @@ function initOption(opts) {
               " " + tableDataInfo.visibleData.length + " "
             ),
           ];
-          if (pager && $grid.isQueryAllPage) {
+          if (pager && getTableStateValue($grid, "isQueryAllPage")) {
             celems.push(
               h(
                 "span",
@@ -648,7 +698,7 @@ function initOption(opts) {
               }
 
               let $grid = getGrid(that, opts.tableRef);
-              let isQueryAllPage = $grid.isQueryAllPage;
+              let isQueryAllPage = getTableStateValue($grid, "isQueryAllPage");
               let pathStr1 = "";
               if (isQueryAllPage === false) {
                 queryParams.searchCount = false;
@@ -926,11 +976,13 @@ function addTableJson(that, $grid, tableName, columns, success) {
     columns: saveColumn,
     searchColumns: searchColumns,
   };
-  if ($grid.exportColumns && $grid.exportColumns.length) {
-    jsonData.exportColumns = $grid.exportColumns;
+  let exportColumns = getTableStateValue($grid, "exportColumns");
+  let exportItemColumns = getTableStateValue($grid, "exportItemColumns");
+  if (exportColumns && exportColumns.length) {
+    jsonData.exportColumns = exportColumns;
   }
-  if ($grid.exportItemColumns && $grid.exportItemColumns.length) {
-    jsonData.exportItemColumns = $grid.exportItemColumns;
+  if (exportItemColumns && exportItemColumns.length) {
+    jsonData.exportItemColumns = exportItemColumns;
   }
   let json = encodeURIComponent(JSON.stringify(jsonData));
 
@@ -1020,12 +1072,14 @@ function initColumn(option, syncColumns) {
   return newColumns;
 }
 
-function initExportColumns($grid, json) {
+function initExportColumns($grid, tableState, json) {
   if (json?.exportColumns?.length) {
-    $grid.exportColumns = json.exportColumns;
+    tableState.exportColumns = json.exportColumns;
+    setTableState($grid, "exportColumns", json.exportColumns);
   }
   if (json?.exportItemColumns?.length) {
-    $grid.exportItemColumns = json.exportItemColumns;
+    tableState.exportItemColumns = json.exportItemColumns;
+    setTableState($grid, "exportItemColumns", json.exportItemColumns);
   }
 }
 
@@ -1141,7 +1195,7 @@ function getTableData(that, tableRef, type, success) {
   )
     return false;
   let $grid = getGrid(that, tableRef);
-  let tableName = $grid.tableName;
+  let tableName = getTableStateValue($grid, "tableName");
   let url = USER_PREFIX + "/table_column/getTableData";
   let param = {
     tableName: tableName,
@@ -1163,7 +1217,7 @@ function addTableData(that, tableRef, value, success) {
   )
     return false;
   let $grid = getGrid(that, tableRef);
-  let tableName = $grid.tableName;
+  let tableName = getTableStateValue($grid, "tableName");
   if (tableName) {
     that.$http({
       method: "post",
@@ -1180,8 +1234,7 @@ function addTableData(that, tableRef, value, success) {
 
 function checkQueryTotal(that, tableRef, value) {
   let $grid = getGrid(that, tableRef);
-  $grid.isQueryAllPage = value;
-  let tableName = $grid.tableName;
+  setTableState($grid, "isQueryAllPage", value);
   let option = $grid.getProxyInfo();
   let pagerConfig = $grid.pagerConfig;
 
@@ -1201,6 +1254,7 @@ function getPagerConfigLayouts(opts) {
 modules = {
   initVxeTable,
   columnDrop,
+  rebindGrid,
   initOption,
   getTableJson,
   addTableJson,
@@ -1212,6 +1266,8 @@ modules = {
   checkQueryTotal,
   getCellValue,
   createParams,
+  getTableStateValue,
+  setTableState,
 };
 
 if (!configUtil.Vue.prototype.$vxeTableUtil)

package/src/components/table/state.js

@@ -0,0 +1,42 @@
+/**
+ * 表格运行时状态收口。
+ *
+ * 背景：initVxeTable 早期把 tableName / isQueryAllPage / exportColumns 等运行时状态
+ * 直接挂在 vxe-grid 实例上。页面若用 v-if 销毁重建 grid 而不重跑 initVxeTable
+ * （如 pmd/product_problem_record/list.vue 里 showTable false→true 那一段），
+ * 新实例上这些属性全为 undefined，表现为：
+ *   - 导出字段勾选丢失，且下次 addTableJson 会把服务端已存的 exportColumns 一并抹掉；
+ *   - “查询全部页”偏好静默存不进去（tableName 取不到）；
+ *   - 分页器 total 与切换图标状态错乱（isQueryAllPage 恒 falsy）。
+ * 同源问题还导致过筛选面板的 $table.getCellValue is not a function。
+ *
+ * 现在统一存放在 $grid.params 上：params 对象随 vxeOption 由页面持有，
+ * 重建时原样传给新实例，因此状态可以跨重建存活。
+ *
+ * 兼容：写入时同步回写 $grid 实例属性，读取时 params 里没有再回落到实例属性。
+ * 未经 initVxeTable 初始化的表格（xform 自建 option 等）行为与改造前完全一致。
+ */
+
+/** 读状态：优先 params，回落实例属性 */
+export function getTableStateValue($grid, key) {
+  if (!$grid) return undefined;
+  let params = $grid.params;
+  if (params) {
+    let value = params[key];
+    if (value !== undefined && value !== null) return value;
+  }
+  return $grid[key];
+}
+
+/** 写状态：params 与实例属性同时写，保证新旧读法都拿到同一个值 */
+export function setTableState($grid, key, value) {
+  if (!$grid) return;
+  // params 是 prop 对象，只改其中的 key，不整体重新赋值
+  if ($grid.params) $grid.params[key] = value;
+  $grid[key] = value;
+}
+
+export default {
+  getTableStateValue,
+  setTableState,
+};

package/src/components/table/vxeFilter/index.js

@@ -3,6 +3,8 @@ import XEUtils from 'xe-utils';
 import FilterComplex from './FilterComplex.vue';
 import FilterContent from './FilterContent.vue';
 import FilterInput from './FilterInput.vue';
+// 同 mixin.js：直接引用工具函数，避免依赖 $table 实例上的补丁方法
+import { getCellValue } from '../util/index';
 
 let moudule = {};
 let configUtil = {
@@ -77,7 +79,7 @@ configUtil.VXETable.renderer.add('FilterContent', {
     const {
       vals
     } = option.data;
-    let cellValue = obj.$table.getCellValue(obj);
+    let cellValue = getCellValue(obj);
     return vals.includes(cellValue);
   }
 });
@@ -140,7 +142,7 @@ configUtil.VXETable.renderer.add('FilterInput', {
       data
     } = option;
 
-    let cellValue = obj.$table.getCellValue(obj);
+    let cellValue = getCellValue(obj);
 
     if (cellValue) {
       return cellValue.indexOf(data) > -1;

package/src/components/table/vxeFilter/mixin.js

@@ -1,3 +1,9 @@
+// 直接引用工具函数，不走 $table 实例上的补丁方法：
+// initVxeTable 只把 getCellValue/createParams 挂在初始化时的那个 xTable 实例上，
+// 页面若用 v-if 销毁重建 vxe-grid（如 product_problem_record/list.vue），
+// 新实例上没有这两个方法，筛选面板会报 $table.getCellValue is not a function
+import { getCellValue, createParams } from "../util/index";
+
 let modules = {};
 
 modules = {
@@ -51,7 +57,7 @@ modules = {
         let lsm = {};
         let colValList = [];
         fullData.map((row, $rowIndex) => {
-          let cellValue = $table.getCellValue({
+          let cellValue = getCellValue({
             row,
             $rowIndex,
             $table,
@@ -100,19 +106,19 @@ modules = {
               return false;
             }
             const vals = option1.data.vals || [];
-            let param = $table.createParams({
+            let param = createParams({
               $table: $table,
               row,
               column: filterColumn,
             });
-            let cellValue = $table.getCellValue(param);
+            let cellValue = getCellValue(param);
             return !vals.includes(cellValue);
           });
           return item == null;
         });
         let lsm2 = {};
         datas.map((row, $rowIndex) => {
-          let cellValue = $table.getCellValue({
+          let cellValue = getCellValue({
             row,
             $rowIndex,
             $table,

package/src/components/xform/form-designer/form-widget/dialog/vabSearchDialog.vue

@@ -79,6 +79,7 @@
 
 <script>
 import {selectDialogMixins} from '../../../../../mixins/selectDialog/index.js';
+import {getTableStateValue} from '../../../../../components/table/state';
 
 export default {
   name: "vabSearchDialog",
@@ -234,7 +235,7 @@ export default {
                 }
 
                 var $grid = this.$refs[tableRef];
-                let isQueryAllPage = $grid.isQueryAllPage;
+                let isQueryAllPage = getTableStateValue($grid, 'isQueryAllPage');
                 let pathStr1 = "";
                 if (isQueryAllPage === false) {
                   queryParams.searchCount = false;

package/src/components/xform/form-designer/setting-panel/property-editor/event-handler/afterColumnsCreated-editor.vue

@@ -0,0 +1,30 @@
+<template>
+  <el-form-item label="afterColumnsCreated" label-width="150px">
+    <a href="javascript:void(0);" class="a-link link-oneLind" @click="editEventHandler('afterColumnsCreated', eventParams)">
+      <span>{{ optionModel.afterColumnsCreated }}</span>
+      <i class="el-icon-edit"></i>
+    </a>
+  </el-form-item>
+</template>
+
+<script>
+import i18n from "../../../../../../components/xform/utils/i18n";
+import eventMixin from "../../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
+
+export default {
+  name: "afterColumnsCreated-editor",
+  mixins: [i18n, eventMixin],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+  data() {
+    return {
+      eventParams: ["columns", "$grid"],
+    };
+  },
+};
+</script>
+
+<style scoped></style>

package/src/components/xform/form-designer/setting-panel/propertyRegister.js

@@ -258,6 +258,7 @@ const EVENT_PROPERTIES = {
   'onCheckboxChange': 'onCheckboxChange-editor',
   'onSearchTable': 'onSearchTable-editor',
   'onResetTable': 'onResetTable-editor',
+  'afterColumnsCreated': 'afterColumnsCreated-editor',
 
   //tree事件
   onNodeClick: "onNodeClick-editor",

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

@@ -256,6 +256,7 @@ export const containers = [
       onCellDblclick: "",
       onSearchTable: "",
       onResetTable: "",
+      afterColumnsCreated: "",
       accessType: "1",
       accessUrl: null,
       accessReturnType: "1",

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

@@ -9,6 +9,7 @@ import {
   markMaskedExportColumns,
 } from "../../../../components/xform/utils/textMaskUtil";
 import tableConfig from "../../../../components/table/config.js";
+import { getTableStateValue } from "../../../../components/table/state";
 import { extendDeeply } from "../../../../utils/index.js";
 import {
   assembleAxiosConfig,
@@ -576,11 +577,39 @@ modules = {
       (this.widget.options.tableColumns = e),
         this.$nextTick(function () {
           t.$refs.dataTable.doLayout();
+          t.emitAfterColumnsCreated(e);
         });
     },
     setTableColumn: function (e) {
       this.setTableColumns(e);
     },
+    /**
+     * 表头（列）创建完成后的统一出口：首次建表和 setTableColumns 两条链路都经这里。
+     *
+     * 脚本签名：function (dataId, formCode, columns, $grid)
+     *   columns —— 列配置数组（含 checkbox 列、分组表头 children）
+     *   $grid   —— vxe-grid 实例，需要活列对象时用 $grid.getTableColumn()
+     *
+     * 注意：表头每次重建都会触发，脚本必须幂等。
+     * @param {Array} columns 列配置。
+     */
+    emitAfterColumnsCreated(columns) {
+      const script = this.widget.options.afterColumnsCreated;
+      if (!script) return;
+      // 列刚写进 vxeOption，DOM 表头还没渲染完，等一拍脚本才能操作表头节点
+      this.$nextTick(() => {
+        try {
+          this.handleCustomEvent(
+            script,
+            ["columns", "$grid"],
+            [columns || [], this.getGridTable()]
+          );
+        } catch (error) {
+          // handleCustomEvent 已按配置弹「前端脚本异常」，这里吞掉避免打断建表后续流程
+          console.error("afterColumnsCreated 脚本执行异常", error);
+        }
+      });
+    },
     getTableData: function () {
       return this.widget.options.tableData;
     },
@@ -1018,7 +1047,7 @@ modules = {
           if (this.widget.options.showPagination) {
             let proxyInfo = $grid.getProxyInfo();
             let searchCount = true;
-            let isQueryAllPage = $grid.isQueryAllPage;
+            let isQueryAllPage = getTableStateValue($grid, "isQueryAllPage");
             if (isQueryAllPage === false) {
               searchCount = false;
             }
@@ -1504,7 +1533,7 @@ modules = {
               }
 
               // let $grid = this.getGridTable();
-              let isQueryAllPage = $grid.isQueryAllPage;
+              let isQueryAllPage = getTableStateValue($grid, "isQueryAllPage");
               let pathStr1 = "";
               /* if (isQueryAllPage === false) {
                 queryParams.searchCount = false;
@@ -1713,6 +1742,7 @@ modules = {
       }
       this.$vxeTableUtil.initVxeTable(tableOption).then((opts) => {
         this.vxeOption = opts;
+        this.emitAfterColumnsCreated(opts?.columns || columns);
         if (!isQueryTable) {
           setTimeout(() => {
             this.loadAccessData(1);

package/src/views/user/wf/wf_manage/list.vue

@@ -312,6 +312,18 @@
                     </el-select>
                   </template>
                 </vxe-form-item>
+                <vxe-form-item
+                  :title="$t1('禁用用户') + ':'"
+                  field="disabledUserName"
+                >
+                  <template v-slot>
+                    <el-input
+                      v-model="formData2.disabledUserName"
+                      size="small"
+                      clearable
+                    />
+                  </template>
+                </vxe-form-item>
               </vxe-form>
             </template>
           </vxe-grid>
@@ -925,6 +937,11 @@ export default {
             field: "candidateNames",
             width: 150,
           },
+          {
+            title: this.$t1("禁用用户"),
+            field: "disabledUserNames",
+            width: 200,
+          },
           {
             title: this.$t1("流程状态"),
             field: "stat",