@zscreate/form-component 1.1.130 → 1.1.131

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -63497,7 +63497,7 @@ module.exports = /******/function (modules) {
63497
63497
  /* harmony import */ var _util_mathUtils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(38);
63498
63498
  /* harmony import */ var _util_util__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(6955);
63499
63499
  /* harmony import */ var _layoutItem__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(2376);
63500
- /* harmony import */ var _components_index__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(8633);
63500
+ /* harmony import */ var _components_index__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(6413);
63501
63501
  /* harmony import */ var pubsub_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(9616);
63502
63502
  /* harmony import */ var pubsub_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(pubsub_js__WEBPACK_IMPORTED_MODULE_4__);
63503
63503
  /* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(7203);
@@ -67888,7 +67888,7 @@ module.exports = {
67888
67888
 
67889
67889
  /***/ }),
67890
67890
 
67891
- /***/ 8633:
67891
+ /***/ 6413:
67892
67892
  /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
67893
67893
 
67894
67894
  "use strict";
@@ -80734,13 +80734,13 @@ var componentvue_type_template_id_73d07957_scoped_true_render = function () {var
80734
80734
  var componentvue_type_template_id_73d07957_scoped_true_staticRenderFns = []
80735
80735
 
80736
80736
 
80737
- ;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.10.2@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.10.2@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/common/Modals/selectUserModal.vue?vue&type=template&id=66ebf12a&scoped=true&
80738
- var selectUserModalvue_type_template_id_66ebf12a_scoped_true_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}},[_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) {
80737
+ ;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.10.2@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.10.2@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/common/Modals/selectUserModal.vue?vue&type=template&id=44bb5b82&scoped=true&
80738
+ var selectUserModalvue_type_template_id_44bb5b82_scoped_true_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}},[_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) {
80739
80739
  return triggerNode.parentNode || _vm.document.body;
80740
80740
  },"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) {
80741
80741
  return triggerNode.parentNode || _vm.document.body;
80742
80742
  }},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',[_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('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("查询")])],1)])],1)],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},on:{"change":_vm.handleTableChange}})],1)])],1)],1)}
80743
- var selectUserModalvue_type_template_id_66ebf12a_scoped_true_staticRenderFns = []
80743
+ var selectUserModalvue_type_template_id_44bb5b82_scoped_true_staticRenderFns = []
80744
80744
 
80745
80745
 
80746
80746
  // EXTERNAL MODULE: ./node_modules/_core-js@3.32.1@core-js/modules/web.url-search-params.delete.js
