@zscreate/form-component 1.1.447 → 1.1.449

package/dist/form-component.umd.js

@@ -67239,7 +67239,7 @@ let getFileExt = filename => {
 /* harmony import */ var _util_mathUtils__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(9548);
 /* harmony import */ var _util_util__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(4063);
 /* harmony import */ var _layoutItem__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(1428);
-/* harmony import */ var _components_index__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(3229);
+/* harmony import */ var _components_index__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(1147);
 /* harmony import */ var pubsub_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(1528);
 /* harmony import */ var pubsub_js__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(pubsub_js__WEBPACK_IMPORTED_MODULE_9__);
 /* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(9274);
@@ -70303,7 +70303,7 @@ module.exports = {
 
 /***/ }),
 
-/***/ 3229:
+/***/ 1147:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
@@ -72560,15 +72560,15 @@ var widgetDesign_component = (0,componentNormalizer/* default */.A)(
   widgetSetup: widgetSetup,
   widgetDesign: widgetDesign
 });
-;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/Select/component.vue?vue&type=template&id=d4696436&scoped=true
-var componentvue_type_template_id_d4696436_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return (_vm.widget)?_c('div',{staticClass:"custom_form_item select_component",style:({ height: _vm.widget.options.height + 'px',background: _vm.widget.options.bgColor, '--dropdown_width': _vm.dropDownWidth })},[_c('a-form-model-item',{ref:_vm.widget.model,attrs:{"colon":false,"label-col":_vm.labelCol,"wrapperCol":_vm.wrapperCol,"prop":_vm.tableKey ? (_vm.tableKey + "." + _vm.tableIndex + "." + (_vm.widget.model)) : _vm.widget.model,"rules":_vm.tableKey ? _vm.rules[_vm.tableKey][_vm.widget.model] : _vm.rules[_vm.widget.model]}},[(_vm.widget.options.labelWidth !== 0)?_c('div',{class:[
+;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/Select/component.vue?vue&type=template&id=75b0be13&scoped=true
+var componentvue_type_template_id_75b0be13_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return (_vm.widget)?_c('div',{staticClass:"custom_form_item select_component",style:({ height: _vm.widget.options.height + 'px',background: _vm.widget.options.bgColor, '--dropdown_width': _vm.dropDownWidth })},[_c('a-form-model-item',{ref:_vm.widget.model,attrs:{"colon":false,"label-col":_vm.labelCol,"wrapperCol":_vm.wrapperCol,"prop":_vm.tableKey ? (_vm.tableKey + "." + _vm.tableIndex + "." + (_vm.widget.model)) : _vm.widget.model,"rules":_vm.tableKey ? _vm.rules[_vm.tableKey][_vm.widget.model] : _vm.rules[_vm.widget.model]}},[(_vm.widget.options.labelWidth !== 0)?_c('div',{class:[
         _vm.config.align,
         _vm.config.validate === true && _vm.widget.options.required === true
           ? 'is_required'
           : 'no_required' ],style:({ color: this.config.color }),attrs:{"slot":"label"},slot:"label"},[_vm._v(" "+_vm._s(_vm.widget.name)+" ")]):_vm._e(),_c('a-select',{attrs:{"dropdownStyle":{ zIndex: 3000,  maxWidth: _vm.dropDownMaxWidth, minWidth: _vm.dropDownMinWidth },"placeholder":_vm.widget.options.placeholder,"disabled":_vm.isdisabled ? _vm.show : _vm.widget.options.disabled,"value":_vm.select_value,"showSearch":"","optionFilterProp":"label","allowClear":"","getPopupContainer":function (triggerNode) {
           return triggerNode.parentNode || _vm.document.body;
         },"mode":_vm.widget.options.multiple ? 'multiple' : 'default'},on:{"change":_vm.handleChange,"search":_vm.handleSearch,"popupScroll":function (e) { _vm.handleScroll(e) }}},_vm._l((_vm.filterDictOptions),function(item,idx){return _c('a-select-option',{key:idx,attrs:{"title":item.text,"value":item.value,"label":item.text}},[_vm._v(" "+_vm._s(item.text)+" ")])}),1)],1)],1):_vm._e()}
-var componentvue_type_template_id_d4696436_scoped_true_staticRenderFns = []
+var componentvue_type_template_id_75b0be13_scoped_true_staticRenderFns = []
 
 
 // EXTERNAL MODULE: ./node_modules/_core-js@3.36.1@core-js/modules/es.array.unshift.js
@@ -72782,6 +72782,11 @@ var external_commonjs_vue_commonjs2_vue_root_Vue_default = /*#__PURE__*/__webpac
           //用此判断 来确定是否由消息发布者手动触发来启动
           this.dataModel = undefined;
           this.dictOptions = [];
+          if (data.val === undefined) {
+            this.dataModel = undefined;
+            this.$emit("updateModels", this.dataModel);
+            return false;
+          }
           data = data.val;
         }
         // console.log(data); // 这里将会输出对应设置的参数
@@ -72795,6 +72800,7 @@ var external_commonjs_vue_commonjs2_vue_root_Vue_default = /*#__PURE__*/__webpac
           this.isGetOptionsByPulish = true; //控制该订阅者只接受发布者的指定获取数据源
 
           (0,manage/* getAction */.Th)(this.widget.options.dictUrl, params).then(res => {
+            var _res$result;
             if (res.success) {
               __webpack_require__.g.dictData[wight.model] = this.dictOptions = res.result.map(item => {
                 return {
@@ -72805,10 +72811,11 @@ var external_commonjs_vue_commonjs2_vue_root_Vue_default = /*#__PURE__*/__webpac
               if (this.dictOptions.some(item => item.value == currDataModel)) {
                 this.dataModel = currDataModel;
               }
-              if (res.result.length == 0) {
-                this.$emit("updateModels", this.dataModel);
-                return false;
-              }
+            }
+            if (!(res !== null && res !== void 0 && (_res$result = res.result) !== null && _res$result !== void 0 && _res$result.length)) {
+              this.dataModel = [];
+              this.$emit("updateModels", this.dataModel);
+              return false;
             }
           });
         }
@@ -72913,10 +72920,10 @@ var external_commonjs_vue_commonjs2_vue_root_Vue_default = /*#__PURE__*/__webpac
 });
 ;// CONCATENATED MODULE: ./src/form/modules/components/Select/component.vue?vue&type=script&lang=js
  /* harmony default export */ const components_Select_componentvue_type_script_lang_js = (Select_componentvue_type_script_lang_js); 
-;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.8.1@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.10.0@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/Select/component.vue?vue&type=style&index=0&id=d4696436&prod&lang=less&scoped=true
+;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.8.1@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.10.0@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/Select/component.vue?vue&type=style&index=0&id=75b0be13&prod&lang=less&scoped=true
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/form/modules/components/Select/component.vue?vue&type=style&index=0&id=d4696436&prod&lang=less&scoped=true
+;// CONCATENATED MODULE: ./src/form/modules/components/Select/component.vue?vue&type=style&index=0&id=75b0be13&prod&lang=less&scoped=true
 
 ;// CONCATENATED MODULE: ./src/form/modules/components/Select/component.vue
 
@@ -72929,11 +72936,11 @@ var external_commonjs_vue_commonjs2_vue_root_Vue_default = /*#__PURE__*/__webpac
 
 var component_component = (0,componentNormalizer/* default */.A)(
   components_Select_componentvue_type_script_lang_js,
-  componentvue_type_template_id_d4696436_scoped_true_render,
-  componentvue_type_template_id_d4696436_scoped_true_staticRenderFns,
+  componentvue_type_template_id_75b0be13_scoped_true_render,
+  componentvue_type_template_id_75b0be13_scoped_true_staticRenderFns,
   false,
   null,
-  "d4696436",
+  "75b0be13",
   null
   
 )
@@ -72953,495 +72960,8 @@ var formOneTablevue_type_template_id_03256b4f_staticRenderFns = []
 
 // EXTERNAL MODULE: ./node_modules/_lodash@4.17.21@lodash/lodash.js
 var lodash = __webpack_require__(5182);
-// EXTERNAL MODULE: ./node_modules/_core-js@3.36.1@core-js/modules/web.url.to-json.js
-var web_url_to_json = __webpack_require__(2343);
-// EXTERNAL MODULE: ./node_modules/_core-js@3.36.1@core-js/modules/web.url-search-params.delete.js
-var web_url_search_params_delete = __webpack_require__(2874);
-// EXTERNAL MODULE: ./node_modules/_core-js@3.36.1@core-js/modules/web.url-search-params.has.js
-var web_url_search_params_has = __webpack_require__(9721);
-// EXTERNAL MODULE: ./node_modules/_core-js@3.36.1@core-js/modules/web.url-search-params.size.js
-var web_url_search_params_size = __webpack_require__(1164);
-// EXTERNAL MODULE: ./src/utils/util.js
-var util = __webpack_require__(9937);
-// EXTERNAL MODULE: ./node_modules/_lodash-es@4.17.21@lodash-es/_baseKeys.js + 1 modules
-var _baseKeys = __webpack_require__(9461);
-// EXTERNAL MODULE: ./node_modules/_lodash-es@4.17.21@lodash-es/_getTag.js + 4 modules
-var _getTag = __webpack_require__(9988);
-// EXTERNAL MODULE: ./node_modules/_lodash-es@4.17.21@lodash-es/isArguments.js + 1 modules
-var isArguments = __webpack_require__(8280);
-// EXTERNAL MODULE: ./node_modules/_lodash-es@4.17.21@lodash-es/isArray.js
-var isArray = __webpack_require__(3791);
-// EXTERNAL MODULE: ./node_modules/_lodash-es@4.17.21@lodash-es/isArrayLike.js
-var isArrayLike = __webpack_require__(104);
-// EXTERNAL MODULE: ./node_modules/_lodash-es@4.17.21@lodash-es/isBuffer.js + 1 modules
-var isBuffer = __webpack_require__(9714);
-// EXTERNAL MODULE: ./node_modules/_lodash-es@4.17.21@lodash-es/_isPrototype.js
-var _isPrototype = __webpack_require__(1145);
-// EXTERNAL MODULE: ./node_modules/_lodash-es@4.17.21@lodash-es/isTypedArray.js + 1 modules
-var isTypedArray = __webpack_require__(3596);
-;// CONCATENATED MODULE: ./node_modules/_lodash-es@4.17.21@lodash-es/isEmpty.js
-
-
-
-
-
-
-
-
-
-/** `Object#toString` result references. */
-var mapTag = '[object Map]',
-    setTag = '[object Set]';
-
-/** Used for built-in method references. */
-var objectProto = Object.prototype;
-
-/** Used to check objects for own properties. */
-var isEmpty_hasOwnProperty = objectProto.hasOwnProperty;
-
-/**
- * Checks if `value` is an empty object, collection, map, or set.
- *
- * Objects are considered empty if they have no own enumerable string keyed
- * properties.
- *
- * Array-like values such as `arguments` objects, arrays, buffers, strings, or
- * jQuery-like collections are considered empty if they have a `length` of `0`.
- * Similarly, maps and sets are considered empty if they have a `size` of `0`.
- *
- * @static
- * @memberOf _
- * @since 0.1.0
- * @category Lang
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` is empty, else `false`.
- * @example
- *
- * _.isEmpty(null);
- * // => true
- *
- * _.isEmpty(true);
- * // => true
- *
- * _.isEmpty(1);
- * // => true
- *
- * _.isEmpty([1, 2, 3]);
- * // => false
- *
- * _.isEmpty({ 'a': 1 });
- * // => false
- */
-function isEmpty(value) {
-  if (value == null) {
-    return true;
-  }
-  if ((0,isArrayLike/* default */.A)(value) &&
-      ((0,isArray/* default */.A)(value) || typeof value == 'string' || typeof value.splice == 'function' ||
-        (0,isBuffer/* default */.A)(value) || (0,isTypedArray/* default */.A)(value) || (0,isArguments/* default */.A)(value))) {
-    return !value.length;
-  }
-  var tag = (0,_getTag/* default */.A)(value);
-  if (tag == mapTag || tag == setTag) {
-    return !value.size;
-  }
-  if ((0,_isPrototype/* default */.A)(value)) {
-    return !(0,_baseKeys/* default */.A)(value).length;
-  }
-  for (var key in value) {
-    if (isEmpty_hasOwnProperty.call(value, key)) {
-      return false;
-    }
-  }
-  return true;
-}
-
-/* harmony default export */ const _lodash_es_4_17_21_lodash_es_isEmpty = (isEmpty);
-
-// EXTERNAL MODULE: ./node_modules/_lodash-es@4.17.21@lodash-es/cloneDeep.js + 29 modules
-var cloneDeep = __webpack_require__(5265);
-;// CONCATENATED MODULE: ./src/mixins/JeecgListMixinV2.js
-
-
-
-
-
-/**
- * 新增修改完成调用 modalFormOk方法 编辑弹框组件ref定义为modalForm
- * 高级查询按钮调用 superQuery方法  高级查询组件ref定义为superQueryModal
- * data中url定义 list为查询列表  delete为删除单条记录  deleteBatch为批量删除
- */
-
-
-
-
-const JeecgListMixinV2_JeecgListMixin = {
-  data() {
-    return {
-      //token header
-      tokenHeader: {
-        'X-Access-Token': external_commonjs_vue_commonjs2_vue_root_Vue_default().prototype.getToken()
-      },
-      /* 查询条件-请不要在queryParam中声明非字符串值的属性 */
-      queryParam: {},
-      /* 数据源 */
-      dataSource: [],
-      listMixinHttpType: 'get',
-      /* 分页参数 */
-      ipagination: {
-        current: 1,
-        pageSize: 10,
-        pageSizeOptions: ['10', '20', '30'],
-        showTotal: (total, range) => {
-          return range[0] + "-" + range[1] + " 共" + total + "条";
-        },
-        showQuickJumper: true,
-        showSizeChanger: true,
-        total: 0
-      },
-      /* 排序参数 */
-      isorter: {
-        column: 'createTime',
-        order: 'desc'
-      },
-      /* 筛选参数 */
-      filters: {},
-      /* table加载状态 */
-      loading: false,
-      /* table选中keys*/
-      selectedRowKeys: [],
-      /* table选中records*/
-      selectionRows: [],
-      /* 查询折叠 */
-      toggleSearchStatus: false,
-      /* 高级查询条件生效状态 */
-      superQueryFlag: false,
-      /* 高级查询条件 */
-      superQueryParams: "",
-      // 用户点击查询
-      userSearch: {}
-    };
-  },
-  created() {
-    if (!_lodash_es_4_17_21_lodash_es_isEmpty(this.queryParam)) {
-      this.queryParam._clone = (0,cloneDeep/* default */.A)(this.queryParam);
-    }
-    if (!this.isFilter) {
-      this.loadData();
-    }
-    //初始化字典配置 在自己页面定义
-    this.initDictConfig();
-  },
-  methods: {
-    loadData(arg) {
-      if (!this.url.list) {
-        this.$message.error("请设置url.list属性!");
-        return;
-      }
-      //加载数据 若传入参数1则加载第一页的内容
-      if (arg === 1) {
-        this.ipagination.current = 1;
-      }
-      let params = this.getQueryParams(); //查询条件
-      this.loading = true;
-      let func = manage/* getAction */.Th;
-      if (this.listMixinHttpType !== 'get') func = manage/* postAction */.vd;
-      func(this.url.list, params).then(res => {
-        if (res.success) {
-          this.dataSource = res.result.records;
-          // console.log(res.result.records)
-          this.ipagination.total = res.result.total;
-        }
-        if (res.code === 510) {
-          this.$message.warning(res.message);
-        } else if (res.code === 500) {
-          if (res.message.length < 100) {
-            this.$message.error(res.message);
-          }
-        }
-        this.loading = false;
-      });
-    },
-    initDictConfig() {
-      console.log("--这是一个假的方法!");
-    },
-    handleSuperQuery(arg) {
-      //高级查询方法
-      if (!arg) {
-        this.superQueryParams = '';
-        this.superQueryFlag = false;
-      } else {
-        this.superQueryFlag = true;
-        this.superQueryParams = JSON.stringify(arg);
-      }
-      this.loadData();
-    },
-    getQueryParams() {
-      //获取查询条件
-      let sqp = {};
-      if (this.superQueryParams) {
-        sqp['superQueryParams'] = encodeURI(this.superQueryParams);
-      }
-      // var param = Object.assign(sqp, this.queryParam, this.isorter, this.filters);
-      let obj = this.needSearch ? this.userSearch : this.queryParam._clone;
-      var param = Object.assign(sqp, obj, this.isorter, this.filters);
-      param.field = this.getQueryField();
-      param.pageNo = this.ipagination.current;
-      param.pageSize = this.ipagination.pageSize;
-      return (0,util.filterObj)(param);
-    },
-    getQueryField() {
-      //TODO 字段权限控制
-      var str = "id,";
-      this.columns.forEach(function (value) {
-        str += "," + value.dataIndex;
-      });
-      return str;
-    },
-    setQueryParamsVal(obj) {
-      if (!_lodash_es_4_17_21_lodash_es_isEmpty(obj)) {
-        var _this$queryParam;
-        for (const objKey in obj) {
-          this.$set(this.queryParam, objKey, obj[objKey]);
-        }
-        this.queryParam._clone = {
-          ...((_this$queryParam = this.queryParam) === null || _this$queryParam === void 0 ? void 0 : _this$queryParam._clone),
-          ...obj
-        };
-      }
-    },
-    onSelectChange(selectedRowKeys, selectionRows) {
-      this.selectedRowKeys = selectedRowKeys;
-      this.selectionRows = selectionRows;
-    },
-    onClearSelected() {
-      this.selectedRowKeys = [];
-      this.selectionRows = [];
-    },
-    searchQuery() {
-      const queryParam = (0,cloneDeep/* default */.A)(this.queryParam);
-      delete queryParam._clone;
-      this.queryParam._clone = queryParam;
-      this.userSearch = {
-        ...this.userSearch,
-        ...this.queryParam._clone
-      };
-      this.loadData(1);
-    },
-    superQuery() {
-      this.$refs.superQueryModal.show();
-    },
-    searchReset() {
-      this.queryParam = this.$options.data().queryParam || {};
-      this.userSearch = {};
-      this.loadData(1);
-    },
-    batchDel: function () {
-      if (!this.url.deleteBatch) {
-        this.$message.error("请设置url.deleteBatch属性!");
-        return;
-      }
-      if (this.selectedRowKeys.length <= 0) {
-        this.$message.warning('请选择一条记录！');
-        return;
-      } else {
-        var ids = this.selectedRowKeys.join(",");
-        var that = this;
-        this.$confirm({
-          title: "确认删除",
-          content: "是否删除选中数据?",
-          onOk: function () {
-            (0,manage/* deleteAction */.Kg)(that.url.deleteBatch, {
-              ids: ids
-            }).then(res => {
-              if (res.success) {
-                that.$message.success(res.message);
-                that.loadData();
-                that.onClearSelected();
-              } else {
-                that.$message.warning(res.message);
-              }
-            });
-          }
-        });
-      }
-    },
-    handleModule: function (value) {
-      this.$refs.ModuleDownForm.edit(value);
-      this.$refs.ModuleDownForm.title = "模板下载";
-      this.$refs.ModuleDownForm.disableSubmit = false;
-    },
-    handleDelete: function (id) {
-      if (!this.url.delete) {
-        this.$message.error("请设置url.delete属性!");
-        return;
-      }
-      const onlyOne = this.dataSource.length === 1;
-      var that = this;
-      (0,manage/* deleteAction */.Kg)(that.url.delete, {
-        id: id
-      }).then(res => {
-        if (res.success) {
-          that.$message.success(res.message);
-          this.selectedRowKeys = this.selectedRowKeys.filter(item => item !== id);
-          if (onlyOne) {
-            const curr = this.ipagination.current - 1;
-            this.ipagination.current = curr;
-            return that.loadData(curr < 1 ? 1 : curr);
-          }
-          that.loadData();
-        } else {
-          that.$message.warning(res.message);
-        }
-      });
-    },
-    handleEdit: function (record) {
-      record.isView = false;
-      this.$refs.modalForm.edit(record);
-      this.$refs.modalForm.title = "编辑";
-      this.$refs.modalForm.disableSubmit = false;
-    },
-    handleView: function (record) {
-      record.isView = true;
-      this.$refs.modalForm.edit(record);
-      this.$refs.modalForm.title = "查看";
-      this.$refs.modalForm.disableSubmit = false;
-    },
-    //文件上传公共组件title:弹框标题；tableName:业务表名称；proId:课题ID
-    handleUploadFile: function (title, tableName, proId) {
-      if (title == '优秀论文推荐') {
-        this.$refs.uploadForm.edit(tableName, proId, true);
-      } else {
-        this.$refs.uploadForm.edit(tableName, proId, false);
-      }
-      this.$refs.uploadForm.title = title;
-    },
-    handleViewFile: function (title, tableName, tableId, proId) {
-      if (tableId == null || tableId == "") {
-        this.$message.warning("未上传文件");
-      } else {
-        this.$refs.uploadViewForm.edit(tableName, tableId, proId);
-        this.$refs.uploadViewForm.title = title;
-      }
-    },
-    handleAuditFile: function (title, tableName, tableId, dictCode, proId, detail) {
-      if (tableId == null || tableId == "") {
-        this.$message.warning("未上传文件");
-      } else {
-        this.$refs.uploadAuditForm.edit(tableName, tableId, dictCode, proId);
-        this.$refs.uploadAuditForm.title = title;
-        this.$refs.detail = detail;
-      }
-    },
-    handleAdd: function () {
-      this.$refs.modalForm.add();
-      this.$refs.modalForm.title = "新增";
-      this.$refs.modalForm.disableSubmit = false;
-    },
-    handleTableChange(pagination, filters, sorter) {
-      //分页、排序、筛选变化时触发
-      //TODO 筛选
-      if (Object.keys(sorter).length > 0) {
-        this.isorter.column = sorter.field;
-        this.isorter.order = "ascend" == sorter.order ? "asc" : "desc";
-      }
-      this.ipagination = pagination;
-      this.loadData();
-    },
-    handleToggleSearch() {
-      this.toggleSearchStatus = !this.toggleSearchStatus;
-    },
-    modalFormOk() {
-      // 新增/修改 成功时，重载列表
-      console.log('===selectedRowKeys', this.selectedRowKeys);
-      this.loadData();
-    },
-    handleDetail: function (record) {
-      this.$refs.modalForm.edit(record);
-      this.$refs.modalForm.title = "详情";
-      this.$refs.modalForm.disableSubmit = true;
-    },
-    /* 导出 */
-    handleExportXls2() {
-      let paramsStr = encodeURI(JSON.stringify(this.getQueryParams()));
-      let url = `${window._CONFIG['domianURL']}/${this.url.exportXlsUrl}?paramsStr=${paramsStr}`;
-      window.location.href = url;
-    },
-    handleExportXls(fileName) {
-      console.log(fileName);
-      if (!fileName || typeof fileName != "string") {
-        fileName = "导出文件";
-      }
-      let param = {
-        ...this.queryParam._clone
-      };
-      if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
-        param['selections'] = this.selectedRowKeys.join(",");
-        param['ids'] = this.selectedRowKeys.join(",");
-      }
-      console.log("导出参数", param);
-      (0,manage/* downFile */.$g)(this.url.exportXlsUrl, param).then(data => {
-        if (!data) {
-          this.$message.warning("文件下载失败");
-          return;
-        }
-        if (typeof window.navigator.msSaveBlob !== 'undefined') {
-          window.navigator.msSaveBlob(new Blob([data]), fileName + '.xls');
-        } else {
-          let url = window.URL.createObjectURL(new Blob([data]));
-          let link = document.createElement('a');
-          link.style.display = 'none';
-          link.href = url;
-          link.setAttribute('download', fileName + '.xls');
-          document.body.appendChild(link);
-          link.click();
-          document.body.removeChild(link); //下载完成移除元素
-          window.URL.revokeObjectURL(url); //释放掉blob对象
-        }
-      });
-    },
-    /* 导入 */
-    handleImportExcel(info) {
-      if (info.file.status !== 'uploading') {
-        console.log(info.file, info.fileList);
-      }
-      if (info.file.status === 'done') {
-        if (info.file.response.success) {
-          this.$message.success(info.file.response.result || `${info.file.name} 文件上传成功`);
-          this.loadData();
-        } else {
-          this.$message.error(info.file.response.result || `${info.file.name} ${info.file.response.message}.`);
-        }
-      } else if (info.file.status === 'error') {
-        this.$message.error(`文件上传失败: ${info.file.msg} `);
-      }
-    },
-    /* 图片预览 */
-    getImgView(text) {
-      if (text && text.indexOf(",") > 0) {
-        text = text.substring(0, text.indexOf(","));
-      }
-      return (window._CONFIG['imgDomainURL'] || window._CONFIG['imgUrl']) + "/" + text;
-    },
-    /* 文件下载 */
-    uploadFile(text) {
-      if (!text) {
-        this.$message.warning("未知的文件");
-        return;
-      }
-      if (text.indexOf(",") > 0) {
-        text = text.substring(0, text.indexOf(","));
-      }
-      window.open((window._CONFIG['fileDomainURL'] || window._CONFIG['domianURL']) + "/sys/common/download/" + text);
-    },
-    modalCancel() {
-      this.ipagination.current = 1;
-      this.ipagination.pageSize = 10;
-      this.queryParam = this.$options.data().queryParam;
-      this.visible = false;
-    }
-  }
-};
+// EXTERNAL MODULE: ./src/mixins/JeecgListMixinV2.js
+var JeecgListMixinV2 = __webpack_require__(1807);
 ;// CONCATENATED MODULE: ./node_modules/_thread-loader@3.0.4@thread-loader/dist/cjs.js!./node_modules/_babel-loader@8.3.0@babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/common/Modals/formOneTable.vue?vue&type=script&lang=js
 //
 //
@@ -73495,7 +73015,7 @@ const JeecgListMixinV2_JeecgListMixin = {
 
 /* harmony default export */ const formOneTablevue_type_script_lang_js = ({
   name: "formOnetable",
-  mixins: [JeecgListMixinV2_JeecgListMixin],
+  mixins: [JeecgListMixinV2/* JeecgListMixin */.C],
   data() {
     return {
       dictCode: "",
@@ -73590,7 +73110,7 @@ var selectSysDictvue_type_template_id_374bb418_scoped_true_staticRenderFns = []
 
 /* harmony default export */ const selectSysDictvue_type_script_lang_js = ({
   name: "selectSysDict",
-  mixins: [JeecgListMixinV2_JeecgListMixin],
+  mixins: [JeecgListMixinV2/* JeecgListMixin */.C],
   inject: ['containerContext'],
   props: {
     widget: {
@@ -73675,16 +73195,16 @@ var selectSysDict_component = (0,componentNormalizer/* default */.A)(
 )
 
 /* harmony default export */ const selectSysDict = (selectSysDict_component.exports);
-;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/CascaderSelect/components/selectClassifyDict.vue?vue&type=template&id=6a916818&scoped=true
-var selectClassifyDictvue_type_template_id_6a916818_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[_c('a-input',{attrs:{"placeholder":"关联分类字典"},on:{"click":_vm.init,"mousedown":function($event){$event.preventDefault();return (function () {}).apply(null, arguments)}},model:{value:(_vm.widget.options.code),callback:function ($$v) {_vm.$set(_vm.widget.options, "code", $$v)},expression:"widget.options.code"}}),_c('a-modal',{attrs:{"title":"关联分类字典","width":"800px"},on:{"cancel":_vm.modalCancel,"ok":_vm.handleSelect},model:{value:(_vm.visible),callback:function ($$v) {_vm.visible=$$v},expression:"visible"}},[_c('a-space',{staticStyle:{"margin-bottom":"10px"}},[_c('a-input',{attrs:{"placeholder":"请输入字典名称"},model:{value:(_vm.queryParam.name),callback:function ($$v) {_vm.$set(_vm.queryParam, "name", $$v)},expression:"queryParam.name"}}),_c('a-input',{attrs:{"placeholder":"请输入字典编码"},model:{value:(_vm.queryParam.code),callback:function ($$v) {_vm.$set(_vm.queryParam, "code", $$v)},expression:"queryParam.code"}}),_c('a-button',{attrs:{"type":"primary"},on:{"click":function($event){return _vm.searchQuery()}}},[_vm._v("搜索")])],1),_c('a-table',{ref:"table",attrs:{"rowKey":"code","size":"middle","columns":_vm.columns,"dataSource":_vm.dataSource,"pagination":_vm.ipagination,"row-selection":{ selectedRowKeys: _vm.selectedRowKeys, onChange: _vm.onSelectChange,type:'radio' },"loading":_vm.loading},on:{"change":_vm.handleTableChange}})],1)],1)}
-var selectClassifyDictvue_type_template_id_6a916818_scoped_true_staticRenderFns = []
+;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/CascaderSelect/components/selectClassifyDict.vue?vue&type=template&id=10f76b30&scoped=true
+var selectClassifyDictvue_type_template_id_10f76b30_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[_c('a-input',{attrs:{"placeholder":"关联分类字典"},on:{"click":_vm.init,"mousedown":function($event){$event.preventDefault();return (function () {}).apply(null, arguments)}},model:{value:(_vm.widget.options.code),callback:function ($$v) {_vm.$set(_vm.widget.options, "code", $$v)},expression:"widget.options.code"}}),_c('a-modal',{attrs:{"title":"关联分类字典","width":"800px"},on:{"cancel":_vm.modalCancel,"ok":_vm.handleSelect},model:{value:(_vm.visible),callback:function ($$v) {_vm.visible=$$v},expression:"visible"}},[_c('a-space',{staticStyle:{"margin-bottom":"10px"}},[_c('a-input',{attrs:{"placeholder":"请输入字典名称"},model:{value:(_vm.queryParam.name),callback:function ($$v) {_vm.$set(_vm.queryParam, "name", $$v)},expression:"queryParam.name"}}),_c('a-input',{attrs:{"placeholder":"请输入字典编码"},model:{value:(_vm.queryParam.code),callback:function ($$v) {_vm.$set(_vm.queryParam, "code", $$v)},expression:"queryParam.code"}}),_c('a-button',{attrs:{"type":"primary"},on:{"click":function($event){return _vm.searchQuery()}}},[_vm._v("搜索")])],1),_c('a-table',{ref:"table",attrs:{"rowKey":"code","size":"middle","columns":_vm.columns,"dataSource":_vm.dataSource,"pagination":_vm.ipagination,"row-selection":{ selectedRowKeys: _vm.selectedRowKeys, onChange: _vm.onSelectChange,type:'radio' },"loading":_vm.loading},on:{"change":_vm.handleTableChange}})],1)],1)}
+var selectClassifyDictvue_type_template_id_10f76b30_scoped_true_staticRenderFns = []
 
 
 ;// CONCATENATED MODULE: ./node_modules/_thread-loader@3.0.4@thread-loader/dist/cjs.js!./node_modules/_babel-loader@8.3.0@babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/CascaderSelect/components/selectClassifyDict.vue?vue&type=script&lang=js
 
 /* harmony default export */ const selectClassifyDictvue_type_script_lang_js = ({
   name: "selectClassifyDict",
-  mixins: [JeecgListMixinV2_JeecgListMixin],
+  mixins: [JeecgListMixinV2/* JeecgListMixin */.C],
   props: {
     widget: {
       type: Object,
@@ -73722,10 +73242,10 @@ var selectClassifyDictvue_type_template_id_6a916818_scoped_true_staticRenderFns
       this.visible = true;
     },
     handleSelect(record) {
-      var _this$selectionRows;
-      if (!((_this$selectionRows = this.selectionRows) !== null && _this$selectionRows !== void 0 && _this$selectionRows.length)) return this.$message.warn('请选择一条数据');
+      var _this$selectedRowKeys;
+      if (!((_this$selectedRowKeys = this.selectedRowKeys) !== null && _this$selectedRowKeys !== void 0 && _this$selectedRowKeys.length)) return this.$message.warn('请选择一条数据');
       this.$set(this.widget.options, 'code', this.selectedRowKeys[0]);
-      this.visible = false;
+      this.modalCancel();
     }
   }
 });
@@ -73741,11 +73261,11 @@ var selectClassifyDictvue_type_template_id_6a916818_scoped_true_staticRenderFns
 ;
 var selectClassifyDict_component = (0,componentNormalizer/* default */.A)(
   components_selectClassifyDictvue_type_script_lang_js,
-  selectClassifyDictvue_type_template_id_6a916818_scoped_true_render,
-  selectClassifyDictvue_type_template_id_6a916818_scoped_true_staticRenderFns,
+  selectClassifyDictvue_type_template_id_10f76b30_scoped_true_render,
+  selectClassifyDictvue_type_template_id_10f76b30_scoped_true_staticRenderFns,
   false,
   null,
-  "6a916818",
+  "10f76b30",
   null
   
 )
@@ -74186,6 +73706,10 @@ var componentvue_type_template_id_734262fe_scoped_true_staticRenderFns = []
 var es_array_reduce = __webpack_require__(5419);
 // EXTERNAL MODULE: ./src/components/MessageBox/confirmBox.vue + 3 modules
 var confirmBox = __webpack_require__(6551);
+// EXTERNAL MODULE: ./node_modules/_lodash-es@4.17.21@lodash-es/cloneDeep.js + 29 modules
+var cloneDeep = __webpack_require__(5265);
+// EXTERNAL MODULE: ./src/utils/util.js
+var util = __webpack_require__(9937);
 ;// CONCATENATED MODULE: ./node_modules/_thread-loader@3.0.4@thread-loader/dist/cjs.js!./node_modules/_babel-loader@8.3.0@babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/Table/component.vue?vue&type=script&lang=js
 
 
@@ -84195,6 +83719,8 @@ var relateSubSelectModal_component = (0,componentNormalizer/* default */.A)(
 )
 
 /* harmony default export */ const relateSubSelectModal = (relateSubSelectModal_component.exports);
+// EXTERNAL MODULE: ./node_modules/_lodash-es@4.17.21@lodash-es/isEmpty.js
+var isEmpty = __webpack_require__(2863);
 ;// CONCATENATED MODULE: ./node_modules/_thread-loader@3.0.4@thread-loader/dist/cjs.js!./node_modules/_babel-loader@8.3.0@babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/RelateSub/component.vue?vue&type=script&lang=js
 //
 //
@@ -84280,7 +83806,7 @@ var relateSubSelectModal_component = (0,componentNormalizer/* default */.A)(
     this.showLabels(this.dataModel);
   },
   methods: {
-    isEmpty: _lodash_es_4_17_21_lodash_es_isEmpty,
+    isEmpty: isEmpty/* default */.A,
     openModal() {
       if (!this.isdisabled && this.widget.options.disabled) return false;
       this.$refs.relateSubSelectModal.init(this.dataModel);
@@ -84603,7 +84129,7 @@ var componentvue_type_template_id_41070b72_scoped_true_staticRenderFns = []
 
 
 // EXTERNAL MODULE: ./src/form/modules/common/Modals/selectUserModal.vue + 5 modules
-var selectUserModal = __webpack_require__(5847);
+var selectUserModal = __webpack_require__(925);
 ;// CONCATENATED MODULE: ./node_modules/_thread-loader@3.0.4@thread-loader/dist/cjs.js!./node_modules/_babel-loader@8.3.0@babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/UserSelector/component.vue?vue&type=script&lang=js
 
 //
@@ -84724,7 +84250,7 @@ var selectUserModal = __webpack_require__(5847);
     }
   },
   methods: {
-    isEmpty: _lodash_es_4_17_21_lodash_es_isEmpty,
+    isEmpty: isEmpty/* default */.A,
     openModal() {
       let options = this.widget.options;
       if (this.widget.options.disabled && !this.isdisabled) return false;
@@ -85318,7 +84844,7 @@ var listCommonModalvue_type_template_id_ba7524be_scoped_true_staticRenderFns = [
 
 /* harmony default export */ const listCommonModalvue_type_script_lang_js = ({
   name: "listCommonModal",
-  mixins: [JeecgListMixinV2_JeecgListMixin],
+  mixins: [JeecgListMixinV2/* JeecgListMixin */.C],
   props: {
     widget: {
       type: Object,
@@ -86283,7 +85809,7 @@ var elSelectUserByRoleModal_component = (0,componentNormalizer/* default */.A)(
     }
   },
   methods: {
-    isEmpty: _lodash_es_4_17_21_lodash_es_isEmpty,
+    isEmpty: isEmpty/* default */.A,
     handleEmpty() {
       this.userNames = "";
       this.users = [];
@@ -87680,6 +87206,14 @@ var componentvue_type_template_id_9e2e75dc_scoped_true_render = function () {var
 var componentvue_type_template_id_9e2e75dc_scoped_true_staticRenderFns = []
 
 
+// EXTERNAL MODULE: ./node_modules/_core-js@3.36.1@core-js/modules/web.url.to-json.js
+var web_url_to_json = __webpack_require__(2343);
+// EXTERNAL MODULE: ./node_modules/_core-js@3.36.1@core-js/modules/web.url-search-params.delete.js
+var web_url_search_params_delete = __webpack_require__(2874);
+// EXTERNAL MODULE: ./node_modules/_core-js@3.36.1@core-js/modules/web.url-search-params.has.js
+var web_url_search_params_has = __webpack_require__(9721);
+// EXTERNAL MODULE: ./node_modules/_core-js@3.36.1@core-js/modules/web.url-search-params.size.js
+var web_url_search_params_size = __webpack_require__(1164);
 ;// CONCATENATED MODULE: ./node_modules/_preact@10.20.1@preact/dist/preact.module.js
 var n,l,u,t,i,o,r,f,e,c={},s=[],a=/acit|ex(?:s|g|n|p|$)|rph|grid|ows|mnc|ntw|ine[ch]|zoo|^ord|itera/i,h=Array.isArray;function v(n,l){for(var u in l)n[u]=l[u];return n}function p(n){var l=n.parentNode;l&&l.removeChild(n)}function y(l,u,t){var i,o,r,f={};for(r in u)"key"==r?i=u[r]:"ref"==r?o=u[r]:f[r]=u[r];if(arguments.length>2&&(f.children=arguments.length>3?n.call(arguments,2):t),"function"==typeof l&&null!=l.defaultProps)for(r in l.defaultProps)void 0===f[r]&&(f[r]=l.defaultProps[r]);return d(l,f,i,o,null)}function d(n,t,i,o,r){var f={type:n,props:t,key:i,ref:o,__k:null,__:null,__b:0,__e:null,__d:void 0,__c:null,constructor:void 0,__v:null==r?++u:r,__i:-1,__u:0};return null==r&&null!=l.vnode&&l.vnode(f),f}function _(){return{current:null}}function g(n){return n.children}function b(n,l){this.props=n,this.context=l}function m(n,l){if(null==l)return n.__?m(n.__,n.__i+1):null;for(var u;l<n.__k.length;l++)if(null!=(u=n.__k[l])&&null!=u.__e)return u.__e;return"function"==typeof n.type?m(n):null}function w(n){var l,u;if(null!=(n=n.__)&&null!=n.__c){for(n.__e=n.__c.base=null,l=0;l<n.__k.length;l++)if(null!=(u=n.__k[l])&&null!=u.__e){n.__e=n.__c.base=u.__e;break}return w(n)}}function k(n){(!n.__d&&(n.__d=!0)&&i.push(n)&&!x.__r++||o!==l.debounceRendering)&&((o=l.debounceRendering)||r)(x)}function x(){var n,u,t,o,r,e,c,s,a;for(i.sort(f);n=i.shift();)n.__d&&(u=i.length,o=void 0,e=(r=(t=n).__v).__e,s=[],a=[],(c=t.__P)&&((o=v({},r)).__v=r.__v+1,l.vnode&&l.vnode(o),F(c,o,r,t.__n,void 0!==c.ownerSVGElement,32&r.__u?[e]:null,s,null==e?m(r):e,!!(32&r.__u),a),o.__v=r.__v,o.__.__k[o.__i]=o,L(s,o,a),o.__e!=e&&w(o)),i.length>u&&i.sort(f));x.__r=0}function C(n,l,u,t,i,o,r,f,e,a,h){var v,p,y,d,_,g=t&&t.__k||s,b=l.length;for(u.__d=e,P(u,l,g),e=u.__d,v=0;v<b;v++)null!=(y=u.__k[v])&&"boolean"!=typeof y&&"function"!=typeof y&&(p=-1===y.__i?c:g[y.__i]||c,y.__i=v,F(n,y,p,i,o,r,f,e,a,h),d=y.__e,y.ref&&p.ref!=y.ref&&(p.ref&&O(p.ref,null,y),h.push(y.ref,y.__c||d,y)),null==_&&null!=d&&(_=d),65536&y.__u||p.__k===y.__k?(d||p.__e!=e||(e=m(p)),e=S(y,e,n)):"function"==typeof y.type&&void 0!==y.__d?e=y.__d:d&&(e=d.nextSibling),y.__d=void 0,y.__u&=-196609);u.__d=e,u.__e=_}function P(n,l,u){var t,i,o,r,f,e=l.length,c=u.length,s=c,a=0;for(n.__k=[],t=0;t<e;t++)r=t+a,null!=(i=n.__k[t]=null==(i=l[t])||"boolean"==typeof i||"function"==typeof i?null:"string"==typeof i||"number"==typeof i||"bigint"==typeof i||i.constructor==String?d(null,i,null,null,null):h(i)?d(g,{children:i},null,null,null):void 0===i.constructor&&i.__b>0?d(i.type,i.props,i.key,i.ref?i.ref:null,i.__v):i)?(i.__=n,i.__b=n.__b+1,f=I(i,u,r,s),i.__i=f,o=null,-1!==f&&(s--,(o=u[f])&&(o.__u|=131072)),null==o||null===o.__v?(-1==f&&a--,"function"!=typeof i.type&&(i.__u|=65536)):f!==r&&(f===r+1?a++:f>r?s>e-r?a+=f-r:a--:f<r?f==r-1&&(a=f-r):a=0,f!==t+a&&(i.__u|=65536))):(o=u[r])&&null==o.key&&o.__e&&0==(131072&o.__u)&&(o.__e==n.__d&&(n.__d=m(o)),j(o,o,!1),u[r]=null,s--);if(s)for(t=0;t<c;t++)null!=(o=u[t])&&0==(131072&o.__u)&&(o.__e==n.__d&&(n.__d=m(o)),j(o,o))}function S(n,l,u){var t,i;if("function"==typeof n.type){for(t=n.__k,i=0;t&&i<t.length;i++)t[i]&&(t[i].__=n,l=S(t[i],l,u));return l}n.__e!=l&&(u.insertBefore(n.__e,l||null),l=n.__e);do{l=l&&l.nextSibling}while(null!=l&&8===l.nodeType);return l}function $(n,l){return l=l||[],null==n||"boolean"==typeof n||(h(n)?n.some(function(n){$(n,l)}):l.push(n)),l}function I(n,l,u,t){var i=n.key,o=n.type,r=u-1,f=u+1,e=l[u];if(null===e||e&&i==e.key&&o===e.type&&0==(131072&e.__u))return u;if(t>(null!=e&&0==(131072&e.__u)?1:0))for(;r>=0||f<l.length;){if(r>=0){if((e=l[r])&&0==(131072&e.__u)&&i==e.key&&o===e.type)return r;r--}if(f<l.length){if((e=l[f])&&0==(131072&e.__u)&&i==e.key&&o===e.type)return f;f++}}return-1}function H(n,l,u){"-"===l[0]?n.setProperty(l,null==u?"":u):n[l]=null==u?"":"number"!=typeof u||a.test(l)?u:u+"px"}function T(n,l,u,t,i){var o;n:if("style"===l)if("string"==typeof u)n.style.cssText=u;else{if("string"==typeof t&&(n.style.cssText=t=""),t)for(l in t)u&&l in u||H(n.style,l,"");if(u)for(l in u)t&&u[l]===t[l]||H(n.style,l,u[l])}else if("o"===l[0]&&"n"===l[1])o=l!==(l=l.replace(/(PointerCapture)$|Capture$/i,"$1")),l=l.toLowerCase()in n||"onFocusOut"===l||"onFocusIn"===l?l.toLowerCase().slice(2):l.slice(2),n.l||(n.l={}),n.l[l+o]=u,u?t?u.u=t.u:(u.u=Date.now(),n.addEventListener(l,o?D:A,o)):n.removeEventListener(l,o?D:A,o);else{if(i)l=l.replace(/xlink(H|:h)/,"h").replace(/sName$/,"s");else if("width"!==l&&"height"!==l&&"href"!==l&&"list"!==l&&"form"!==l&&"tabIndex"!==l&&"download"!==l&&"rowSpan"!==l&&"colSpan"!==l&&"role"!==l&&l in n)try{n[l]=null==u?"":u;break n}catch(n){}"function"==typeof u||(null==u||!1===u&&"-"!==l[4]?n.removeAttribute(l):n.setAttribute(l,u))}}function A(n){if(this.l){var u=this.l[n.type+!1];if(n.t){if(n.t<=u.u)return}else n.t=Date.now();return u(l.event?l.event(n):n)}}function D(n){if(this.l)return this.l[n.type+!0](l.event?l.event(n):n)}function F(n,u,t,i,o,r,f,e,c,s){var a,p,y,d,_,m,w,k,x,P,S,$,I,H,T,A=u.type;if(void 0!==u.constructor)return null;128&t.__u&&(c=!!(32&t.__u),r=[e=u.__e=t.__e]),(a=l.__b)&&a(u);n:if("function"==typeof A)try{if(k=u.props,x=(a=A.contextType)&&i[a.__c],P=a?x?x.props.value:a.__:i,t.__c?w=(p=u.__c=t.__c).__=p.__E:("prototype"in A&&A.prototype.render?u.__c=p=new A(k,P):(u.__c=p=new b(k,P),p.constructor=A,p.render=z),x&&x.sub(p),p.props=k,p.state||(p.state={}),p.context=P,p.__n=i,y=p.__d=!0,p.__h=[],p._sb=[]),null==p.__s&&(p.__s=p.state),null!=A.getDerivedStateFromProps&&(p.__s==p.state&&(p.__s=v({},p.__s)),v(p.__s,A.getDerivedStateFromProps(k,p.__s))),d=p.props,_=p.state,p.__v=u,y)null==A.getDerivedStateFromProps&&null!=p.componentWillMount&&p.componentWillMount(),null!=p.componentDidMount&&p.__h.push(p.componentDidMount);else{if(null==A.getDerivedStateFromProps&&k!==d&&null!=p.componentWillReceiveProps&&p.componentWillReceiveProps(k,P),!p.__e&&(null!=p.shouldComponentUpdate&&!1===p.shouldComponentUpdate(k,p.__s,P)||u.__v===t.__v)){for(u.__v!==t.__v&&(p.props=k,p.state=p.__s,p.__d=!1),u.__e=t.__e,u.__k=t.__k,u.__k.forEach(function(n){n&&(n.__=u)}),S=0;S<p._sb.length;S++)p.__h.push(p._sb[S]);p._sb=[],p.__h.length&&f.push(p);break n}null!=p.componentWillUpdate&&p.componentWillUpdate(k,p.__s,P),null!=p.componentDidUpdate&&p.__h.push(function(){p.componentDidUpdate(d,_,m)})}if(p.context=P,p.props=k,p.__P=n,p.__e=!1,$=l.__r,I=0,"prototype"in A&&A.prototype.render){for(p.state=p.__s,p.__d=!1,$&&$(u),a=p.render(p.props,p.state,p.context),H=0;H<p._sb.length;H++)p.__h.push(p._sb[H]);p._sb=[]}else do{p.__d=!1,$&&$(u),a=p.render(p.props,p.state,p.context),p.state=p.__s}while(p.__d&&++I<25);p.state=p.__s,null!=p.getChildContext&&(i=v(v({},i),p.getChildContext())),y||null==p.getSnapshotBeforeUpdate||(m=p.getSnapshotBeforeUpdate(d,_)),C(n,h(T=null!=a&&a.type===g&&null==a.key?a.props.children:a)?T:[T],u,t,i,o,r,f,e,c,s),p.base=u.__e,u.__u&=-161,p.__h.length&&f.push(p),w&&(p.__E=p.__=null)}catch(n){u.__v=null,c||null!=r?(u.__e=e,u.__u|=c?160:32,r[r.indexOf(e)]=null):(u.__e=t.__e,u.__k=t.__k),l.__e(n,u,t)}else null==r&&u.__v===t.__v?(u.__k=t.__k,u.__e=t.__e):u.__e=M(t.__e,u,t,i,o,r,f,c,s);(a=l.diffed)&&a(u)}function L(n,u,t){u.__d=void 0;for(var i=0;i<t.length;i++)O(t[i],t[++i],t[++i]);l.__c&&l.__c(u,n),n.some(function(u){try{n=u.__h,u.__h=[],n.some(function(n){n.call(u)})}catch(n){l.__e(n,u.__v)}})}function M(l,u,t,i,o,r,f,e,s){var a,v,y,d,_,g,b,w=t.props,k=u.props,x=u.type;if("svg"===x&&(o=!0),null!=r)for(a=0;a<r.length;a++)if((_=r[a])&&"setAttribute"in _==!!x&&(x?_.localName===x:3===_.nodeType)){l=_,r[a]=null;break}if(null==l){if(null===x)return document.createTextNode(k);l=o?document.createElementNS("http://www.w3.org/2000/svg",x):document.createElement(x,k.is&&k),r=null,e=!1}if(null===x)w===k||e&&l.data===k||(l.data=k);else{if(r=r&&n.call(l.childNodes),w=t.props||c,!e&&null!=r)for(w={},a=0;a<l.attributes.length;a++)w[(_=l.attributes[a]).name]=_.value;for(a in w)_=w[a],"children"==a||("dangerouslySetInnerHTML"==a?y=_:"key"===a||a in k||T(l,a,null,_,o));for(a in k)_=k[a],"children"==a?d=_:"dangerouslySetInnerHTML"==a?v=_:"value"==a?g=_:"checked"==a?b=_:"key"===a||e&&"function"!=typeof _||w[a]===_||T(l,a,_,w[a],o);if(v)e||y&&(v.__html===y.__html||v.__html===l.innerHTML)||(l.innerHTML=v.__html),u.__k=[];else if(y&&(l.innerHTML=""),C(l,h(d)?d:[d],u,t,i,o&&"foreignObject"!==x,r,f,r?r[0]:t.__k&&m(t,0),e,s),null!=r)for(a=r.length;a--;)null!=r[a]&&p(r[a]);e||(a="value",void 0!==g&&(g!==l[a]||"progress"===x&&!g||"option"===x&&g!==w[a])&&T(l,a,g,w[a],!1),a="checked",void 0!==b&&b!==l[a]&&T(l,a,b,w[a],!1))}return l}function O(n,u,t){try{"function"==typeof n?n(u):n.current=u}catch(n){l.__e(n,t)}}function j(n,u,t){var i,o;if(l.unmount&&l.unmount(n),(i=n.ref)&&(i.current&&i.current!==n.__e||O(i,null,u)),null!=(i=n.__c)){if(i.componentWillUnmount)try{i.componentWillUnmount()}catch(n){l.__e(n,u)}i.base=i.__P=null,n.__c=void 0}if(i=n.__k)for(o=0;o<i.length;o++)i[o]&&j(i[o],u,t||"function"!=typeof n.type);t||null==n.__e||p(n.__e),n.__=n.__e=n.__d=void 0}function z(n,l,u){return this.constructor(n,u)}function N(u,t,i){var o,r,f,e;l.__&&l.__(u,t),r=(o="function"==typeof i)?null:i&&i.__k||t.__k,f=[],e=[],F(t,u=(!o&&i||t).__k=y(g,null,[u]),r||c,c,void 0!==t.ownerSVGElement,!o&&i?[i]:r?null:t.firstChild?n.call(t.childNodes):null,f,!o&&i?i:r?r.__e:t.firstChild,o,e),L(f,u,e)}function q(n,l){N(n,l,q)}function B(l,u,t){var i,o,r,f,e=v({},l.props);for(r in l.type&&l.type.defaultProps&&(f=l.type.defaultProps),u)"key"==r?i=u[r]:"ref"==r?o=u[r]:e[r]=void 0===u[r]&&void 0!==f?f[r]:u[r];return arguments.length>2&&(e.children=arguments.length>3?n.call(arguments,2):t),d(l.type,e,i||l.key,o||l.ref,null)}function E(n,l){var u={__c:l="__cC"+e++,__:n,Consumer:function(n,l){return n.children(l)},Provider:function(n){var u,t;return this.getChildContext||(u=[],(t={})[l]=this,this.getChildContext=function(){return t},this.shouldComponentUpdate=function(n){this.props.value!==n.value&&u.some(function(n){n.__e=!0,k(n)})},this.sub=function(n){u.push(n);var l=n.componentWillUnmount;n.componentWillUnmount=function(){u.splice(u.indexOf(n),1),l&&l.call(n)}}),n.children}};return u.Provider.__=u.Consumer.contextType=u}n=s.slice,l={__e:function(n,l,u,t){for(var i,o,r;l=l.__;)if((i=l.__c)&&!i.__)try{if((o=i.constructor)&&null!=o.getDerivedStateFromError&&(i.setState(o.getDerivedStateFromError(n)),r=i.__d),null!=i.componentDidCatch&&(i.componentDidCatch(n,t||{}),r=i.__d),r)return i.__E=i}catch(l){n=l}throw n}},u=0,t=function(n){return null!=n&&null==n.constructor},b.prototype.setState=function(n,l){var u;u=null!=this.__s&&this.__s!==this.state?this.__s:this.__s=v({},this.state),"function"==typeof n&&(n=n(v({},u),this.props)),n&&v(u,n),null!=n&&this.__v&&(l&&this._sb.push(l),k(this))},b.prototype.forceUpdate=function(n){this.__v&&(this.__e=!0,n&&this.__h.push(n),k(this))},b.prototype.render=g,i=[],r="function"==typeof Promise?Promise.prototype.then.bind(Promise.resolve()):setTimeout,f=function(n,l){return n.__v.__b-l.__v.__b},x.__r=0,e=0;
 //# sourceMappingURL=preact.module.js.map
@@ -103495,7 +103029,7 @@ var selectDepartModal_component = (0,componentNormalizer/* default */.A)(
     departNames(v) {}
   },
   methods: {
-    isEmpty: _lodash_es_4_17_21_lodash_es_isEmpty,
+    isEmpty: isEmpty/* default */.A,
     getDepartIds() {
       //根据dataModel 修改 departIds值
       if (typeof this.dataModel === "object") {
@@ -109933,7 +109467,7 @@ const stautsObject = {
 };
 /* harmony default export */ const selectWorkFlowAppModalvue_type_script_lang_js = ({
   name: "selectWorkFlowAppModal",
-  mixins: [JeecgListMixinV2_JeecgListMixin],
+  mixins: [JeecgListMixinV2/* JeecgListMixin */.C],
   props: {
     widget: {
       type: Object,
@@ -110188,7 +109722,7 @@ var selectWorkFlowAppModal_component = (0,componentNormalizer/* default */.A)(
     }
   },
   methods: {
-    isEmpty: _lodash_es_4_17_21_lodash_es_isEmpty,
+    isEmpty: isEmpty/* default */.A,
     openModal() {
       var _this$dataModel;
       console.log(this.formContext.sysConfig);
@@ -114152,6 +113686,413 @@ const JeecgListMixin = {
 
 /***/ }),
 
+/***/ 1807:
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   C: () => (/* binding */ JeecgListMixin)
+/* harmony export */ });
+/* harmony import */ var core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2241);
+/* harmony import */ var core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var core_js_modules_web_url_to_json_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(2343);
+/* harmony import */ var core_js_modules_web_url_to_json_js__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_url_to_json_js__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var core_js_modules_web_url_search_params_delete_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(2874);
+/* harmony import */ var core_js_modules_web_url_search_params_delete_js__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_url_search_params_delete_js__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var core_js_modules_web_url_search_params_has_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(9721);
+/* harmony import */ var core_js_modules_web_url_search_params_has_js__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_url_search_params_has_js__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var core_js_modules_web_url_search_params_size_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(1164);
+/* harmony import */ var core_js_modules_web_url_search_params_size_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_url_search_params_size_js__WEBPACK_IMPORTED_MODULE_4__);
+/* harmony import */ var _form_utils_util__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(9937);
+/* harmony import */ var _form_api_manage__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(8501);
+/* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(9274);
+/* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(vue__WEBPACK_IMPORTED_MODULE_7__);
+/* harmony import */ var lodash_es__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(2863);
+/* harmony import */ var lodash_es__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(5265);
+
+
+
+
+
+/**
+ * 新增修改完成调用 modalFormOk方法 编辑弹框组件ref定义为modalForm
+ * 高级查询按钮调用 superQuery方法  高级查询组件ref定义为superQueryModal
+ * data中url定义 list为查询列表  delete为删除单条记录  deleteBatch为批量删除
+ */
+
+
+
+
+const JeecgListMixin = {
+  data() {
+    return {
+      //token header
+      tokenHeader: {
+        'X-Access-Token': vue__WEBPACK_IMPORTED_MODULE_7___default().prototype.getToken()
+      },
+      /* 查询条件-请不要在queryParam中声明非字符串值的属性 */
+      queryParam: {},
+      /* 数据源 */
+      dataSource: [],
+      listMixinHttpType: 'get',
+      /* 分页参数 */
+      ipagination: {
+        current: 1,
+        pageSize: 10,
+        pageSizeOptions: ['10', '20', '30'],
+        showTotal: (total, range) => {
+          return range[0] + "-" + range[1] + " 共" + total + "条";
+        },
+        showQuickJumper: true,
+        showSizeChanger: true,
+        total: 0
+      },
+      /* 排序参数 */
+      isorter: {
+        column: 'createTime',
+        order: 'desc'
+      },
+      /* 筛选参数 */
+      filters: {},
+      /* table加载状态 */
+      loading: false,
+      /* table选中keys*/
+      selectedRowKeys: [],
+      /* table选中records*/
+      selectionRows: [],
+      /* 查询折叠 */
+      toggleSearchStatus: false,
+      /* 高级查询条件生效状态 */
+      superQueryFlag: false,
+      /* 高级查询条件 */
+      superQueryParams: "",
+      // 用户点击查询
+      userSearch: {}
+    };
+  },
+  created() {
+    if (!(0,lodash_es__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .A)(this.queryParam)) {
+      this.queryParam._clone = (0,lodash_es__WEBPACK_IMPORTED_MODULE_9__/* ["default"] */ .A)(this.queryParam);
+    }
+    if (!this.isFilter) {
+      this.loadData();
+    }
+    //初始化字典配置 在自己页面定义
+    this.initDictConfig();
+  },
+  methods: {
+    loadData(arg) {
+      if (!this.url.list) {
+        this.$message.error("请设置url.list属性!");
+        return;
+      }
+      //加载数据 若传入参数1则加载第一页的内容
+      if (arg === 1) {
+        this.ipagination.current = 1;
+      }
+      let params = this.getQueryParams(); //查询条件
+      this.loading = true;
+      let func = _form_api_manage__WEBPACK_IMPORTED_MODULE_6__/* .getAction */ .Th;
+      if (this.listMixinHttpType !== 'get') func = _form_api_manage__WEBPACK_IMPORTED_MODULE_6__/* .postAction */ .vd;
+      func(this.url.list, params).then(res => {
+        if (res.success) {
+          this.dataSource = res.result.records;
+          // console.log(res.result.records)
+          this.ipagination.total = res.result.total;
+        }
+        if (res.code === 510) {
+          this.$message.warning(res.message);
+        } else if (res.code === 500) {
+          if (res.message.length < 100) {
+            this.$message.error(res.message);
+          }
+        }
+        this.loading = false;
+      });
+    },
+    initDictConfig() {
+      console.log("--这是一个假的方法!");
+    },
+    handleSuperQuery(arg) {
+      //高级查询方法
+      if (!arg) {
+        this.superQueryParams = '';
+        this.superQueryFlag = false;
+      } else {
+        this.superQueryFlag = true;
+        this.superQueryParams = JSON.stringify(arg);
+      }
+      this.loadData();
+    },
+    getQueryParams() {
+      //获取查询条件
+      let sqp = {};
+      if (this.superQueryParams) {
+        sqp['superQueryParams'] = encodeURI(this.superQueryParams);
+      }
+      // var param = Object.assign(sqp, this.queryParam, this.isorter, this.filters);
+      let obj = this.needSearch ? this.userSearch : this.queryParam._clone;
+      var param = Object.assign(sqp, obj, this.isorter, this.filters);
+      param.field = this.getQueryField();
+      param.pageNo = this.ipagination.current;
+      param.pageSize = this.ipagination.pageSize;
+      return (0,_form_utils_util__WEBPACK_IMPORTED_MODULE_5__.filterObj)(param);
+    },
+    getQueryField() {
+      //TODO 字段权限控制
+      var str = "id,";
+      this.columns.forEach(function (value) {
+        str += "," + value.dataIndex;
+      });
+      return str;
+    },
+    setQueryParamsVal(obj) {
+      if (!(0,lodash_es__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .A)(obj)) {
+        var _this$queryParam;
+        for (const objKey in obj) {
+          this.$set(this.queryParam, objKey, obj[objKey]);
+        }
+        this.queryParam._clone = {
+          ...((_this$queryParam = this.queryParam) === null || _this$queryParam === void 0 ? void 0 : _this$queryParam._clone),
+          ...obj
+        };
+      }
+    },
+    onSelectChange(selectedRowKeys, selectionRows) {
+      this.selectedRowKeys = selectedRowKeys;
+      this.selectionRows = selectionRows;
+    },
+    onClearSelected() {
+      this.selectedRowKeys = [];
+      this.selectionRows = [];
+    },
+    searchQuery() {
+      const queryParam = (0,lodash_es__WEBPACK_IMPORTED_MODULE_9__/* ["default"] */ .A)(this.queryParam);
+      delete queryParam._clone;
+      this.queryParam._clone = queryParam;
+      this.userSearch = {
+        ...this.userSearch,
+        ...this.queryParam._clone
+      };
+      this.loadData(1);
+    },
+    superQuery() {
+      this.$refs.superQueryModal.show();
+    },
+    searchReset() {
+      this.queryParam = this.$options.data().queryParam || {};
+      this.userSearch = {};
+      this.loadData(1);
+    },
+    batchDel: function () {
+      if (!this.url.deleteBatch) {
+        this.$message.error("请设置url.deleteBatch属性!");
+        return;
+      }
+      if (this.selectedRowKeys.length <= 0) {
+        this.$message.warning('请选择一条记录！');
+        return;
+      } else {
+        var ids = this.selectedRowKeys.join(",");
+        var that = this;
+        this.$confirm({
+          title: "确认删除",
+          content: "是否删除选中数据?",
+          onOk: function () {
+            (0,_form_api_manage__WEBPACK_IMPORTED_MODULE_6__/* .deleteAction */ .Kg)(that.url.deleteBatch, {
+              ids: ids
+            }).then(res => {
+              if (res.success) {
+                that.$message.success(res.message);
+                that.loadData();
+                that.onClearSelected();
+              } else {
+                that.$message.warning(res.message);
+              }
+            });
+          }
+        });
+      }
+    },
+    handleModule: function (value) {
+      this.$refs.ModuleDownForm.edit(value);
+      this.$refs.ModuleDownForm.title = "模板下载";
+      this.$refs.ModuleDownForm.disableSubmit = false;
+    },
+    handleDelete: function (id) {
+      if (!this.url.delete) {
+        this.$message.error("请设置url.delete属性!");
+        return;
+      }
+      const onlyOne = this.dataSource.length === 1;
+      var that = this;
+      (0,_form_api_manage__WEBPACK_IMPORTED_MODULE_6__/* .deleteAction */ .Kg)(that.url.delete, {
+        id: id
+      }).then(res => {
+        if (res.success) {
+          that.$message.success(res.message);
+          this.selectedRowKeys = this.selectedRowKeys.filter(item => item !== id);
+          if (onlyOne) {
+            const curr = this.ipagination.current - 1;
+            this.ipagination.current = curr;
+            return that.loadData(curr < 1 ? 1 : curr);
+          }
+          that.loadData();
+        } else {
+          that.$message.warning(res.message);
+        }
+      });
+    },
+    handleEdit: function (record) {
+      record.isView = false;
+      this.$refs.modalForm.edit(record);
+      this.$refs.modalForm.title = "编辑";
+      this.$refs.modalForm.disableSubmit = false;
+    },
+    handleView: function (record) {
+      record.isView = true;
+      this.$refs.modalForm.edit(record);
+      this.$refs.modalForm.title = "查看";
+      this.$refs.modalForm.disableSubmit = false;
+    },
+    //文件上传公共组件title:弹框标题；tableName:业务表名称；proId:课题ID
+    handleUploadFile: function (title, tableName, proId) {
+      if (title == '优秀论文推荐') {
+        this.$refs.uploadForm.edit(tableName, proId, true);
+      } else {
+        this.$refs.uploadForm.edit(tableName, proId, false);
+      }
+      this.$refs.uploadForm.title = title;
+    },
+    handleViewFile: function (title, tableName, tableId, proId) {
+      if (tableId == null || tableId == "") {
+        this.$message.warning("未上传文件");
+      } else {
+        this.$refs.uploadViewForm.edit(tableName, tableId, proId);
+        this.$refs.uploadViewForm.title = title;
+      }
+    },
+    handleAuditFile: function (title, tableName, tableId, dictCode, proId, detail) {
+      if (tableId == null || tableId == "") {
+        this.$message.warning("未上传文件");
+      } else {
+        this.$refs.uploadAuditForm.edit(tableName, tableId, dictCode, proId);
+        this.$refs.uploadAuditForm.title = title;
+        this.$refs.detail = detail;
+      }
+    },
+    handleAdd: function () {
+      this.$refs.modalForm.add();
+      this.$refs.modalForm.title = "新增";
+      this.$refs.modalForm.disableSubmit = false;
+    },
+    handleTableChange(pagination, filters, sorter) {
+      //分页、排序、筛选变化时触发
+      //TODO 筛选
+      if (Object.keys(sorter).length > 0) {
+        this.isorter.column = sorter.field;
+        this.isorter.order = "ascend" == sorter.order ? "asc" : "desc";
+      }
+      this.ipagination = pagination;
+      this.loadData();
+    },
+    handleToggleSearch() {
+      this.toggleSearchStatus = !this.toggleSearchStatus;
+    },
+    modalFormOk() {
+      // 新增/修改 成功时，重载列表
+      console.log('===selectedRowKeys', this.selectedRowKeys);
+      this.loadData();
+    },
+    handleDetail: function (record) {
+      this.$refs.modalForm.edit(record);
+      this.$refs.modalForm.title = "详情";
+      this.$refs.modalForm.disableSubmit = true;
+    },
+    /* 导出 */
+    handleExportXls2() {
+      let paramsStr = encodeURI(JSON.stringify(this.getQueryParams()));
+      let url = `${window._CONFIG['domianURL']}/${this.url.exportXlsUrl}?paramsStr=${paramsStr}`;
+      window.location.href = url;
+    },
+    handleExportXls(fileName) {
+      console.log(fileName);
+      if (!fileName || typeof fileName != "string") {
+        fileName = "导出文件";
+      }
+      let param = {
+        ...this.queryParam._clone
+      };
+      if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+        param['selections'] = this.selectedRowKeys.join(",");
+        param['ids'] = this.selectedRowKeys.join(",");
+      }
+      console.log("导出参数", param);
+      (0,_form_api_manage__WEBPACK_IMPORTED_MODULE_6__/* .downFile */ .$g)(this.url.exportXlsUrl, param).then(data => {
+        if (!data) {
+          this.$message.warning("文件下载失败");
+          return;
+        }
+        if (typeof window.navigator.msSaveBlob !== 'undefined') {
+          window.navigator.msSaveBlob(new Blob([data]), fileName + '.xls');
+        } else {
+          let url = window.URL.createObjectURL(new Blob([data]));
+          let link = document.createElement('a');
+          link.style.display = 'none';
+          link.href = url;
+          link.setAttribute('download', fileName + '.xls');
+          document.body.appendChild(link);
+          link.click();
+          document.body.removeChild(link); //下载完成移除元素
+          window.URL.revokeObjectURL(url); //释放掉blob对象
+        }
+      });
+    },
+    /* 导入 */
+    handleImportExcel(info) {
+      if (info.file.status !== 'uploading') {
+        console.log(info.file, info.fileList);
+      }
+      if (info.file.status === 'done') {
+        if (info.file.response.success) {
+          this.$message.success(info.file.response.result || `${info.file.name} 文件上传成功`);
+          this.loadData();
+        } else {
+          this.$message.error(info.file.response.result || `${info.file.name} ${info.file.response.message}.`);
+        }
+      } else if (info.file.status === 'error') {
+        this.$message.error(`文件上传失败: ${info.file.msg} `);
+      }
+    },
+    /* 图片预览 */
+    getImgView(text) {
+      if (text && text.indexOf(",") > 0) {
+        text = text.substring(0, text.indexOf(","));
+      }
+      return (window._CONFIG['imgDomainURL'] || window._CONFIG['imgUrl']) + "/" + text;
+    },
+    /* 文件下载 */
+    uploadFile(text) {
+      if (!text) {
+        this.$message.warning("未知的文件");
+        return;
+      }
+      if (text.indexOf(",") > 0) {
+        text = text.substring(0, text.indexOf(","));
+      }
+      window.open((window._CONFIG['fileDomainURL'] || window._CONFIG['domianURL']) + "/sys/common/download/" + text);
+    },
+    modalCancel() {
+      this.ipagination.current = 1;
+      this.ipagination.pageSize = 10;
+      this.queryParam = this.$options.data().queryParam;
+      this.visible = false;
+    }
+  }
+};
+
+/***/ }),
+
 /***/ 6151:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
@@ -135515,8 +135456,8 @@ var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._sel
 var staticRenderFns = []
 
 
-// EXTERNAL MODULE: ./src/form/modules/components/index.js + 970 modules
-var components = __webpack_require__(3229);
+// EXTERNAL MODULE: ./src/form/modules/components/index.js + 968 modules
+var components = __webpack_require__(1147);
 ;// CONCATENATED MODULE: ./node_modules/_thread-loader@3.0.4@thread-loader/dist/cjs.js!./node_modules/_babel-loader@8.3.0@babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/common/Modals/CorrectionItem.vue?vue&type=script&lang=js
 //
 //
@@ -135968,7 +135909,7 @@ var component = (0,componentNormalizer/* default */.A)(
 
 /***/ }),
 
-/***/ 5847:
+/***/ 925:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
@@ -135978,7 +135919,7 @@ __webpack_require__.d(__webpack_exports__, {
   A: () => (/* binding */ selectUserModal)
 });
 
-;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/common/Modals/selectUserModal.vue?vue&type=template&id=143fb95d&scoped=true
+;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/common/Modals/selectUserModal.vue?vue&type=template&id=5dd444e7&scoped=true
 var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('a-modal',{attrs:{"title":"选择用户","width":_vm.modalWidth,"visible":_vm.visible,"confirmLoading":_vm.confirmLoading,"afterClose":_vm.afterClose,"cancelText":"关闭","zIndex":1100000},on:{"ok":_vm.handleSubmit,"cancel":_vm.handleCancel}},[_c('a-spin',{attrs:{"tip":"Loading...","spinning":false}},[_c('a-card',{attrs:{"bordered":false}},[_c('div',{staticClass:"table-page-search-wrapper"},[_c('a-form',{attrs:{"layout":"inline","label-col":{ span: 0 },"wrapper-col":{ span: 24 }}},[_c('a-row',{attrs:{"gutter":24}},[(!_vm.tagId)?[_c('a-col',{attrs:{"md":6,"sm":6}},[_c('a-form-item',{staticStyle:{"width":"100%"}},[_c('a-tree-select',{staticStyle:{"width":"100%"},attrs:{"id":"speca","dropdown-style":{ maxHeight: '400px', overflow: 'auto' },"placeholder":"请选择部门","tree-data":_vm.treeData,"getPopupContainer":function (triggerNode) {
                     return triggerNode.parentNode || _vm.document.body;
                   },"disabled":_vm.applyId ? true : false,"allow-clear":""},on:{"change":_vm.treechange},model:{value:(_vm.queryParam.depId),callback:function ($$v) {_vm.$set(_vm.queryParam, "depId", $$v)},expression:"queryParam.depId"}})],1)],1),(_vm.showuser && !this.role)?_c('a-col',{attrs:{"md":6,"sm":6}},[_c('a-form-item',{staticStyle:{"width":"100%"}},[_c('a-select',{attrs:{"placeholder":"请选择角色","getPopupContainer":function (triggerNode) {
@@ -135991,8 +135932,8 @@ var staticRenderFns = []
 var es_array_push = __webpack_require__(5337);
 // EXTERNAL MODULE: ./src/api/manage.js
 var manage = __webpack_require__(8501);
-// EXTERNAL MODULE: ./src/mixins/JeecgListMixin.js
-var JeecgListMixin = __webpack_require__(1383);
+// EXTERNAL MODULE: ./src/mixins/JeecgListMixinV2.js
+var JeecgListMixinV2 = __webpack_require__(1807);
 // EXTERNAL MODULE: ./src/api/api.js
 var api = __webpack_require__(3240);
 // EXTERNAL MODULE: ./node_modules/_lodash@4.17.21@lodash/lodash.js
@@ -136123,7 +136064,7 @@ var lodash = __webpack_require__(5182);
   name: 'selectUserModal',
   props: ['modalWidth', 'multi', 'users', 'role', 'defaultDepartId', 'applyId', 'tagId'],
   mixins: [{
-    ...JeecgListMixin/* JeecgListMixin */.C,
+    ...JeecgListMixinV2/* JeecgListMixin */.C,
     created: undefined
   }],
   // 取消minxin created
@@ -136183,22 +136124,22 @@ var lodash = __webpack_require__(5182);
         importExcelUrl: 'sys/user/importExcel'
       },
       tagDeparts: [],
-      deptId: '',
-      needSearch: true
+      deptId: ''
     };
   },
   created() {
     this.deptId = this.defaultDepartId || undefined;
-    this.queryParam.depId = this.deptId;
-    this.queryParam.applyId = this.applyId || undefined;
-    this.queryParam.tagId = this.tagId;
-    this.userSearch = (0,lodash.cloneDeep)(this.queryParam);
+    this.setQueryParamsVal({
+      depId: this.deptId,
+      applyId: this.applyId,
+      tagId: this.tagId,
+      roleId: this.role
+    });
     this.loadData(false, 'first');
     this.loadDepartTree();
     this.setDefaultUser();
   },
   mounted() {
-    // this.getTreedata()
     if (this.deptId) {
       this.treechange(this.deptId);
     }
@@ -136211,6 +136152,7 @@ var lodash = __webpack_require__(5182);
       }
     },
     role(val) {
+      debugger;
       this.role = val;
     }
   },
@@ -136225,8 +136167,14 @@ var lodash = __webpack_require__(5182);
         this.ipagination.current = 1;
       }
       if (this.role) {
-        this.queryParam.roleId = this.role;
-        this.userSearch.roleId = this.role;
+        this.setQueryParamsVal({
+          roleId: this.role
+        });
+      }
+      if (this.tagId) {
+        this.setQueryParamsVal({
+          tagId: this.tagId
+        });
       }
       let params = this.getQueryParams(); //查询条件
       this.loading = true;
@@ -136235,10 +136183,10 @@ var lodash = __webpack_require__(5182);
           this.dataSource = res.result.records;
           this.ipagination.total = res.result.total;
           if (type && this.applyId) {
-            debugger;
             this.deptId = res.result.params.depId;
-            this.queryParam.depId = this.deptId;
-            this.userSearch.depId = this.role;
+            this.setQueryParamsVal({
+              depId: this.deptId
+            });
             this.treechange(this.deptId);
           }
         }
@@ -136409,18 +136357,22 @@ var lodash = __webpack_require__(5182);
     show(select, item, selectedUserIds = undefined, userSelectByMyself = '1') {
       console.log(select);
       if (this.tagId) this.getTagDepart();
-      this.queryParam.tagId = this.tagId;
+      if (this.deptId) {
+        this.treechange(this.deptId);
+      }
+      this.setQueryParamsVal({
+        tagId: this.tagId,
+        roleId: this.role,
+        depId: this.deptId,
+        applyId: this.applyId,
+        selectedUserIds: selectedUserIds,
+        userSelectByMyself: userSelectByMyself
+      });
+
       //this.loadDepartTree();
       this.checkedRows = [];
       this.rowSelection.selectedRowKeys = select;
       this.selectionRowsData = item;
-      if (this.deptId) {
-        this.queryParam.depId = this.deptId;
-        this.treechange(this.deptId);
-      }
-      if (this.applyId) this.queryParam.applyId = this.applyId;
-      this.queryParam.selectedUserIds = selectedUserIds;
-      this.queryParam.userSelectByMyself = userSelectByMyself;
       this.getTreedata();
       this.loadData();
       this.setDefaultUser();
@@ -136469,13 +136421,13 @@ var lodash = __webpack_require__(5182);
     },
     afterClose() {
       this.showuser = false;
-      this.queryParam.depId = this.queryParam.roleId = this.queryParam.username = this.queryParam.realname = undefined;
       this.ipagination.current = 1;
       this.ipagination.pageSize = 10;
       this.ipagination.total = 0;
     },
     handleClear() {
       this.visible = false;
+      this.modalCancel();
       this.checkedKeys = [];
     },
     getParentKey(currKey, treeData) {
@@ -136512,10 +136464,10 @@ var lodash = __webpack_require__(5182);
 });
 ;// CONCATENATED MODULE: ./src/form/modules/common/Modals/selectUserModal.vue?vue&type=script&lang=js
  /* harmony default export */ const Modals_selectUserModalvue_type_script_lang_js = (selectUserModalvue_type_script_lang_js); 
-;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.8.1@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/_css-loader@6.10.0@css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/common/Modals/selectUserModal.vue?vue&type=style&index=0&id=143fb95d&prod&scoped=true&lang=css
+;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.8.1@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/_css-loader@6.10.0@css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/common/Modals/selectUserModal.vue?vue&type=style&index=0&id=5dd444e7&prod&scoped=true&lang=css
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/form/modules/common/Modals/selectUserModal.vue?vue&type=style&index=0&id=143fb95d&prod&scoped=true&lang=css
+;// CONCATENATED MODULE: ./src/form/modules/common/Modals/selectUserModal.vue?vue&type=style&index=0&id=5dd444e7&prod&scoped=true&lang=css
 
 // EXTERNAL MODULE: ./node_modules/_vue-loader@15.11.1@vue-loader/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(4008);
@@ -136534,7 +136486,7 @@ var component = (0,componentNormalizer/* default */.A)(
   staticRenderFns,
   false,
   null,
-  "143fb95d",
+  "5dd444e7",
   null
   
 )
@@ -137550,8 +137502,8 @@ var component = (0,componentNormalizer/* default */.A)(
 )
 
 /* harmony default export */ const CorrectionModal = (component.exports);
-// EXTERNAL MODULE: ./src/form/modules/components/index.js + 970 modules
-var components = __webpack_require__(3229);
+// EXTERNAL MODULE: ./src/form/modules/components/index.js + 968 modules
+var components = __webpack_require__(1147);
 // EXTERNAL MODULE: ./node_modules/_pubsub-js@1.9.4@pubsub-js/src/pubsub.js
 var pubsub = __webpack_require__(1528);
 var pubsub_default = /*#__PURE__*/__webpack_require__.n(pubsub);
@@ -138701,8 +138653,8 @@ var vuedraggable_umd = __webpack_require__(9715);
 var vuedraggable_umd_default = /*#__PURE__*/__webpack_require__.n(vuedraggable_umd);
 // EXTERNAL MODULE: ./src/api/manage.js
 var manage = __webpack_require__(8501);
-// EXTERNAL MODULE: ./src/form/modules/components/index.js + 970 modules
-var components = __webpack_require__(3229);
+// EXTERNAL MODULE: ./src/form/modules/components/index.js + 968 modules
+var components = __webpack_require__(1147);
 // EXTERNAL MODULE: ./src/form/util/Bus.js
 var Bus = __webpack_require__(1509);
 // EXTERNAL MODULE: ./src/form/modules/config/hnkj.js
@@ -152288,6 +152240,102 @@ var isBuffer = nativeIsBuffer || _lodash_es_4_17_21_lodash_es_stubFalse;
 /* harmony default export */ const _lodash_es_4_17_21_lodash_es_isBuffer = (isBuffer);
 
 
+/***/ }),
+
+/***/ 2863:
+/***/ ((__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   A: () => (__WEBPACK_DEFAULT_EXPORT__)
+/* harmony export */ });
+/* harmony import */ var _baseKeys_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(9461);
+/* harmony import */ var _getTag_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(9988);
+/* harmony import */ var _isArguments_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(8280);
+/* harmony import */ var _isArray_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(3791);
+/* harmony import */ var _isArrayLike_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(104);
+/* harmony import */ var _isBuffer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(9714);
+/* harmony import */ var _isPrototype_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(1145);
+/* harmony import */ var _isTypedArray_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(3596);
+
+
+
+
+
+
+
+
+
+/** `Object#toString` result references. */
+var mapTag = '[object Map]',
+    setTag = '[object Set]';
+
+/** Used for built-in method references. */
+var objectProto = Object.prototype;
+
+/** Used to check objects for own properties. */
+var hasOwnProperty = objectProto.hasOwnProperty;
+
+/**
+ * Checks if `value` is an empty object, collection, map, or set.
+ *
+ * Objects are considered empty if they have no own enumerable string keyed
+ * properties.
+ *
+ * Array-like values such as `arguments` objects, arrays, buffers, strings, or
+ * jQuery-like collections are considered empty if they have a `length` of `0`.
+ * Similarly, maps and sets are considered empty if they have a `size` of `0`.
+ *
+ * @static
+ * @memberOf _
+ * @since 0.1.0
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is empty, else `false`.
+ * @example
+ *
+ * _.isEmpty(null);
+ * // => true
+ *
+ * _.isEmpty(true);
+ * // => true
+ *
+ * _.isEmpty(1);
+ * // => true
+ *
+ * _.isEmpty([1, 2, 3]);
+ * // => false
+ *
+ * _.isEmpty({ 'a': 1 });
+ * // => false
+ */
+function isEmpty(value) {
+  if (value == null) {
+    return true;
+  }
+  if ((0,_isArrayLike_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A)(value) &&
+      ((0,_isArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .A)(value) || typeof value == 'string' || typeof value.splice == 'function' ||
+        (0,_isBuffer_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .A)(value) || (0,_isTypedArray_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .A)(value) || (0,_isArguments_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .A)(value))) {
+    return !value.length;
+  }
+  var tag = (0,_getTag_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .A)(value);
+  if (tag == mapTag || tag == setTag) {
+    return !value.size;
+  }
+  if ((0,_isPrototype_js__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .A)(value)) {
+    return !(0,_baseKeys_js__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .A)(value).length;
+  }
+  for (var key in value) {
+    if (hasOwnProperty.call(value, key)) {
+      return false;
+    }
+  }
+  return true;
+}
+
+/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (isEmpty);
+
+
 /***/ }),
 
 /***/ 6018:
@@ -153784,7 +153832,7 @@ function toString(value) {
 /***/ ((module) => {
 
 "use strict";
-module.exports = {"rE":"1.1.447"};
+module.exports = {"rE":"1.1.449"};
 
 /***/ })
 
@@ -155727,7 +155775,7 @@ icon_Icon.install = function (Vue) {
 };
 
 /* harmony default export */ const icon = (icon_Icon);
-;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/flow/panel.vue?vue&type=template&id=66b26126&scoped=true
+;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/flow/panel.vue?vue&type=template&id=32725f57&scoped=true
 var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return (_vm.easyFlowVisible)?_c('div',{staticClass:"g1_workflow_warp"},[_c('div',{staticClass:"g1-sider_tool1"},[_c('div',{ref:"flowTool",staticClass:"tool_box"},[_c('flowTool',{on:{"addNode":_vm.addNode}})],1)]),_c('div',{ref:"form_main1",staticClass:"g1-form_main1",attrs:{"id":"form_main1"}},[_c('div',{staticClass:"head"},[_c('a-button',{attrs:{"type":"primary","size":"small","icon":"search"},on:{"click":_vm.dataInfo}},[_vm._v("查看")]),_c('a-button',{attrs:{"type":"primary","size":"small","icon":"fund"},on:{"click":function($event){$event.stopPropagation();return _vm.isPanelShow('flowPanel')}}},[_vm._v("设置流程信息 ")]),_c('a-button',{attrs:{"type":"primary","size":"small","icon":"align-left"},on:{"click":function($event){$event.stopPropagation();return _vm.isPanelShow('dataConditionPanel')}}},[_vm._v("查看流程条件 ")]),(!_vm.isFlowPanelMain)?_c('a-button',{attrs:{"type":"primary","size":"small","icon":"save"},on:{"click":_vm.saveData}},[_vm._v("保存")]):_vm._e()],1),_c('div',{ref:"main",staticClass:"main",attrs:{"id":"main"},on:{"click":_vm.closeAddBtn}},[_c('div',{ref:"flowContainer",staticClass:"container",attrs:{"id":"flowContainer"}},[_vm._l((_vm.data.nodeList),function(node){return [_c('flow-node',{directives:[{name:"show",rawName:"v-show",value:(node.show),expression:"node.show"}],key:node.id,ref:"flowNode",refInFor:true,attrs:{"id":node.id,"node":node,"nodeList":_vm.data.nodeList},on:{"clickNode":_vm.clickNode,"lineChange":_vm.lineChange,"deleteNode":_vm.deleteNode,"nodeRightMenu":_vm.nodeRightMenu,"changeNodeSite":_vm.changeNodeSite,"editNode":_vm.editNode,"addNodeClick":_vm.addNodeClick}})]})],2),(_vm.isSavePicLoadingShow)?_c('div',{staticClass:"loading"},[_c('a-spin',{attrs:{"size":"large"}})],1):_vm._e()]),_c('sider-panel',{directives:[{name:"show",rawName:"v-show",value:(_vm.siderPanelVisible),expression:"siderPanelVisible"}],ref:"siderPanel",attrs:{"isFlowPanelZJAF":_vm.isFlowPanelZJAF,"formId":_vm.data.nodeForm.formId,"formDesigerData":_vm.formDesigerData,"verifyListArr":_vm.verifyList},on:{"isPanelShow":_vm.isPanelShow}}),(_vm.linePanelVisible)?_c('line-panel',{ref:"linePanel",attrs:{"formId":_vm.data.nodeForm.formId,"formDesigerData":_vm.formDesigerData},on:{"isPanelShow":_vm.isPanelShow,"setLineData":_vm.setLineData}}):_vm._e(),(_vm.dataConditionPanelVisible)?_c('dataConditionPanel',{ref:"dataConditionPanel",attrs:{"formId":_vm.data.nodeForm.formId,"formDesigerData":_vm.formDesigerData},on:{"isPanelShow":_vm.isPanelShow}}):_vm._e(),_c('flow-panel',{directives:[{name:"show",rawName:"v-show",value:(_vm.flowPanelVisible),expression:"flowPanelVisible"}],ref:"flowPanel",staticStyle:{"z-index":"10"},attrs:{"data":_vm.data,"id":_vm.id},on:{"isPanelShow":_vm.isPanelShow}}),(_vm.copyDesignVisible)?_c('copyDesign',{ref:"copyDesign",attrs:{"formId":_vm.data.nodeForm.formId,"formDesigerData":_vm.formDesigerData,"isFlowPanelZJAF":_vm.isFlowPanelZJAF},on:{"isPanelShow":_vm.isPanelShow}}):_vm._e(),(_vm.userDesignVisible)?_c('userDesign',{ref:"userDesign",attrs:{"formId":_vm.data.nodeForm.formId,"formDesigerData":_vm.formDesigerData,"isFlowPanelZJAF":_vm.isFlowPanelZJAF},on:{"isPanelShow":_vm.isPanelShow}}):_vm._e()],1),(_vm.flowInfoVisible)?_c('flow-info',{ref:"flowInfo"}):_vm._e(),(_vm.lineToolVisible)?_c('ul',{ref:"lineTool",staticClass:"lineTool",on:{"mouseleave":_vm.lineToolFn}},[_c('li',{on:{"click":function($event){return _vm.setLineStyle('Flowchart')}}},[_c('svg-icon',{attrs:{"iconName":"icon-yibiaopan"}})],1),_c('li',{on:{"click":function($event){return _vm.setLineStyle('Bezier')}}},[_c('svg-icon',{attrs:{"iconName":"icon-ant-bezier-quadro"}})],1),_c('li',{on:{"click":function($event){return _vm.setLineStyle('Straight')}}},[_c('svg-icon',{attrs:{"iconName":"icon-line"}})],1),_c('li',{on:{"click":_vm.deleteLineView}},[_c('svg-icon',{attrs:{"iconName":"icon-jurassic_line"}})],1)]):_vm._e()],1):_vm._e()}
 var staticRenderFns = []
 
@@ -157420,8 +157468,8 @@ var sider_panelvue_type_template_id_7004cd5f_render = function () {var _vm=this;
 var sider_panelvue_type_template_id_7004cd5f_staticRenderFns = []
 
 
-;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/flow/select_type.vue?vue&type=template&id=47f04ad2
-var select_typevue_type_template_id_47f04ad2_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[_c('a-modal',{attrs:{"title":"配置人员类型","width":800,"destroyOnClose":true},on:{"ok":_vm.handleOk,"cancel":_vm.handleCancel},model:{value:(_vm.visible),callback:function ($$v) {_vm.visible=$$v},expression:"visible"}},[_c('div',{staticClass:"table-page-search-wrapper"},[_c('a-form',{attrs:{"layout":"inline"}},[_c('a-row',{directives:[{name:"show",rawName:"v-show",value:(_vm.defaultKey !== 'CandidateFormUsers' && _vm.defaultKey !== 'Script' ),expression:"defaultKey !== 'CandidateFormUsers' && defaultKey !== 'Script' "}],attrs:{"gutter":24}},[(_vm.defaultKey !== 'relationMatrix')?_c('a-col',{attrs:{"md":8,"sm":12}},[_c('a-form-item',[_c('a-tree-select',{staticStyle:{"width":"240px"},attrs:{"dropdown-style":{ maxHeight: '400px', overflow: 'auto' },"placeholder":"请选择部门","tree-data":_vm.treeData,"allow-clear":""},on:{"change":_vm.treechange},model:{value:(_vm.query.depId),callback:function ($$v) {_vm.$set(_vm.query, "depId", $$v)},expression:"query.depId"}})],1)],1):_vm._e(),(_vm.defaultKey === 'relationMatrix')?[_c('a-col',{attrs:{"md":8,"sm":12}},[_c('a-form-item',[_c('a-input',{attrs:{"placeholder":"请输入标签"},model:{value:(_vm.m_tagQuery.tagName),callback:function ($$v) {_vm.$set(_vm.m_tagQuery, "tagName", $$v)},expression:"m_tagQuery.tagName"}})],1)],1)]:_vm._e(),(_vm.showuser && _vm.defaultKey !== 'relationMatrix')?_c('a-col',{attrs:{"md":6,"sm":12}},[_c('a-form-item',[_c('a-select',{staticStyle:{"width":"173px"},attrs:{"placeholder":"请选择角色"},on:{"change":_vm.handleChange},model:{value:(_vm.query.roleId),callback:function ($$v) {_vm.$set(_vm.query, "roleId", $$v)},expression:"query.roleId"}},_vm._l((_vm.userlist),function(item){return _c('a-select-option',{key:item.id,attrs:{"value":item.id}},[_vm._v(" "+_vm._s(item.roleName)+" ")])}),1)],1)],1):_vm._e(),_c('a-col',{directives:[{name:"show",rawName:"v-show",value:(_vm.showname),expression:"showname"}],attrs:{"md":6,"sm":12}},[_c('a-form-item',[_c('a-input',{attrs:{"placeholder":this.defaultKey == 'CandidateGroups' ? '请输入名称' : '请输入姓名'},model:{value:(_vm.query.realname),callback:function ($$v) {_vm.$set(_vm.query, "realname", $$v)},expression:"query.realname"}})],1)],1),_c('a-col',{attrs:{"md":4,"sm":8}},[_c('span',{staticClass:"table-page-search-submitButtons",staticStyle:{"float":"left","overflow":"hidden"}},[_c('a-button',{attrs:{"type":"primary","icon":"search"},on:{"click":_vm.handlesearch}},[_vm._v("查询")])],1)])],2)],1)],1),_c('a-tabs',{attrs:{"activeKey":_vm.defaultKey},on:{"change":_vm.changeTabs}},[_c('a-tab-pane',{key:"Assingee",attrs:{"tab":"个人"}},[_c('a-table',{attrs:{"rowSelection":{
+;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/flow/select_type.vue?vue&type=template&id=2143371a
+var select_typevue_type_template_id_2143371a_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[_c('a-modal',{attrs:{"title":"配置人员类型","width":800,"destroyOnClose":true},on:{"ok":_vm.handleOk,"cancel":_vm.handleCancel},model:{value:(_vm.visible),callback:function ($$v) {_vm.visible=$$v},expression:"visible"}},[_c('div',{staticClass:"table-page-search-wrapper"},[_c('a-form',{attrs:{"layout":"inline"}},[_c('a-row',{directives:[{name:"show",rawName:"v-show",value:(_vm.defaultKey !== 'CandidateFormUsers' && _vm.defaultKey !== 'Script' ),expression:"defaultKey !== 'CandidateFormUsers' && defaultKey !== 'Script' "}],attrs:{"gutter":24}},[(_vm.defaultKey !== 'relationMatrix')?_c('a-col',{attrs:{"md":8,"sm":12}},[_c('a-form-item',[_c('a-tree-select',{staticStyle:{"width":"240px"},attrs:{"dropdown-style":{ maxHeight: '400px', overflow: 'auto' },"placeholder":"请选择部门","tree-data":_vm.treeData,"allow-clear":""},on:{"change":_vm.treechange},model:{value:(_vm.query.depId),callback:function ($$v) {_vm.$set(_vm.query, "depId", $$v)},expression:"query.depId"}})],1)],1):_vm._e(),(_vm.defaultKey === 'relationMatrix')?[_c('a-col',{attrs:{"md":8,"sm":12}},[_c('a-form-item',[_c('a-input',{attrs:{"placeholder":"请输入标签"},model:{value:(_vm.m_tagQuery.tagName),callback:function ($$v) {_vm.$set(_vm.m_tagQuery, "tagName", $$v)},expression:"m_tagQuery.tagName"}})],1)],1)]:_vm._e(),(_vm.showuser && _vm.defaultKey !== 'relationMatrix')?_c('a-col',{attrs:{"md":6,"sm":12}},[_c('a-form-item',[_c('a-select',{staticStyle:{"width":"173px"},attrs:{"placeholder":"请选择角色"},on:{"change":_vm.handleChange},model:{value:(_vm.query.roleId),callback:function ($$v) {_vm.$set(_vm.query, "roleId", $$v)},expression:"query.roleId"}},_vm._l((_vm.userlist),function(item){return _c('a-select-option',{key:item.id,attrs:{"value":item.id}},[_vm._v(" "+_vm._s(item.roleName)+" ")])}),1)],1)],1):_vm._e(),_c('a-col',{directives:[{name:"show",rawName:"v-show",value:(_vm.showname),expression:"showname"}],attrs:{"md":6,"sm":12}},[_c('a-form-item',[_c('a-input',{attrs:{"placeholder":this.defaultKey == 'CandidateGroups' ? '请输入名称' : '请输入姓名'},model:{value:(_vm.query.realname),callback:function ($$v) {_vm.$set(_vm.query, "realname", $$v)},expression:"query.realname"}})],1)],1),_c('a-col',{attrs:{"md":4,"sm":8}},[_c('span',{staticClass:"table-page-search-submitButtons",staticStyle:{"float":"left","overflow":"hidden"}},[_c('a-button',{attrs:{"type":"primary","icon":"search"},on:{"click":_vm.handlesearch}},[_vm._v("查询")])],1)])],2)],1)],1),_c('a-tabs',{attrs:{"activeKey":_vm.defaultKey},on:{"change":_vm.changeTabs}},[_c('a-tab-pane',{key:"Assingee",attrs:{"tab":"个人"}},[_c('a-table',{attrs:{"rowSelection":{
             type: 'radio',
             selectedRowKeys: _vm.formData.assingeeValue,
             onChange: _vm.onSelectPersion,
@@ -157451,7 +157499,7 @@ var select_typevue_type_template_id_47f04ad2_render = function () {var _vm=this;
             onSelect: _vm.onSelectUsers,
             onSelectAll: _vm.onSelectAll
           },"columns":_vm.tagColumns,"dataSource":_vm.tagData,"pagination":_vm.tagIpagination,"size":"small","rowKey":"id"},on:{"change":_vm.handleTagDataTableChange}})],1),_c('a-tab-pane',{key:"Script",attrs:{"tab":"脚本"}},[_c('a-textarea',{attrs:{"placeholder":"请输入脚本任务","rows":4},model:{value:(_vm.formData.scriptValue),callback:function ($$v) {_vm.$set(_vm.formData, "scriptValue", $$v)},expression:"formData.scriptValue"}})],1)],1)],1)],1)}
-var select_typevue_type_template_id_47f04ad2_staticRenderFns = []
+var select_typevue_type_template_id_2143371a_staticRenderFns = []
 
 
 // EXTERNAL MODULE: ./node_modules/_lodash@4.17.21@lodash/lodash.js
@@ -157942,8 +157990,20 @@ const tagColumns = [{
         ...this.params
       }).then(res => {
         if (res.success) {
-          console.log(this.formData, this.cacheSeletedRows);
+          console.log(this.formData, this.cacheSeletedRows, this.formDesigerData);
           this.formUserData = res.result;
+          if (this.formDesigerData && this.formDesigerData.length > 0 && this.formDesigerData.some(item => item.columnType === 'userSelector' || item.columnType === 'userSelectorByRole')) {
+            let arr = [];
+            this.formDesigerData.forEach(item => {
+              if (item.columnType === 'userSelector' || item.columnType === 'userSelectorByRole') {
+                arr.push({
+                  id: item.columnCode,
+                  name: item.columnName
+                });
+              }
+            });
+            if (arr.length > 0) this.formUserData.splice(1, 0, ...arr);
+          }
           //防止之前选过表单组件 删除了 数据还在 过滤一下
           // if (key == "CandidateGroups" && this.cacheSeletedRows && this.cacheSeletedRows.length > 0) {
           //   this.cacheSeletedRows = this.cacheSeletedRows.filter((item) => {
@@ -158336,8 +158396,8 @@ const tagColumns = [{
 ;
 var select_type_component = (0,componentNormalizer/* default */.A)(
   flow_select_typevue_type_script_lang_js,
-  select_typevue_type_template_id_47f04ad2_render,
-  select_typevue_type_template_id_47f04ad2_staticRenderFns,
+  select_typevue_type_template_id_2143371a_render,
+  select_typevue_type_template_id_2143371a_staticRenderFns,
   false,
   null,
   null,
@@ -164607,6 +164667,16 @@ var userDesign_component = (0,componentNormalizer/* default */.A)(
             status: node.info.status == 1 ? true : false,
             scriptManageId: node.info.scriptManageId
           });
+          // if(node.info.taskAssigneeList && node.info.taskAssigneeList.length > 0) {
+          //   node.info.taskAssigneeList.forEach(item => {
+          //     if(item.assigneeType === 'CandidateFormUsers') {
+          //       let formUserData = JSON.parse(localStorage.getItem('formUserData')).map(el => el.id)
+          //       let assigneeVal = item.assigneeVal.split(',')
+          //       item.assigneeVal = assigneeVal.filter(el => formUserData.includes(el)).join(',') 
+          //       debugger
+          //     }
+          //   })
+          // }
         });
         return this.data;
       } else {
@@ -164799,15 +164869,15 @@ var userDesign_component = (0,componentNormalizer/* default */.A)(
 });
 ;// CONCATENATED MODULE: ./src/flow/panel.vue?vue&type=script&lang=js
  /* harmony default export */ const src_flow_panelvue_type_script_lang_js = (panelvue_type_script_lang_js); 
-;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.8.1@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.10.0@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/flow/panel.vue?vue&type=style&index=0&id=66b26126&prod&lang=less&scoped=true
+;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.8.1@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.10.0@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/flow/panel.vue?vue&type=style&index=0&id=32725f57&prod&lang=less&scoped=true
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/flow/panel.vue?vue&type=style&index=0&id=66b26126&prod&lang=less&scoped=true
+;// CONCATENATED MODULE: ./src/flow/panel.vue?vue&type=style&index=0&id=32725f57&prod&lang=less&scoped=true
 
-;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.8.1@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.10.0@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/flow/panel.vue?vue&type=style&index=1&id=66b26126&prod&lang=less&scoped=true
+;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.8.1@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.10.0@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/flow/panel.vue?vue&type=style&index=1&id=32725f57&prod&lang=less&scoped=true
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/flow/panel.vue?vue&type=style&index=1&id=66b26126&prod&lang=less&scoped=true
+;// CONCATENATED MODULE: ./src/flow/panel.vue?vue&type=style&index=1&id=32725f57&prod&lang=less&scoped=true
 
 ;// CONCATENATED MODULE: ./src/flow/panel.vue
 
@@ -164825,7 +164895,7 @@ var panel_component = (0,componentNormalizer/* default */.A)(
   staticRenderFns,
   false,
   null,
-  "66b26126",
+  "32725f57",
   null
   
 )
@@ -168233,8 +168303,8 @@ var es_array_sort = __webpack_require__(5833);
 var es_array_unshift = __webpack_require__(8900);
 // EXTERNAL MODULE: ./src/form/util/util.js
 var util_util = __webpack_require__(4063);
-// EXTERNAL MODULE: ./src/form/modules/components/index.js + 970 modules
-var components = __webpack_require__(3229);
+// EXTERNAL MODULE: ./src/form/modules/components/index.js + 968 modules
+var components = __webpack_require__(1147);
 // EXTERNAL MODULE: ./src/form/modules/widgetFormItem.vue + 6 modules
 var widgetFormItem = __webpack_require__(4859);
 // EXTERNAL MODULE: ./src/form/modules/WidgetIdeaSignItem.vue + 5 modules
@@ -170804,7 +170874,7 @@ var toLinkageWidget_component = (0,componentNormalizer/* default */.A)(
 // EXTERNAL MODULE: ./src/form/modules/common/querySelectDict.vue + 3 modules
 var querySelectDict = __webpack_require__(5042);
 // EXTERNAL MODULE: ./src/form/modules/common/Modals/selectUserModal.vue + 5 modules
-var selectUserModal = __webpack_require__(5847);
+var selectUserModal = __webpack_require__(925);
 ;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/common/formLinkage/component/linkageSelectUser.vue?vue&type=template&id=7fd8ad34&scoped=true
 var linkageSelectUservue_type_template_id_7fd8ad34_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[_c('a-input',{on:{"mousedown":function($event){$event.preventDefault();return _vm.openModal.apply(null, arguments)}},model:{value:(_vm.userNames),callback:function ($$v) {_vm.userNames=$$v},expression:"userNames"}},[_c('a-icon',{attrs:{"slot":"prefix","type":"user","title":"用户选择"},slot:"prefix"}),_c('a-icon',{staticStyle:{"cursor":"pointer"},attrs:{"slot":"suffix","type":"close-circle","title":"清空"},nativeOn:{"click":function($event){$event.stopPropagation();return _vm.handleEmpty.apply(null, arguments)}},slot:"suffix"})],1),_c('select-user-modal',{ref:"selectUserModal",attrs:{"modal-width":"1000px","users":_vm.value,"multi":_vm.multiple},on:{"ok":_vm.handleOK,"initComp":_vm.initComp}})],1)}
 var linkageSelectUservue_type_template_id_7fd8ad34_scoped_true_staticRenderFns = []