@zscreate/form-component 1.1.438 → 1.1.439

package/dist/form-component.umd.js

@@ -81021,7 +81021,7 @@ let getFileExt = filename => {
 /* harmony import */ var _util_mathUtils__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(38);
 /* harmony import */ var _util_util__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(6955);
 /* harmony import */ var _layoutItem__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(8029);
-/* harmony import */ var _components_index__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(423);
+/* harmony import */ var _components_index__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(895);
 /* harmony import */ var pubsub_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(2980);
 /* 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__(7203);
@@ -84091,7 +84091,7 @@ module.exports = {
 
 /***/ }),
 
-/***/ 423:
+/***/ 895:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
@@ -86748,11 +86748,13 @@ var widgetSetupvue_type_template_id_434c620a_scoped_true_staticRenderFns = []
 
 // EXTERNAL MODULE: ./node_modules/_core-js@3.30.2@core-js/modules/es.array.unscopables.flat.js
 var es_array_unscopables_flat = __webpack_require__(1099);
-;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.10.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.10.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/common/Modals/formOneTable.vue?vue&type=template&id=780933d0&
-var formOneTablevue_type_template_id_780933d0_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('a-modal',{staticStyle:{"height":"80%","overflow-y":"hidden"},attrs:{"title":'字典中心',"width":800,"visible":_vm.visible,"destroyOnClose":true,"confirmLoading":_vm.confirmLoading,"centered":true,"cancelText":"关闭","wrapClassName":"ant-modal-cust-warp","zIndex":1100000,"maskClosable":false},on:{"ok":_vm.handleOk,"cancel":_vm.handleCancel}},[_c('a-form',{attrs:{"layout":"inline"}},[_c('a-row',{attrs:{"gutter":24}},[_c('a-col',{attrs:{"md":8,"sm":8}},[_c('a-input',{attrs:{"placeholder":"请输入字典名称"},model:{value:(_vm.queryParam.dictName),callback:function ($$v) {_vm.$set(_vm.queryParam, "dictName", $$v)},expression:"queryParam.dictName"}})],1),_c('a-col',{attrs:{"md":8,"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.searchQuery}},[_vm._v("查询")]),_c('a-button',{staticStyle:{"margin-left":"8px"},attrs:{"type":"primary","icon":"reload"},on:{"click":_vm.searchReset}},[_vm._v("重置")])],1)])],1)],1),_c('a-table',{ref:"table",attrs:{"rowKey":"id","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)}
-var formOneTablevue_type_template_id_780933d0_staticRenderFns = []
+;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.10.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.10.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/common/Modals/formOneTable.vue?vue&type=template&id=d183f952&
+var formOneTablevue_type_template_id_d183f952_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('a-modal',{staticStyle:{"height":"80%","overflow-y":"hidden"},attrs:{"title":'字典中心',"width":800,"visible":_vm.visible,"destroyOnClose":true,"confirmLoading":_vm.confirmLoading,"centered":true,"cancelText":"关闭","wrapClassName":"ant-modal-cust-warp","zIndex":1100000,"maskClosable":false},on:{"ok":_vm.handleOk,"cancel":_vm.handleCancel}},[_c('a-form',{attrs:{"layout":"inline"}},[_c('a-row',{attrs:{"gutter":24}},[_c('a-col',{attrs:{"md":8,"sm":8}},[_c('a-input',{attrs:{"placeholder":"请输入字典名称"},model:{value:(_vm.queryParam.dictName),callback:function ($$v) {_vm.$set(_vm.queryParam, "dictName", $$v)},expression:"queryParam.dictName"}})],1),_c('a-col',{attrs:{"md":8,"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.searchQuery}},[_vm._v("查询")]),_c('a-button',{staticStyle:{"margin-left":"8px"},attrs:{"type":"primary","icon":"reload"},on:{"click":_vm.searchReset}},[_vm._v("重置")])],1)])],1)],1),_c('a-table',{ref:"table",attrs:{"rowKey":"id","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)}
+var formOneTablevue_type_template_id_d183f952_staticRenderFns = []
 
 
+// EXTERNAL MODULE: ./node_modules/_lodash@4.17.21@lodash/lodash.js
+var lodash = __webpack_require__(9392);
 ;// 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.10.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/common/Modals/formOneTable.vue?vue&type=script&lang=js&
 //
 //
@@ -86803,6 +86805,7 @@ var formOneTablevue_type_template_id_780933d0_staticRenderFns = []
 //
 //
 
+
 /* harmony default export */ const formOneTablevue_type_script_lang_js_ = ({
   name: "formOnetable",
   data() {
@@ -86839,11 +86842,13 @@ var formOneTablevue_type_template_id_780933d0_staticRenderFns = []
         title: "字典编号",
         align: "left",
         dataIndex: "dict_table"
-      }]
+      }],
+      userSearch: {}
     };
   },
   methods: {
     init(code) {
+      this.userSearch = {};
       this.dictCode = code;
       this.selectedRowKeys = [];
       this.visible = true;
@@ -86851,8 +86856,9 @@ var formOneTablevue_type_template_id_780933d0_staticRenderFns = []
       this.searchQuery();
     },
     getdict() {
+      let params = this.userSearch;
       this.$http.get("form/formdesiger/getDataCenterDictList", {
-        params: this.queryParam
+        params
       }).then(res => {
         console.log(res);
         this.ipagination.total = res.result.total;
@@ -86871,15 +86877,26 @@ var formOneTablevue_type_template_id_780933d0_staticRenderFns = []
       this.$emit("ok", this.dictCode);
       this.visible = false;
     },
+    // searchQuery() {
+    //   this.queryParam.pageNo = 1;
+    //   this.ipagination.current = 1;
+    //   this.getdict();
+    // },
     searchQuery() {
-      this.queryParam.pageNo = 1;
-      this.ipagination.current = 1;
+      const queryParam = (0,lodash.cloneDeep)(this.queryParam);
+      delete queryParam._clone;
+      this.queryParam._clone = queryParam;
+      this.userSearch = {
+        ...this.userSearch,
+        ...this.queryParam._clone
+      };
       this.getdict();
     },
     searchReset() {
       var that = this;
       that.queryParam.dictName = "";
       that.queryParam.dictCode = "";
+      this.userSearch = {};
       this.searchQuery();
       // that.loadData(this.ipagination.current);
     },
@@ -86894,6 +86911,7 @@ var formOneTablevue_type_template_id_780933d0_staticRenderFns = []
       console.log(pagination);
       this.ipagination = pagination;
       this.queryParam.pageNo = pagination.current;
+      this.userSearch.pageNo = pagination.current;
       this.getdict();
     }
   }
@@ -86910,8 +86928,8 @@ var formOneTablevue_type_template_id_780933d0_staticRenderFns = []
 ;
 var formOneTable_component = (0,componentNormalizer/* default */.Z)(
   Modals_formOneTablevue_type_script_lang_js_,
-  formOneTablevue_type_template_id_780933d0_render,
-  formOneTablevue_type_template_id_780933d0_staticRenderFns,
+  formOneTablevue_type_template_id_d183f952_render,
+  formOneTablevue_type_template_id_d183f952_staticRenderFns,
   false,
   null,
   null,
@@ -86920,16 +86938,494 @@ var formOneTable_component = (0,componentNormalizer/* default */.Z)(
 )
 
 /* harmony default export */ const formOneTable = (formOneTable_component.exports);
-;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.10.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.10.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/common/Modals/selectSysDict.vue?vue&type=template&id=6fd9fc0a&scoped=true&
-var selectSysDictvue_type_template_id_6fd9fc0a_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":_vm.placeholder},on:{"click":_vm.init,"mousedown":function($event){$event.preventDefault();return (function () {}).apply(null, arguments)}},model:{value:(_vm.widget.options.dictName),callback:function ($$v) {_vm.$set(_vm.widget.options, "dictName", $$v)},expression:"widget.options.dictName"}}),_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.dictName),callback:function ($$v) {_vm.$set(_vm.queryParam, "dictName", $$v)},expression:"queryParam.dictName"}}),_c('a-input',{attrs:{"placeholder":"请输入字典编码"},model:{value:(_vm.queryParam.dictCode),callback:function ($$v) {_vm.$set(_vm.queryParam, "dictCode", $$v)},expression:"queryParam.dictCode"}}),_c('a-button',{attrs:{"type":"primary"},on:{"click":function($event){return _vm.searchQuery()}}},[_vm._v("搜索")])],1),_c('a-table',{ref:"table",attrs:{"rowKey":"dictCode","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 selectSysDictvue_type_template_id_6fd9fc0a_scoped_true_staticRenderFns = []
+;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.10.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.10.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/common/Modals/selectSysDict.vue?vue&type=template&id=0579658d&scoped=true&
+var selectSysDictvue_type_template_id_0579658d_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":_vm.placeholder},on:{"click":_vm.init,"mousedown":function($event){$event.preventDefault();return (function () {}).apply(null, arguments)}},model:{value:(_vm.widget.options.dictName),callback:function ($$v) {_vm.$set(_vm.widget.options, "dictName", $$v)},expression:"widget.options.dictName"}}),_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.dictName),callback:function ($$v) {_vm.$set(_vm.queryParam, "dictName", $$v)},expression:"queryParam.dictName"}}),_c('a-input',{attrs:{"placeholder":"请输入字典编码"},model:{value:(_vm.queryParam.dictCode),callback:function ($$v) {_vm.$set(_vm.queryParam, "dictCode", $$v)},expression:"queryParam.dictCode"}}),_c('a-button',{attrs:{"type":"primary"},on:{"click":function($event){return _vm.searchQuery()}}},[_vm._v("搜索")])],1),_c('a-table',{ref:"table",attrs:{"rowKey":"dictCode","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 selectSysDictvue_type_template_id_0579658d_scoped_true_staticRenderFns = []
+
+
+// EXTERNAL MODULE: ./src/utils/util.js
+var util = __webpack_require__(4948);
+// EXTERNAL MODULE: ./node_modules/_lodash-es@4.17.21@lodash-es/_baseKeys.js + 1 modules
+var _baseKeys = __webpack_require__(130);
+// EXTERNAL MODULE: ./node_modules/_lodash-es@4.17.21@lodash-es/_getTag.js + 4 modules
+var _getTag = __webpack_require__(3288);
+// EXTERNAL MODULE: ./node_modules/_lodash-es@4.17.21@lodash-es/isArguments.js + 1 modules
+var isArguments = __webpack_require__(8519);
+// EXTERNAL MODULE: ./node_modules/_lodash-es@4.17.21@lodash-es/isArray.js
+var isArray = __webpack_require__(3315);
+// EXTERNAL MODULE: ./node_modules/_lodash-es@4.17.21@lodash-es/isArrayLike.js
+var isArrayLike = __webpack_require__(3047);
+// EXTERNAL MODULE: ./node_modules/_lodash-es@4.17.21@lodash-es/isBuffer.js + 1 modules
+var isBuffer = __webpack_require__(3156);
+// EXTERNAL MODULE: ./node_modules/_lodash-es@4.17.21@lodash-es/_isPrototype.js
+var _isPrototype = __webpack_require__(3866);
+// EXTERNAL MODULE: ./node_modules/_lodash-es@4.17.21@lodash-es/isTypedArray.js + 1 modules
+var isTypedArray = __webpack_require__(8166);
+;// 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 */.Z)(value) &&
+      ((0,isArray/* default */.Z)(value) || typeof value == 'string' || typeof value.splice == 'function' ||
+        (0,isBuffer/* default */.Z)(value) || (0,isTypedArray/* default */.Z)(value) || (0,isArguments/* default */.Z)(value))) {
+    return !value.length;
+  }
+  var tag = (0,_getTag/* default */.Z)(value);
+  if (tag == mapTag || tag == setTag) {
+    return !value.size;
+  }
+  if ((0,_isPrototype/* default */.Z)(value)) {
+    return !(0,_baseKeys/* default */.Z)(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__(3823);
+;// 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 */.Z)(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 */.s7;
+      if (this.listMixinHttpType !== 'get') func = manage/* postAction */.SI;
+      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 */.Z)(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 */.mn)(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 */.mn)(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 */.zd)(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;
+    }
+  }
+};
 ;// 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.10.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/common/Modals/selectSysDict.vue?vue&type=script&lang=js&
 
 /* harmony default export */ const selectSysDictvue_type_script_lang_js_ = ({
   name: "selectSysDict",
-  mixins: [JeecgListMixin/* JeecgListMixin */.Q],
+  mixins: [JeecgListMixinV2_JeecgListMixin],
   props: {
     widget: {
       type: Object,
@@ -86943,7 +87439,7 @@ var selectSysDictvue_type_template_id_6fd9fc0a_scoped_true_staticRenderFns = []
     return {
       visible: false,
       url: {
-        list: "/sys/dict/list"
+        list: "/sys/dict/queryList"
       },
       queryParam: {},
       expandedRowKeys: [],
@@ -86969,9 +87465,13 @@ var selectSysDictvue_type_template_id_6fd9fc0a_scoped_true_staticRenderFns = []
     },
     handleSelect() {
       var _this$selectionRows;
-      if (!((_this$selectionRows = this.selectionRows) !== null && _this$selectionRows !== void 0 && _this$selectionRows.length)) this.$message.warn('请选择一条数据');
+      if (!((_this$selectionRows = this.selectionRows) !== null && _this$selectionRows !== void 0 && _this$selectionRows.length)) return this.$message.warn('请选择一条数据');
       this.widget.options.dictName = this.selectedRowKeys[0];
       this.modalCancel();
+    },
+    modalCancel() {
+      this.queryParam = {};
+      this.visible = false;
     }
   }
 });
@@ -86987,26 +87487,26 @@ var selectSysDictvue_type_template_id_6fd9fc0a_scoped_true_staticRenderFns = []
 ;
 var selectSysDict_component = (0,componentNormalizer/* default */.Z)(
   Modals_selectSysDictvue_type_script_lang_js_,
-  selectSysDictvue_type_template_id_6fd9fc0a_scoped_true_render,
-  selectSysDictvue_type_template_id_6fd9fc0a_scoped_true_staticRenderFns,
+  selectSysDictvue_type_template_id_0579658d_scoped_true_render,
+  selectSysDictvue_type_template_id_0579658d_scoped_true_staticRenderFns,
   false,
   null,
-  "6fd9fc0a",
+  "0579658d",
   null
   
 )
 
 /* harmony default export */ const selectSysDict = (selectSysDict_component.exports);
-;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.10.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.10.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/CascaderSelect/components/selectClassifyDict.vue?vue&type=template&id=6430cbe8&scoped=true&
-var selectClassifyDictvue_type_template_id_6430cbe8_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_6430cbe8_scoped_true_staticRenderFns = []
+;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.10.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.10.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/_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.10.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: [JeecgListMixin/* JeecgListMixin */.Q],
+  mixins: [JeecgListMixinV2_JeecgListMixin],
   props: {
     widget: {
       type: Object,
@@ -87045,7 +87545,7 @@ var selectClassifyDictvue_type_template_id_6430cbe8_scoped_true_staticRenderFns
     },
     handleSelect(record) {
       var _this$selectionRows;
-      if (!((_this$selectionRows = this.selectionRows) !== null && _this$selectionRows !== void 0 && _this$selectionRows.length)) this.$message.warn('请选择一条数据');
+      if (!((_this$selectionRows = this.selectionRows) !== null && _this$selectionRows !== void 0 && _this$selectionRows.length)) return this.$message.warn('请选择一条数据');
       this.$set(this.widget.options, 'code', this.selectedRowKeys[0]);
       this.visible = false;
     }
@@ -87063,11 +87563,11 @@ var selectClassifyDictvue_type_template_id_6430cbe8_scoped_true_staticRenderFns
 ;
 var selectClassifyDict_component = (0,componentNormalizer/* default */.Z)(
   components_selectClassifyDictvue_type_script_lang_js_,
-  selectClassifyDictvue_type_template_id_6430cbe8_scoped_true_render,
-  selectClassifyDictvue_type_template_id_6430cbe8_scoped_true_staticRenderFns,
+  selectClassifyDictvue_type_template_id_6a916818_scoped_true_render,
+  selectClassifyDictvue_type_template_id_6a916818_scoped_true_staticRenderFns,
   false,
   null,
-  "6430cbe8",
+  "6a916818",
   null
   
 )
@@ -87505,10 +88005,6 @@ var componentvue_type_template_id_734262fe_scoped_true_staticRenderFns = []
 var es_array_reduce = __webpack_require__(5444);
 // EXTERNAL MODULE: ./src/components/MessageBox/confirmBox.vue + 3 modules
 var confirmBox = __webpack_require__(5276);
-// EXTERNAL MODULE: ./node_modules/_lodash-es@4.17.21@lodash-es/cloneDeep.js + 29 modules
-var cloneDeep = __webpack_require__(3823);
-// EXTERNAL MODULE: ./src/utils/util.js
-var util = __webpack_require__(4948);
 ;// 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.10.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/Table/component.vue?vue&type=script&lang=js&
 
 
@@ -97934,7 +98430,7 @@ var componentvue_type_template_id_5b813936_scoped_true_staticRenderFns = []
 
 
 // EXTERNAL MODULE: ./src/form/modules/common/Modals/selectUserModal.vue + 5 modules
-var selectUserModal = __webpack_require__(9764);
+var selectUserModal = __webpack_require__(5994);
 ;// 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.10.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/UserSelector/component.vue?vue&type=script&lang=js&
 
 //
@@ -98636,485 +99132,11 @@ var userLinkage_component = (0,componentNormalizer/* default */.Z)(
 )
 
 /* harmony default export */ const userLinkage = (userLinkage_component.exports);
-;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.10.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.10.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/common/Modals/listCommonModal.vue?vue&type=template&id=142d4dce&scoped=true&
-var listCommonModalvue_type_template_id_142d4dce_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{on:{"click":_vm.init,"mousedown":function($event){$event.preventDefault();return (function () {}).apply(null, arguments)}}},[_c('a-input',{staticStyle:{"width":"100%"},attrs:{"placeholder":_vm.placeholder,"read-only":""},model:{value:(_vm.modelStr),callback:function ($$v) {_vm.modelStr=$$v},expression:"modelStr"}},[_c('a-icon',{attrs:{"slot":"prefix","type":"setting","title":"选择"},slot:"prefix"}),(_vm.modelStr)?_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"}):_vm._e()],1),_c('a-modal',{attrs:{"title":_vm.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-form',{on:{"submit":function($event){$event.preventDefault();return _vm.searchQuery.apply(null, arguments)}}},[_vm._t("default",null,{"queryParam":_vm.queryParam})],2),_c('a-button',{attrs:{"type":"primary"},on:{"click":function($event){return _vm.searchQuery()}}},[_vm._v("搜索")])],1),_c('a-table',{ref:"table",attrs:{"rowKey":_vm.rowKey,"size":"middle","columns":_vm.columns,"dataSource":_vm.dataSource,"pagination":_vm.ipagination,"row-selection":_vm.rowSelection,"loading":_vm.loading},on:{"change":_vm.handleTableChange}})],1)],1)}
-var listCommonModalvue_type_template_id_142d4dce_scoped_true_staticRenderFns = []
+;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.10.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.10.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/common/Modals/listCommonModal.vue?vue&type=template&id=525b4c71&scoped=true&
+var listCommonModalvue_type_template_id_525b4c71_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{on:{"click":_vm.init,"mousedown":function($event){$event.preventDefault();return (function () {}).apply(null, arguments)}}},[_c('a-input',{staticStyle:{"width":"100%"},attrs:{"placeholder":_vm.placeholder,"read-only":""},model:{value:(_vm.modelStr),callback:function ($$v) {_vm.modelStr=$$v},expression:"modelStr"}},[_c('a-icon',{attrs:{"slot":"prefix","type":"setting","title":"选择"},slot:"prefix"}),(_vm.modelStr)?_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"}):_vm._e()],1),_c('a-modal',{attrs:{"title":_vm.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-form',{on:{"submit":function($event){$event.preventDefault();return _vm.searchQuery.apply(null, arguments)}}},[_vm._t("default",null,{"queryParam":_vm.queryParam})],2),_c('a-button',{attrs:{"type":"primary"},on:{"click":function($event){return _vm.searchQuery()}}},[_vm._v("搜索")])],1),_c('a-table',{ref:"table",attrs:{"rowKey":_vm.rowKey,"size":"middle","columns":_vm.columns,"dataSource":_vm.dataSource,"pagination":_vm.ipagination,"row-selection":_vm.rowSelection,"loading":_vm.loading},on:{"change":_vm.handleTableChange}})],1)],1)}
+var listCommonModalvue_type_template_id_525b4c71_scoped_true_staticRenderFns = []
 
 
-// EXTERNAL MODULE: ./node_modules/_lodash-es@4.17.21@lodash-es/_baseKeys.js + 1 modules
-var _baseKeys = __webpack_require__(130);
-// EXTERNAL MODULE: ./node_modules/_lodash-es@4.17.21@lodash-es/_getTag.js + 4 modules
-var _getTag = __webpack_require__(3288);
-// EXTERNAL MODULE: ./node_modules/_lodash-es@4.17.21@lodash-es/isArguments.js + 1 modules
-var isArguments = __webpack_require__(8519);
-// EXTERNAL MODULE: ./node_modules/_lodash-es@4.17.21@lodash-es/isArray.js
-var isArray = __webpack_require__(3315);
-// EXTERNAL MODULE: ./node_modules/_lodash-es@4.17.21@lodash-es/isArrayLike.js
-var isArrayLike = __webpack_require__(3047);
-// EXTERNAL MODULE: ./node_modules/_lodash-es@4.17.21@lodash-es/isBuffer.js + 1 modules
-var isBuffer = __webpack_require__(3156);
-// EXTERNAL MODULE: ./node_modules/_lodash-es@4.17.21@lodash-es/_isPrototype.js
-var _isPrototype = __webpack_require__(3866);
-// EXTERNAL MODULE: ./node_modules/_lodash-es@4.17.21@lodash-es/isTypedArray.js + 1 modules
-var isTypedArray = __webpack_require__(8166);
-;// 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 */.Z)(value) &&
-      ((0,isArray/* default */.Z)(value) || typeof value == 'string' || typeof value.splice == 'function' ||
-        (0,isBuffer/* default */.Z)(value) || (0,isTypedArray/* default */.Z)(value) || (0,isArguments/* default */.Z)(value))) {
-    return !value.length;
-  }
-  var tag = (0,_getTag/* default */.Z)(value);
-  if (tag == mapTag || tag == setTag) {
-    return !value.size;
-  }
-  if ((0,_isPrototype/* default */.Z)(value)) {
-    return !(0,_baseKeys/* default */.Z)(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);
-
-;// 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 */.Z)(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 */.s7;
-      if (this.listMixinHttpType !== 'get') func = manage/* postAction */.SI;
-      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 */.Z)(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 */.mn)(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 */.mn)(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 */.zd)(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;
-    }
-  }
-};
 ;// 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.10.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/common/Modals/listCommonModal.vue?vue&type=script&lang=js&
 
 
@@ -99236,7 +99258,7 @@ const JeecgListMixinV2_JeecgListMixin = {
     },
     handleSelect() {
       var _this$selectionRowsDa;
-      if (!((_this$selectionRowsDa = this.selectionRowsData) !== null && _this$selectionRowsDa !== void 0 && _this$selectionRowsDa.length)) this.$message.warn('请选择一条数据');
+      if (!((_this$selectionRowsDa = this.selectionRowsData) !== null && _this$selectionRowsDa !== void 0 && _this$selectionRowsDa.length)) return this.$message.warn('请选择一条数据');
       this.$emit('ok', this.rowSelection.selectedRowKeys, this.selectionRowsData);
       this.modalCancel();
     },
@@ -99259,11 +99281,11 @@ const JeecgListMixinV2_JeecgListMixin = {
 ;
 var listCommonModal_component = (0,componentNormalizer/* default */.Z)(
   Modals_listCommonModalvue_type_script_lang_js_,
-  listCommonModalvue_type_template_id_142d4dce_scoped_true_render,
-  listCommonModalvue_type_template_id_142d4dce_scoped_true_staticRenderFns,
+  listCommonModalvue_type_template_id_525b4c71_scoped_true_render,
+  listCommonModalvue_type_template_id_525b4c71_scoped_true_staticRenderFns,
   false,
   null,
-  "142d4dce",
+  "525b4c71",
   null
   
 )
@@ -123408,9 +123430,9 @@ return [_c('a-input',{attrs:{"placeholder":"应用名称"},model:{value:(queryPa
 var selectAppModalvue_type_template_id_43d62e6f_scoped_true_staticRenderFns = []
 
 
-;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.10.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.10.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/workflowApp/component/AuthorityModal.vue?vue&type=template&id=8c66cbfe&
-var AuthorityModalvue_type_template_id_8c66cbfe_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[_c('a-modal',{attrs:{"title":_vm.title,"width":"800px","wrapClassName":"cus-modal-warp","visible":_vm.visible,"destroyOnClose":true,"footer":null},on:{"cancel":_vm.handleModalCancel}},[_c('a-button',{staticStyle:{"margin":"-10px 0 10px 0"},attrs:{"type":"primary"},on:{"click":_vm.handleAdd}},[_vm._v("权限配置")]),_c('a-table',{attrs:{"columns":_vm.columns,"data-source":_vm.dataSource},scopedSlots:_vm._u([{key:"action",fn:function(text, record, idx){return _c('span',{},[_c('a-popconfirm',{attrs:{"title":"确定要删除吗？","ok-text":"确定","cancel-text":"取消","overlayStyle":{width: '200px'}},on:{"confirm":function($event){return _vm.handledelete(idx)}}},[_c('a',{attrs:{"href":"#"}},[_vm._v("删除")])])],1)}}])})],1),_c('authorModal',{ref:"authorModal",on:{"ok":_vm.ok}})],1)}
-var AuthorityModalvue_type_template_id_8c66cbfe_staticRenderFns = []
+;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.10.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.10.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/workflowApp/component/AuthorityModal.vue?vue&type=template&id=0f0fbe0b&
+var AuthorityModalvue_type_template_id_0f0fbe0b_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[_c('a-modal',{attrs:{"title":_vm.title,"width":"800px","wrapClassName":"cus-modal-warp","visible":_vm.visible,"destroyOnClose":true,"footer":null},on:{"cancel":_vm.handleModalCancel}},[_c('a-button',{staticStyle:{"margin":"-10px 0 10px 0"},attrs:{"type":"primary"},on:{"click":_vm.handleAdd}},[_vm._v("权限配置")]),_c('a-table',{attrs:{"columns":_vm.columns,"data-source":_vm.dataSource},scopedSlots:_vm._u([{key:"action",fn:function(text, record, idx){return _c('span',{},[_c('a-popconfirm',{attrs:{"title":"确定要删除吗？","ok-text":"确定","cancel-text":"取消","overlayStyle":{width: '200px'}},on:{"confirm":function($event){return _vm.handledelete(idx,record)}}},[_c('a',{attrs:{"href":"#"}},[_vm._v("删除")])])],1)}}])})],1),_c('authorModal',{ref:"authorModal",on:{"ok":_vm.ok}})],1)}
+var AuthorityModalvue_type_template_id_0f0fbe0b_staticRenderFns = []
 
 
 ;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.10.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.10.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/workflowApp/component/authorModal.vue?vue&type=template&id=709355dd&scoped=true&
@@ -123705,10 +123727,12 @@ var authorModal_component = (0,componentNormalizer/* default */.Z)(
     ok(record) {
       this.dataSource.push(record);
     },
-    handledelete(index) {
-      console.log(index);
-      this.dataSource.splice(index, 1);
+    handledelete(index, record) {
+      console.log(index, record);
+      this.dataSource = this.dataSource.filter(item => item.roleId !== record.roleId);
+      // this.dataSource.splice(index, 1)
     },
+
     handleAdd() {
       this.$refs.authorModal.init(this.widget.options.appId, this.widget.options.auth.map(item => item.roleId));
     },
@@ -123729,8 +123753,8 @@ var authorModal_component = (0,componentNormalizer/* default */.Z)(
 ;
 var AuthorityModal_component = (0,componentNormalizer/* default */.Z)(
   component_AuthorityModalvue_type_script_lang_js_,
-  AuthorityModalvue_type_template_id_8c66cbfe_render,
-  AuthorityModalvue_type_template_id_8c66cbfe_staticRenderFns,
+  AuthorityModalvue_type_template_id_0f0fbe0b_render,
+  AuthorityModalvue_type_template_id_0f0fbe0b_staticRenderFns,
   false,
   null,
   null,
@@ -148632,7 +148656,7 @@ var staticRenderFns = []
 
 
 // EXTERNAL MODULE: ./src/form/modules/components/index.js + 954 modules
-var components = __webpack_require__(423);
+var components = __webpack_require__(895);
 ;// 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.10.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/common/Modals/CorrectionItem.vue?vue&type=script&lang=js&
 //
 //
@@ -149084,7 +149108,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 9764:
+/***/ 5994:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
@@ -149094,12 +149118,12 @@ __webpack_require__.d(__webpack_exports__, {
   "Z": () => (/* binding */ selectUserModal)
 });
 
-;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.10.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.10.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/common/Modals/selectUserModal.vue?vue&type=template&id=7935a737&scoped=true&
+;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.10.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.10.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/common/Modals/selectUserModal.vue?vue&type=template&id=143fb95d&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) {
                     return triggerNode.parentNode || _vm.document.body;
-                  }},model:{value:(_vm.queryParam.roleId),callback:function ($$v) {_vm.$set(_vm.queryParam, "roleId", $$v)},expression:"queryParam.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',{attrs:{"md":6,"sm":6}},[_c('a-form-item',{staticStyle:{"width":"100%"}},[_c('a-select',{staticStyle:{"width":"100%"},attrs:{"placeholder":"请选择部门","dropdown-style":{ maxHeight: '400px',zIndex: 1100000 }},model:{value:(_vm.queryParam.depId),callback:function ($$v) {_vm.$set(_vm.queryParam, "depId", $$v)},expression:"queryParam.depId"}},_vm._l((_vm.tagDeparts),function(depart){return _c('a-select-option',{attrs:{"value":depart.departId,"title":depart.departName}},[_vm._v(_vm._s(depart.departName))])}),1)],1)],1)],_c('a-col',{attrs:{"md":6,"sm":6}},[_c('a-form-item',[_c('a-input',{attrs:{"placeholder":"用户名/真实姓名查询"},model:{value:(_vm.queryParam.realname),callback:function ($$v) {_vm.$set(_vm.queryParam, "realname", $$v)},expression:"queryParam.realname"}})],1)],1),_c('a-col',{attrs:{"md":6,"sm":6}},[_c('div',{staticClass:"table-page-search-submitButtons",staticStyle:{"height":"40px","overflow":"hidden"}},[_c('a-button',{attrs:{"type":"primary","icon":"search"},on:{"click":_vm.searchQuery}},[_vm._v("查询")])],1)])],2)],1)],1),_c('div',[_c('a-table',{ref:"table",attrs:{"bordered":"","size":"middle","rowKey":"id","columns":_vm.columns,"dataSource":_vm.dataSource,"pagination":_vm.ipagination,"loading":_vm.loading,"rowSelection":_vm.rowSelection,"customRow":_vm.handleCustomRow},on:{"change":_vm.handleTableChange}})],1)])],1)],1)}
+                  }},model:{value:(_vm.queryParam.roleId),callback:function ($$v) {_vm.$set(_vm.queryParam, "roleId", $$v)},expression:"queryParam.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',{attrs:{"md":6,"sm":6}},[_c('a-form-item',{staticStyle:{"width":"100%"}},[_c('a-select',{staticStyle:{"width":"100%"},attrs:{"placeholder":"请选择部门","allow-clear":"","dropdown-style":{ maxHeight: '400px',zIndex: 1100000 }},model:{value:(_vm.queryParam.depId),callback:function ($$v) {_vm.$set(_vm.queryParam, "depId", $$v)},expression:"queryParam.depId"}},_vm._l((_vm.tagDeparts),function(depart){return _c('a-select-option',{attrs:{"value":depart.departId,"title":depart.departName}},[_vm._v(_vm._s(depart.departName))])}),1)],1)],1)],_c('a-col',{attrs:{"md":6,"sm":6}},[_c('a-form-item',[_c('a-input',{attrs:{"placeholder":"用户名/真实姓名查询"},model:{value:(_vm.queryParam.realname),callback:function ($$v) {_vm.$set(_vm.queryParam, "realname", $$v)},expression:"queryParam.realname"}})],1)],1),_c('a-col',{attrs:{"md":6,"sm":6}},[_c('div',{staticClass:"table-page-search-submitButtons",staticStyle:{"height":"40px","overflow":"hidden"}},[_c('a-button',{attrs:{"type":"primary","icon":"search"},on:{"click":_vm.searchQuery}},[_vm._v("查询")])],1)])],2)],1)],1),_c('div',[_c('a-table',{ref:"table",attrs:{"bordered":"","size":"middle","rowKey":"id","columns":_vm.columns,"dataSource":_vm.dataSource,"pagination":_vm.ipagination,"loading":_vm.loading,"rowSelection":_vm.rowSelection,"customRow":_vm.handleCustomRow},on:{"change":_vm.handleTableChange}})],1)])],1)],1)}
 var staticRenderFns = []
 
 
@@ -149111,6 +149135,8 @@ var manage = __webpack_require__(1474);
 var JeecgListMixin = __webpack_require__(9013);
 // EXTERNAL MODULE: ./src/api/api.js
 var api = __webpack_require__(3558);
+// EXTERNAL MODULE: ./node_modules/_lodash@4.17.21@lodash/lodash.js
+var lodash = __webpack_require__(9392);
 ;// 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.10.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/common/Modals/selectUserModal.vue?vue&type=script&lang=js&
 
 //
@@ -149227,6 +149253,8 @@ var api = __webpack_require__(3558);
 //
 //
 //
+//
+
 
 
 
@@ -149296,7 +149324,8 @@ var api = __webpack_require__(3558);
         importExcelUrl: 'sys/user/importExcel'
       },
       tagDeparts: [],
-      deptId: ''
+      deptId: '',
+      needSearch: true
     };
   },
   created() {
@@ -149304,6 +149333,7 @@ var api = __webpack_require__(3558);
     this.queryParam.depId = this.deptId;
     this.queryParam.applyId = this.applyId || undefined;
     this.queryParam.tagId = this.tagId;
+    this.userSearch = (0,lodash.cloneDeep)(this.queryParam);
     this.loadData(false, 'first');
     this.loadDepartTree();
     this.setDefaultUser();
@@ -149337,6 +149367,7 @@ var api = __webpack_require__(3558);
       }
       if (this.role) {
         this.queryParam.roleId = this.role;
+        this.userSearch.roleId = this.role;
       }
       let params = this.getQueryParams(); //查询条件
       this.loading = true;
@@ -149348,6 +149379,7 @@ var api = __webpack_require__(3558);
             debugger;
             this.deptId = res.result.params.depId;
             this.queryParam.depId = this.deptId;
+            this.userSearch.depId = this.role;
             this.treechange(this.deptId);
           }
         }
@@ -149363,7 +149395,9 @@ var api = __webpack_require__(3558);
     },
     getTagDepart() {
       this.tagDeparts = [];
-      (0,manage/* getAction */.s7)("/zhxymatrix/user/listTagDeparts").then(res => {
+      (0,manage/* getAction */.s7)("/zhxymatrix/user/listDepartsByTagId", {
+        tagId: this.tagId
+      }).then(res => {
         if (res.success) {
           this.tagDeparts = res.result || [];
         }
@@ -149622,10 +149656,10 @@ var api = __webpack_require__(3558);
 });
 ;// 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.7.5@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/_css-loader@6.7.3@css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/_vue-loader@15.10.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.10.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/common/Modals/selectUserModal.vue?vue&type=style&index=0&id=7935a737&prod&scoped=true&lang=css&
+;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.7.5@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/_css-loader@6.7.3@css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/_vue-loader@15.10.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.10.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&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/form/modules/common/Modals/selectUserModal.vue?vue&type=style&index=0&id=7935a737&prod&scoped=true&lang=css&
+;// CONCATENATED MODULE: ./src/form/modules/common/Modals/selectUserModal.vue?vue&type=style&index=0&id=143fb95d&prod&scoped=true&lang=css&
 
 // EXTERNAL MODULE: ./node_modules/_vue-loader@15.10.1@vue-loader/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(8412);
@@ -149644,7 +149678,7 @@ var component = (0,componentNormalizer/* default */.Z)(
   staticRenderFns,
   false,
   null,
-  "7935a737",
+  "143fb95d",
   null
   
 )
@@ -150663,7 +150697,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /* harmony default export */ const CorrectionModal = (component.exports);
 // EXTERNAL MODULE: ./src/form/modules/components/index.js + 954 modules
-var components = __webpack_require__(423);
+var components = __webpack_require__(895);
 // EXTERNAL MODULE: ./node_modules/_pubsub-js@1.9.4@pubsub-js/src/pubsub.js
 var pubsub = __webpack_require__(2980);
 var pubsub_default = /*#__PURE__*/__webpack_require__.n(pubsub);
@@ -151816,7 +151850,7 @@ var vuedraggable_umd_default = /*#__PURE__*/__webpack_require__.n(vuedraggable_u
 // EXTERNAL MODULE: ./src/api/manage.js
 var manage = __webpack_require__(1474);
 // EXTERNAL MODULE: ./src/form/modules/components/index.js + 954 modules
-var components = __webpack_require__(423);
+var components = __webpack_require__(895);
 // EXTERNAL MODULE: ./src/form/util/Bus.js
 var Bus = __webpack_require__(767);
 // EXTERNAL MODULE: ./src/form/modules/config/hnkj.js
@@ -162488,7 +162522,7 @@ function toString(value) {
 /***/ ((module) => {
 
 "use strict";
-module.exports = {"i8":"1.1.438"};
+module.exports = {"i8":"1.1.439"};
 
 /***/ })
 
@@ -176977,7 +177011,7 @@ var es_array_sort = __webpack_require__(8284);
 // EXTERNAL MODULE: ./src/form/util/util.js
 var util_util = __webpack_require__(6955);
 // EXTERNAL MODULE: ./src/form/modules/components/index.js + 954 modules
-var components = __webpack_require__(423);
+var components = __webpack_require__(895);
 // EXTERNAL MODULE: ./src/form/modules/widgetFormItem.vue + 6 modules
 var widgetFormItem = __webpack_require__(1765);
 // EXTERNAL MODULE: ./src/form/modules/WidgetIdeaSignItem.vue + 5 modules
@@ -179551,7 +179585,7 @@ var toLinkageWidget_component = (0,componentNormalizer/* default */.Z)(
 // EXTERNAL MODULE: ./src/form/modules/common/querySelectDict.vue + 3 modules
 var querySelectDict = __webpack_require__(7813);
 // EXTERNAL MODULE: ./src/form/modules/common/Modals/selectUserModal.vue + 5 modules
-var selectUserModal = __webpack_require__(9764);
+var selectUserModal = __webpack_require__(5994);
 ;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.10.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.10.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 = []