@@ -81216,9 +81216,9 @@ const JeecgListMixin = {
81216
81216
  selectedRowKeys: [],
81217
81217
  rowSelection: {
81218
81218
  selectedRowKeys: this.selectedRowKeys,
81219
- onChange: this.onSelectChange,
81220
- type: this.multi ? "checkbox" : "radio",
81221
- onSelect: this.onSelectOption
81219
+ // onChange: this.onSelectChange,
81220
+
81221
+ type: this.multi ? "checkbox" : "radio"
81222
81222
  },
81223
81223
  columns: [{
81224
81224
  title: "用户名",
@@ -81347,30 +81347,70 @@ const JeecgListMixin = {
81347
81347
  });
81348
81348
  } else {
81349
81349
  this.selectionRowsData = [];
81350
- // this.selectedRowKeys = []
81351
- this.rowSelection = {
81352
- selectedRowKeys: [],
81353
- onChange: this.onSelectChange,
81354
- type: this.multi ? "checkbox" : "radio",
81355
- onSelect: this.onSelectOption
81356
- };
81357
- return false;
81358
81350
  }
81359
81351
  // console.log(selectedRowKeys)
81360
81352
  this.rowSelection = {
81361
- onChange: this.onSelectChange,
81353
+ // onChange: this.onSelectChange,
81362
81354
  type: this.multi ? "checkbox" : "radio",
81363
- onSelect: this.onSelectOption,
81364
81355
  selectedRowKeys: selectedRowKeys,
81365
- getCheckboxProps: record => {
81366
- return {
81367
- props: {
81368
- defaultChecked: selectedRowKeys.includes(record.id)
81356
+ onSelect: (record, selected, selectedRows, nativeEvent) => {
81357
+ // console.log(record, selected, selectedRows, nativeEvent)
81358
+ const list = this.selectionRowsData;
81359
+ const selectedRowKeys = this.rowSelection.selectedRowKeys;
81360
+ if (!selected) {
81361
+ // 这里是取消勾选,删除对应的数组项
81362
+ selectedRowKeys.map((x, item) => {
81363
+ if (x === record.id) {
81364
+ selectedRowKeys.splice(item, 1);
81365
+ }
81366
+ });
81367
+ list.map((x, item) => {
81368
+ if (x === record.id) {
81369
+ list.splice(item, 1);
81370
+ }
81371
+ });
81372
+ console.log(this.rowSelection.selectedRowKeys);
81373
+ }
81374
+ if (selected) {
81375
+ if (!this.multi) {
81376
+ this.rowSelection.selectedRowKeys = [record.id];
81377
+ this.selectionRowsData = [record];
81378
+ return;
81369
81379
  }
81370
- };
81380
+
81381
+ // 这里是点击勾选,添加workerId字段到selectedRowKeys数组里
81382
+ this.rowSelection.selectedRowKeys.push(record.id);
81383
+ console.log(this.rowSelection.selectedRowKeys);
81384
+ list.push(record);
81385
+ }
81386
+ },
81387
+ //全选
81388
+ onSelectAll: (selected, selectedRows, changeRows) => {
81389
+ if (selected) {
81390
+ changeRows.map(x => {
81391
+ if (!this.rowSelection.selectedRowKeys.includes(x.id)) {
81392
+ this.rowSelection.selectedRowKeys.push(x.id);
81393
+ this.selectionRowsData.push(x);
81394
+ }
81395
+ });
81396
+ }
81397
+ if (!selected) {
81398
+ const removeKey = changeRows.map(item => item.id);
81399
+ this.selectedRowKeys = this.selectedRowKeys.filter(item => !removeKey.includes(item));
81400
+ this.selectionRowsData = this.selectionRowsData.filter(item => !removeKey.includes(item.id));
81401
+ this.$set(this.rowSelection, 'selectedRowKeys', this.selectedRowKeys);
81402
+ }
81371
81403
  }
81404
+ // getCheckboxProps: (record) => {
81405
+ // return {
81406
+ // props: {
81407
+ // defaultChecked: selectedRowKeys.includes(record.id),
81408
+ // },
81409
+ // };
81410
+ // },
81372
81411
  };
81373
81412
  },
81413
+
81374
81414
  loadDepartTree() {
81375
81415
  const that = this;
81376
81416
  queryDepartTreeList().then(res => {
@@ -81389,7 +81429,7 @@ const JeecgListMixin = {
81389
81429
  //this.loadDepartTree();
81390
81430
  this.checkedRows = [];
81391
81431
  this.rowSelection.selectedRowKeys = select;
81392
- this.selectionRowsData = this.selectionRows = item;
81432
+ this.selectionRowsData = item;
81393
81433
  if (this.defaultDepartId) {
81394
81434
  this.queryParam.depId = this.defaultDepartId;
81395
81435
  this.treechange(this.defaultDepartId);
@@ -81420,19 +81460,15 @@ const JeecgListMixin = {
81420
81460
  if (!this.selectedRowKeys || this.selectedRowKeys.length == 0) {
81421
81461
  this.$emit("ok", "");
81422
81462
  } else {
81423
- if (!this.multi) {
81424
- this.$emit("ok", this.selectionRows, this.selectedRowKeys.join(","));
81425
- } else {
81426
- this.$emit("ok", this.selectionRowsData, this.selectedRowKeys.join(","));
81427
- }
81463
+ this.$emit("ok", this.selectionRowsData, this.selectedRowKeys.join(","));
81428
81464
  }
81429
81465
  this.handleClear();
81430
81466
  },
81431
81467
  //onSelectChange
81432
- onSelectChange(selectedRowKeys, selectionRows) {
81433
- this.rowSelection.selectedRowKeys = Array.from(new Set(selectedRowKeys));
81434
- this.selectionRowsData = this.selectionRows = [...selectionRows];
81435
- },
81468
+ // onSelectChange(selectedRowKeys, selectionRows) {
81469
+ // this.rowSelection.selectedRowKeys = Array.from(new Set(selectedRowKeys));
81470
+ // this.selectionRowsData = this.selectionRows = [...selectionRows];
81471
+ // },
81436
81472
  // //选中或者取消某一项时
81437
81473
  // onSelectOption(record, selected, selectedRows, nativeEvent) {
81438
81474
  // if (selected) {
@@ -81491,10 +81527,10 @@ const JeecgListMixin = {
81491
81527
  });
81492
81528
  ;// CONCATENATED MODULE: ./src/form/modules/common/Modals/selectUserModal.vue?vue&type=script&lang=js&
81493
81529
  /* harmony default export */ var Modals_selectUserModalvue_type_script_lang_js_ = (selectUserModalvue_type_script_lang_js_);
81494
- ;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.7.6@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/_css-loader@6.8.1@css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/_vue-loader@15.10.2@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.2@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/common/Modals/selectUserModal.vue?vue&type=style&index=0&id=66ebf12a&prod&scoped=true&lang=css&
81530
+ ;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.7.6@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/_css-loader@6.8.1@css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/_vue-loader@15.10.2@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.2@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/common/Modals/selectUserModal.vue?vue&type=style&index=0&id=44bb5b82&prod&scoped=true&lang=css&
81495
81531
  // extracted by mini-css-extract-plugin
81496
81532
 
81497
- ;// CONCATENATED MODULE: ./src/form/modules/common/Modals/selectUserModal.vue?vue&type=style&index=0&id=66ebf12a&prod&scoped=true&lang=css&
81533
+ ;// CONCATENATED MODULE: ./src/form/modules/common/Modals/selectUserModal.vue?vue&type=style&index=0&id=44bb5b82&prod&scoped=true&lang=css&
81498
81534
 
81499
81535
  ;// CONCATENATED MODULE: ./src/form/modules/common/Modals/selectUserModal.vue
81500
81536
 
@@ -81507,11 +81543,11 @@ const JeecgListMixin = {
81507
81543
 
81508
81544
  var selectUserModal_component = (0,componentNormalizer/* default */.Z)(
81509
81545
  Modals_selectUserModalvue_type_script_lang_js_,
81510
- selectUserModalvue_type_template_id_66ebf12a_scoped_true_render,
81511
- selectUserModalvue_type_template_id_66ebf12a_scoped_true_staticRenderFns,
81546
+ selectUserModalvue_type_template_id_44bb5b82_scoped_true_render,
81547
+ selectUserModalvue_type_template_id_44bb5b82_scoped_true_staticRenderFns,
81512
81548
  false,
81513
81549
  null,
81514
- "66ebf12a",
81550
+ "44bb5b82",
81515
81551
  null
81516
81552
 
81517
81553
  )
@@ -82138,13 +82174,9 @@ var componentvue_type_template_id_112ac3ac_scoped_true_render = function () {var
82138
82174
  var componentvue_type_template_id_112ac3ac_scoped_true_staticRenderFns = []
82139
82175
 
82140
82176
 
82141
- ;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.10.2@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.10.2@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/userSelectorByRole/elSelectUserByRole/elSelectUserByRoleModal.vue?vue&type=template&id=7eea8eda&scoped=true&
82142
- var elSelectUserByRoleModalvue_type_template_id_7eea8eda_scoped_true_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,"cancelText":"关闭","zIndex":20000},on:{"ok":_vm.handleSubmit,"cancel":_vm.handleCancel}},[_c('div',{staticClass:"flex-warp"},[_c('div',{staticClass:"flex-left"},[_c('a-radio-group',{on:{"change":_vm.onRadioChange},model:{value:(_vm.radioValue),callback:function ($$v) {_vm.radioValue=$$v},expression:"radioValue"}},_vm._l((_vm.rolesList),function(role,index){return _c('a-radio',{key:index,style:(_vm.radioStyle),attrs:{"value":role.id}},[_vm._v(" "+_vm._s(role.roleName)+" ")])}),1)],1),_c('div',{staticClass:"flex-right"},[_c('div',{staticClass:"ant-alert ant-alert-info",staticStyle:{"margin-bottom":"16px"}},[_c('i',{staticClass:"anticon anticon-info-circle ant-alert-icon"}),_vm._v(" 已选择 "),_c('a',{staticStyle:{"font-weight":"600"}},[_vm._v(_vm._s(_vm.selectedRowKeys.length))]),_vm._v(" 项(点击姓名移除选中状态) "),_c('a',{staticStyle:{"margin-left":"24px"},on:{"click":_vm.onClearSelectedCache}},[_vm._v("清空")]),_c('div',_vm._l((_vm.cacheSeletedRowKeys),function(i,index){return _c('a',{key:index,staticStyle:{"margin-right":"5px"},on:{"click":function($event){return _vm.deleteItem(i, index)}}},[_vm._v(_vm._s(i.realname))])}),0)]),_c('div',{staticClass:"table"},[_c('a-table',{ref:"table",attrs:{"size":"middle","bordered":"","rowKey":function (record) { return record.id; },"columns":_vm.columns,"dataSource":_vm.dataSource,"rowSelection":{
82143
- selectedRowKeys: _vm.selectedRowKeys,
82144
- onChange: _vm.onSelectChange,
82145
- type:_vm.multi == true ? 'checkbox' : 'radio'
82146
- },"pagination":_vm.ipagination,"loading":_vm.loading},on:{"change":_vm.handleTableChange}})],1)])])])}
82147
- var elSelectUserByRoleModalvue_type_template_id_7eea8eda_scoped_true_staticRenderFns = []
82177
+ ;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.10.2@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.10.2@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/userSelectorByRole/elSelectUserByRole/elSelectUserByRoleModal.vue?vue&type=template&id=b10af91a&scoped=true&
82178
+ var elSelectUserByRoleModalvue_type_template_id_b10af91a_scoped_true_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,"cancelText":"关闭","zIndex":20000},on:{"ok":_vm.handleSubmit,"cancel":_vm.handleCancel}},[_c('div',{staticClass:"flex-warp"},[_c('div',{staticClass:"flex-left"},[_c('a-radio-group',{on:{"change":_vm.onRadioChange},model:{value:(_vm.radioValue),callback:function ($$v) {_vm.radioValue=$$v},expression:"radioValue"}},_vm._l((_vm.rolesList),function(role,index){return _c('a-radio',{key:index,style:(_vm.radioStyle),attrs:{"value":role.id}},[_vm._v(" "+_vm._s(role.roleName)+" ")])}),1)],1),_c('div',{staticClass:"flex-right"},[_c('div',{staticClass:"ant-alert ant-alert-info",staticStyle:{"margin-bottom":"16px"}},[_c('i',{staticClass:"anticon anticon-info-circle ant-alert-icon"}),_vm._v(" 已选择 "),_c('a',{staticStyle:{"font-weight":"600"}},[_vm._v(_vm._s(_vm.selectedRowKeys.length))]),_vm._v(" 项(点击姓名移除选中状态) "),_c('a',{staticStyle:{"margin-left":"24px"},on:{"click":_vm.onClearSelectedCache}},[_vm._v("清空")]),_c('div',_vm._l((_vm.selectionRowsData),function(i,index){return _c('a',{key:index,staticStyle:{"margin-right":"5px"},on:{"click":function($event){return _vm.deleteItem(i, index)}}},[_vm._v(_vm._s(i.realname))])}),0)]),_c('div',{staticClass:"table"},[_c('a-table',{ref:"table",attrs:{"size":"middle","bordered":"","rowKey":function (record) { return record.id; },"columns":_vm.columns,"rowKey":"id","dataSource":_vm.dataSource,"rowSelection":_vm.rowSelection,"pagination":_vm.ipagination,"loading":_vm.loading},on:{"change":_vm.handleTableChange}})],1)])])])}
82179
+ var elSelectUserByRoleModalvue_type_template_id_b10af91a_scoped_true_staticRenderFns = []
82148
82180
 
