cloud-web-corejs 1.0.269 → 1.0.271

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.269",
+  "version": "1.0.271",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/xform/form-designer/form-widget/field-widget/select-export-item-button-widget.vue

@@ -8,12 +8,31 @@
     :parent-list="parentList"
     :index-of-parent-list="indexOfParentList"
   >
+    <el-dropdown
+      v-if="field.options.exportItemConditionEnabled"
+      trigger="hover"
+      :disabled="field.options.disabled"
+    >
+      <el-button :type="field.options.type" class="button-sty" size="mini">
+        <span>{{ getI18nLabel(field.options.label) }}</span
+        ><span class="line"></span> <i class="el-icon-arrow-down el-icon--right"></i>
+      </el-button>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item icon="el-icon-upload2" @click.native="toConditionExport">
+          {{ getI18nLabel("条件导出") }}
+        </el-dropdown-item>
+        <el-dropdown-item icon="el-icon-upload2" @click.native="toSelectedExport">
+          {{ getI18nLabel("选择导出") }}
+        </el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-button
+      v-else
       :type="field.options.type"
       class="button-sty"
       size="mini"
       icon="el-icon-upload2"
-      @click="toDo('exportItem')"
+      @click="toSelectedExport"
       :disabled="field.options.disabled"
       >{{ getI18nLabel(field.options.label) }}
     </el-button>
@@ -24,6 +43,7 @@ import emitter from "../../../utils/emitter";
 import i18n from "../../../utils/i18n";
 import fieldMixin from "./fieldMixin";
 import StaticContentWrapper from "./static-content-wrapper.vue";
+import { EXPORT_TYPE } from "../../../../excelExport/exportType";
 
 export default {
   name: "select-export-item-button-widget",
@@ -66,6 +86,14 @@ export default {
   },
 
   methods: {
+    /** 明细·条件导出：按当前搜索条件导出，无需勾选。仅在开启「支持条件导出」时可达。 */
+    toConditionExport() {
+      this.toDo(EXPORT_TYPE.ITEM_CONDITION);
+    },
+    /** 明细·选择导出：以勾选行为范围，历史默认行为。 */
+    toSelectedExport() {
+      this.toDo(EXPORT_TYPE.ITEM_SELECTED);
+    },
     toDo(type = null) {
       if (this.designState) {
         return;

package/src/components/xform/form-designer/setting-panel/property-editor/field-table-export-button/select-export-item-button-editor.vue

@@ -9,6 +9,9 @@
     <el-form-item label="表格唯一名称">
       <el-input v-model="optionModel.tableRef"></el-input>
     </el-form-item>
+    <el-form-item label="支持条件导出">
+      <el-switch v-model="optionModel.exportItemConditionEnabled"></el-switch>
+    </el-form-item>
     <el-form-item label="导出列表显示图片">
       <el-switch
         v-model="optionModel.showImageAtTable"

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

@@ -3036,6 +3036,7 @@ export const advancedFields = [
       tableExportParam: "",
       showImageAtTable: false,
       selectExportItemFlag: 1,
+      exportItemConditionEnabled: !1,
 
       onCreated: "",
       onMounted: "",

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

@@ -22,6 +22,11 @@ import {
 } from "../../../../components/xform/utils/util";
 import { tableTreeMixins } from "../../../../mixins/tableTree/index.js";
 import { applyColumnLabelIcon } from "../../../../components/xform/utils/tableColumnHelper";
+import {
+  EXPORT_TYPE,
+  isItemExport,
+  requiresCheckedRows,
+} from "../../../../components/excelExport/exportType";
 
 let modules = {};
 const baseRefUtil = {
@@ -1505,8 +1510,10 @@ modules = {
               let originOption = $grid.params.originOption;
               let formData = {};
 
-              if (customParam?.exportParam?.type !== "exportItem") {
-                //非导出明细
+              // 明细·选择导出已按勾选行 id 精确定位，再叠加主表搜索条件既无意义、又可能
+              // 与明细口径的字段名冲突造成双重过滤，故只有它排除搜索条件；
+              // 明细·条件导出与主表条件导出一样，必须带上搜索条件。
+              if (customParam?.exportParam?.type !== EXPORT_TYPE.ITEM_SELECTED) {
                 formData = tableOption.param ? tableOption.param() || {} : {};
               }
               const queryParams = Object.assign({}, formData);
@@ -1960,7 +1967,8 @@ modules = {
       let scriptCode = this.getScriptCode();
       let accessParam = {};
       let otherParam = {};
-      if (customParam?.exportParam?.type === "exportItem") {
+      let exportType = customParam?.exportParam?.type;
+      if (isItemExport(exportType)) {
         let $grid = this.getGridTable();
         let originOption = $grid.params.originOption;
         let exportItemConfig = originOption.exportItemConfig || {};
@@ -1980,14 +1988,16 @@ modules = {
             otherParam.attachmentType = result;
           }
         }
-        let ids = $grid.getCheckboxRecords(true).map((item) => {
-          return item.id;
-        });
-
-        if (originOption.exportItemConfig.param) {
-          accessParam = originOption.exportItemConfig.param() || {};
+        if (exportItemConfig.param) {
+          accessParam = exportItemConfig.param() || {};
+        }
+        // 只有选择模式以勾选行 id 为过滤条件；条件模式下由搜索条件 + exportItemParam 决定范围，
+        // 写入空的 ids 会被后端当成"无匹配"。
+        if (requiresCheckedRows(exportType)) {
+          accessParam.ids = $grid.getCheckboxRecords(true).map((item) => {
+            return item.id;
+          });
         }
-        accessParam.ids = ids;
       } else {
         accessParam = this.getAccessParam() || {};
         let attachmentType = this.getAttachmentType();

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",