@zscreate/form-component 1.1.281 → 1.1.283

package/dist/form-component.css

@@ -2231,16 +2231,16 @@ span.CodeMirror-selectedtext { background: none; }
   height: 0;
 }
 
-.flex-warp[data-v-76e41e87] {
+.flex-warp[data-v-26ad5c21] {
   display: flex;
 }
-.flex-warp .flex-left[data-v-76e41e87] {
+.flex-warp .flex-left[data-v-26ad5c21] {
   flex: 3;
 }
-.flex-warp .flex-right[data-v-76e41e87] {
+.flex-warp .flex-right[data-v-26ad5c21] {
   flex: 7;
 }
-.checked[data-v-76e41e87] {
+.checked[data-v-26ad5c21] {
   box-shadow: 0 1px 1px #b7aaaa;
   border-color: #ededed;
   color: inherit;

package/dist/form-component.umd.js

@@ -42051,7 +42051,7 @@ Sortable.mount(Remove, Revert);
 /* harmony import */ var _util_mathUtils__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(38);
 /* harmony import */ var _util_util__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(6955);
 /* harmony import */ var _layoutItem__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(7382);
-/* harmony import */ var _components_index__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(337);
+/* harmony import */ var _components_index__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(2645);
 /* harmony import */ var pubsub_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(2980);
 /* harmony import */ var pubsub_js__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(pubsub_js__WEBPACK_IMPORTED_MODULE_7__);
 /* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(7203);
@@ -44534,7 +44534,7 @@ module.exports = {
 
 /***/ }),
 
-/***/ 337:
+/***/ 2645:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
@@ -59500,9 +59500,9 @@ var componentvue_type_template_id_f966ab6e_scoped_true_render = function () {var
 var componentvue_type_template_id_f966ab6e_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/userSelectorByRole/elSelectUserByRole/elSelectUserByRoleModal.vue?vue&type=template&id=76e41e87&scoped=true&
-var elSelectUserByRoleModalvue_type_template_id_76e41e87_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",staticStyle:{"width":"100%"}},[_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,"customRow":_vm.handleCustomRow},on:{"change":_vm.handleTableChange}})],1)])])])}
-var elSelectUserByRoleModalvue_type_template_id_76e41e87_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/userSelectorByRole/elSelectUserByRole/elSelectUserByRoleModal.vue?vue&type=template&id=26ad5c21&scoped=true&
+var elSelectUserByRoleModalvue_type_template_id_26ad5c21_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",staticStyle:{"width":"100%"}},[_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,"customRow":_vm.handleCustomRow},on:{"change":_vm.handleTableChange}})],1)])])])}
+var elSelectUserByRoleModalvue_type_template_id_26ad5c21_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/userSelectorByRole/elSelectUserByRole/elSelectUserByRoleModal.vue?vue&type=script&lang=js&
@@ -59753,9 +59753,11 @@ var elSelectUserByRoleModalvue_type_template_id_76e41e87_scoped_true_staticRende
       this.selectionRowsData = value;
       this.queryParam.selectedUserIds = selectedUserIds;
       this.queryParam.depId = this.defaultDepartId;
+      this.queryParam.departRelation = this.departRelation ? 1 : 0;
       this.selectedRowKeys = value.map(item => {
         return item.id;
       });
+      if (role && role.length > 0) this.queryParam.roleId = role.join(',');
       this.loadData();
       this.getRolesList();
     },
@@ -59779,10 +59781,10 @@ var elSelectUserByRoleModalvue_type_template_id_76e41e87_scoped_true_staticRende
 });
 ;// CONCATENATED MODULE: ./src/form/modules/components/userSelectorByRole/elSelectUserByRole/elSelectUserByRoleModal.vue?vue&type=script&lang=js&
  /* harmony default export */ const elSelectUserByRole_elSelectUserByRoleModalvue_type_script_lang_js_ = (elSelectUserByRoleModalvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.7.5@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.7.3@css-loader/dist/cjs.js??clonedRuleSet-32.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-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.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/userSelectorByRole/elSelectUserByRole/elSelectUserByRoleModal.vue?vue&type=style&index=0&id=76e41e87&prod&lang=less&scoped=true&
+;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.7.5@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.7.3@css-loader/dist/cjs.js??clonedRuleSet-32.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-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.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/userSelectorByRole/elSelectUserByRole/elSelectUserByRoleModal.vue?vue&type=style&index=0&id=26ad5c21&prod&lang=less&scoped=true&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/form/modules/components/userSelectorByRole/elSelectUserByRole/elSelectUserByRoleModal.vue?vue&type=style&index=0&id=76e41e87&prod&lang=less&scoped=true&
+;// CONCATENATED MODULE: ./src/form/modules/components/userSelectorByRole/elSelectUserByRole/elSelectUserByRoleModal.vue?vue&type=style&index=0&id=26ad5c21&prod&lang=less&scoped=true&
 
 ;// CONCATENATED MODULE: ./src/form/modules/components/userSelectorByRole/elSelectUserByRole/elSelectUserByRoleModal.vue
 
@@ -59795,11 +59797,11 @@ var elSelectUserByRoleModalvue_type_template_id_76e41e87_scoped_true_staticRende
 
 var elSelectUserByRoleModal_component = (0,componentNormalizer/* default */.Z)(
   elSelectUserByRole_elSelectUserByRoleModalvue_type_script_lang_js_,
-  elSelectUserByRoleModalvue_type_template_id_76e41e87_scoped_true_render,
-  elSelectUserByRoleModalvue_type_template_id_76e41e87_scoped_true_staticRenderFns,
+  elSelectUserByRoleModalvue_type_template_id_26ad5c21_scoped_true_render,
+  elSelectUserByRoleModalvue_type_template_id_26ad5c21_scoped_true_staticRenderFns,
   false,
   null,
-  "76e41e87",
+  "26ad5c21",
   null
   
 )
@@ -106958,7 +106960,7 @@ var CorrectionItemvue_type_template_id_6fe27568_scoped_true_staticRenderFns = []
 
 
 // EXTERNAL MODULE: ./src/form/modules/components/index.js + 884 modules
-var components = __webpack_require__(337);
+var components = __webpack_require__(2645);
 ;// 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&
 //
 //
@@ -108876,7 +108878,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 + 884 modules
-var components = __webpack_require__(337);
+var components = __webpack_require__(2645);
 // EXTERNAL MODULE: ./src/form/util/Bus.js
 var Bus = __webpack_require__(767);
 // EXTERNAL MODULE: ./src/form/modules/config/hnkj.js
@@ -113402,7 +113404,7 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
 /***/ ((module) => {
 
 "use strict";
-module.exports = {"i8":"1.1.281"};
+module.exports = {"i8":"1.1.283"};
 
 /***/ })
 
@@ -116691,7 +116693,7 @@ var es_array_sort = __webpack_require__(8284);
 // EXTERNAL MODULE: ./src/form/util/util.js
 var util = __webpack_require__(6955);
 // EXTERNAL MODULE: ./src/form/modules/components/index.js + 884 modules
-var components = __webpack_require__(337);
+var components = __webpack_require__(2645);
 // EXTERNAL MODULE: ./src/api/manage.js
 var manage = __webpack_require__(1474);
 // EXTERNAL MODULE: ./src/form/modules/widgetFormItem.vue + 6 modules

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zscreate/form-component",
-  "version": "1.1.281",
+  "version": "1.1.283",
   "private": false,
   "description": "",
   "main": "dist/form-component.umd.js",