82149
82181
 
82150
82182
  ;// 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.2@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/userSelectorByRole/elSelectUserByRole/elSelectUserByRoleModal.vue?vue&type=script&lang=js&
@@ -82212,9 +82244,6 @@ var elSelectUserByRoleModalvue_type_template_id_7eea8eda_scoped_true_staticRende
82212
82244
  //
82213
82245
  //
82214
82246
  //
82215
- //
82216
- //
82217
- //
82218
82247
 
82219
82248
 
82220
82249
 
@@ -82253,10 +82282,9 @@ var elSelectUserByRoleModalvue_type_template_id_7eea8eda_scoped_true_staticRende
82253
82282
  height: "30px",
82254
82283
  lineHeight: "30px"
82255
82284
  },
82256
- multi: "",
82257
- cacheSeletedRowKeys: [],
82258
- selectedRows: [],
82285
+ multi: false,
82259
82286
  selectedRowKeys: [],
82287
+ selectionRowsData: [],
82260
82288
  columns: [{
82261
82289
  title: "用户名",
82262
82290
  dataIndex: "username",
@@ -82281,6 +82309,16 @@ var elSelectUserByRoleModalvue_type_template_id_7eea8eda_scoped_true_staticRende
82281
82309
  },
82282
82310
  components: {},
82283
82311
  created() {},
82312
+ computed: {
82313
+ rowSelection() {
82314
+ return {
82315
+ selectedRowKeys: this.selectedRowKeys,
82316
+ onSelect: this.onSelect,
82317
+ onSelectAll: this.onSelectAll,
82318
+ type: this.multi ? 'checkbox' : 'radio'
82319
+ };
82320
+ }
82321
+ },
82284
82322
  methods: {
82285
82323
  getRolesList() {
82286
82324
  (0,manage/* getAction */.s7)("/sys/role/list", {
@@ -82294,43 +82332,61 @@ var elSelectUserByRoleModalvue_type_template_id_7eea8eda_scoped_true_staticRende
82294
82332
  }
82295
82333
  });
82296
82334
  },
82335
+ onSelect(record, selected, selectedRows, nativeEvent) {
82336
+ // console.log(record, selected, selectedRows, nativeEvent)
82337
+ const list = this.selectionRowsData;
82338
+ const selectedRowKeys = this.selectedRowKeys;
82339
+ if (!selected) {
82340
+ // 这里是取消勾选,删除对应的数组项
82341
+ selectedRowKeys.map((x, item) => {
82342
+ if (x === record.id) {
82343
+ selectedRowKeys.splice(item, 1);
82344
+ }
82345
+ });
82346
+ list.map((x, item) => {
82347
+ if (x === record.id) {
82348
+ list.splice(item, 1);
82349
+ }
82350
+ });
82351
+ console.log(this.selectedRowKeys);
82352
+ }
82353
+ if (selected) {
82354
+ if (!this.multi) {
82355
+ this.selectedRowKeys = [record.id];
82356
+ this.selectionRowsData = [record];
82357
+ return;
82358
+ }
82359
+ // 这里是点击勾选,添加workerId字段到selectedRowKeys数组里
82360
+ this.selectedRowKeys.push(record.id);
82361
+ console.log(this.selectedRowKeys);
82362
+ list.push(record);
82363
+ }
82364
+ },
82365
+ //全选
82366
+ onSelectAll(selected, selectedRows, changeRows) {
82367
+ if (selected) {
82368
+ changeRows.map(x => {
82369
+ if (!this.selectedRowKeys.includes(x.id)) {
82370
+ this.selectedRowKeys.push(x.id);
82371
+ this.selectionRowsData.push(x);
82372
+ }
82373
+ });
82374
+ }
82375
+ if (!selected) {
82376
+ const removeKey = changeRows.map(item => item.id);
82377
+ this.selectedRowKeys = this.selectedRowKeys.filter(item => !removeKey.includes(item));
82378
+ this.selectionRowsData = this.selectionRowsData.filter(item => !removeKey.includes(item.id));
82379
+ }
82380
+ },
82297
82381
  deleteItem(item, index) {
82298
- this.cacheSeletedRowKeys.splice(index, 1);
82382
+ this.selectionRowsData.splice(index, 1);
82299
82383
  this.selectedRowKeys = this.selectedRowKeys.filter(i => {
82300
82384
  return item.id != i;
82301
82385
  });
82302
82386
  },
82303
82387
  onClearSelectedCache() {
82304
- this.onClearSelected();
82305
- this.cacheSeletedRowKeys = [];
82306
- },
82307
- onSelectChange(keys, rows) {
82308
- this.addToCacheSeletedRowKeys(keys, rows);
82309
- this.selectedRowKeys = keys;
82310
- this.selectedRows = rows;
82311
- },
82312
- addToCacheSeletedRowKeys(keys, rows) {
82313
- let currentIds = []; //当前缓存中选中的ids
82314
- //过滤cacheSeletedRowKeys中 已被取消的item
82315
- currentIds = this.cacheSeletedRowKeys.map(item => {
82316
- return item.id;
82317
- });
82318
-
82319
- //增加cacheSeletedRowKeys中 未添加项的item
82320
- if (rows.length > 0) {
82321
- rows.forEach(item => {
82322
- if (!currentIds.includes(item.id)) {
82323
- currentIds.push(item.id);
82324
- this.cacheSeletedRowKeys.push(item);
82325
- }
82326
- });
82327
- }
82328
- //如果currentIds 中id 不存在与keys 则需要删除cacheSeletedRowKeys中对应的值
82329
- this.cacheSeletedRowKeys = this.cacheSeletedRowKeys.filter(item => {
82330
- if (keys.includes(item.id)) {
82331
- return item;
82332
- }
82333
- });
82388
+ this.selectedRowKeys = [];
82389
+ this.selectionRowsData = [];
82334
82390
  },
82335
82391
  onRadioChange(e) {
82336
82392
  this.queryParam.roleId = e.target.value;
@@ -82342,11 +82398,11 @@ var elSelectUserByRoleModalvue_type_template_id_7eea8eda_scoped_true_staticRende
82342
82398
  * @param {multi} Boolean //多选 单选
82343
82399
  * @param {value} Array //默认人选
82344
82400
  */
82345
- init(role, multi, value, selectedUserIds = undefined) {
82401
+ init(role, multi, value = [], selectedUserIds = undefined) {
82346
82402
  this.visible = true;
82347
82403
  this.role = role;
82348
82404
  this.multi = multi;
82349
- this.cacheSeletedRowKeys = value;
82405
+ this.selectionRowsData = value;
82350
82406
  this.queryParam.selectedUserIds = selectedUserIds;
82351
82407
  this.queryParam.depId = this.defaultDepartId;
82352
82408
  this.selectedRowKeys = value.map(item => {
@@ -82361,25 +82417,24 @@ var elSelectUserByRoleModalvue_type_template_id_7eea8eda_scoped_true_staticRende
82361
82417
  colse() {
82362
82418
  this.visible = false;
82363
82419
  this.dataSource = [];
82364
- this.cacheSeletedRowKeys = [];
82365
- this.selectedRows = [];
82366
82420
  this.selectedRowKeys = [];
82421
+ this.selectionRowsData = [];
82367
82422
  this.radioValue = "";
82368
82423
  this.ipagination.current = 1;
82369
82424
  this.queryParam.roleId = '';
82370
82425
  },
82371
82426
  handleSubmit() {
82372
- this.$emit("ok", this.cacheSeletedRowKeys);
82427
+ this.$emit("ok", this.selectionRowsData);
82373
82428
  this.colse();
82374
82429
  }
82375
82430
  }
82376
82431
  });
82377
82432
  ;// CONCATENATED MODULE: ./src/form/modules/components/userSelectorByRole/elSelectUserByRole/elSelectUserByRoleModal.vue?vue&type=script&lang=js&
82378
82433
  /* harmony default export */ var elSelectUserByRole_elSelectUserByRoleModalvue_type_script_lang_js_ = (elSelectUserByRoleModalvue_type_script_lang_js_);
82379
- ;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.7.6@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.8.1@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.10.2@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.10.2@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/userSelectorByRole/elSelectUserByRole/elSelectUserByRoleModal.vue?vue&type=style&index=0&id=7eea8eda&prod&lang=less&scoped=true&
82434
+ ;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.7.6@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.8.1@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.10.2@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.10.2@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/userSelectorByRole/elSelectUserByRole/elSelectUserByRoleModal.vue?vue&type=style&index=0&id=b10af91a&prod&lang=less&scoped=true&
82380
82435
  // extracted by mini-css-extract-plugin
82381
82436
 
82382
- ;// CONCATENATED MODULE: ./src/form/modules/components/userSelectorByRole/elSelectUserByRole/elSelectUserByRoleModal.vue?vue&type=style&index=0&id=7eea8eda&prod&lang=less&scoped=true&
82437
+ ;// CONCATENATED MODULE: ./src/form/modules/components/userSelectorByRole/elSelectUserByRole/elSelectUserByRoleModal.vue?vue&type=style&index=0&id=b10af91a&prod&lang=less&scoped=true&
82383
82438
 
82384
82439
  ;// CONCATENATED MODULE: ./src/form/modules/components/userSelectorByRole/elSelectUserByRole/elSelectUserByRoleModal.vue
82385
82440
 
@@ -82392,11 +82447,11 @@ var elSelectUserByRoleModalvue_type_template_id_7eea8eda_scoped_true_staticRende
82392
82447
 
82393
82448
  var elSelectUserByRoleModal_component = (0,componentNormalizer/* default */.Z)(
82394
82449
  elSelectUserByRole_elSelectUserByRoleModalvue_type_script_lang_js_,
82395
- elSelectUserByRoleModalvue_type_template_id_7eea8eda_scoped_true_render,
82396
- elSelectUserByRoleModalvue_type_template_id_7eea8eda_scoped_true_staticRenderFns,
82450
+ elSelectUserByRoleModalvue_type_template_id_b10af91a_scoped_true_render,
82451
+ elSelectUserByRoleModalvue_type_template_id_b10af91a_scoped_true_staticRenderFns,
82397
82452
  false,
82398
82453
  null,
82399
- "7eea8eda",
82454
+ "b10af91a",
82400
82455
  null
82401
82456
 
82402
82457
  )
@@ -111169,7 +111224,7 @@ var CorrectionItemvue_type_template_id_4d910d38_scoped_true_staticRenderFns = []
111169
111224
 
111170
111225
 
111171
111226
  // EXTERNAL MODULE: ./src/form/modules/components/index.js + 858 modules
111172
- var components = __webpack_require__(8633);
111227
+ var components = __webpack_require__(6413);
111173
111228
  ;// 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.2@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/common/Modals/CorrectionItem.vue?vue&type=script&lang=js&
111174
111229
  //
111175
111230
  //
@@ -113020,7 +113075,7 @@ var vuedraggable_umd_default = /*#__PURE__*/__webpack_require__.n(vuedraggable_u
113020
113075
  // EXTERNAL MODULE: ./src/api/manage.js
113021
113076
  var manage = __webpack_require__(1474);
113022
113077
  // EXTERNAL MODULE: ./src/form/modules/components/index.js + 858 modules
113023
- var components = __webpack_require__(8633);
113078
+ var components = __webpack_require__(6413);
113024
113079
  // EXTERNAL MODULE: ./src/form/util/Bus.js
113025
113080
  var Bus = __webpack_require__(767);
113026
113081
  // EXTERNAL MODULE: ./src/form/modules/config/hnkj.js
@@ -113637,7 +113692,7 @@ module.exports = __WEBPACK_EXTERNAL_MODULE__7203__;
113637
113692
  /***/ (function(module) {
113638
113693
 
113639
113694
  "use strict";
113640
- module.exports = {"i8":"1.1.130"};
113695
+ module.exports = {"i8":"1.1.131"};
113641
113696
 
113642
113697
  /***/ })
113643
113698
 
@@ -115164,7 +115219,7 @@ var es_array_push = __webpack_require__(9211);
115164
115219
  // EXTERNAL MODULE: ./src/form/util/util.js
115165
115220
  var util = __webpack_require__(6955);
115166
115221
  // EXTERNAL MODULE: ./src/form/modules/components/index.js + 858 modules
115167
- var components = __webpack_require__(8633);
115222
+ var components = __webpack_require__(6413);
115168
115223
  // EXTERNAL MODULE: ./src/api/manage.js
115169
115224
  var manage = __webpack_require__(1474);
115170
115225
  // EXTERNAL MODULE: ./src/form/modules/widgetFormItem.vue + 6 modules
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zscreate/form-component",
3
- "version": "1.1.130",
3
+ "version": "1.1.131",
4
4
  "private": false,
5
5
  "description": "",
6
6
  "main": "dist/form-component.umd.js",