@zscreate/form-component 1.1.722 → 1.1.725

package/dist/form-component.umd.js

@@ -71318,7 +71318,7 @@ let getFileExt = filename => {
 /* harmony import */ var _util_mathUtils__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(29414);
 /* harmony import */ var _util_util__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(78393);
 /* harmony import */ var _layoutItem__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(20944);
-/* harmony import */ var _components_index__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(59734);
+/* harmony import */ var _components_index__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(53264);
 /* harmony import */ var pubsub_js__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(15934);
 /* harmony import */ var pubsub_js__WEBPACK_IMPORTED_MODULE_19___default = /*#__PURE__*/__webpack_require__.n(pubsub_js__WEBPACK_IMPORTED_MODULE_19__);
 /* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(9274);
@@ -77659,7 +77659,7 @@ module.exports = {
 
 /***/ },
 
-/***/ 59734
+/***/ 53264
 (__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -118472,15 +118472,15 @@ var componentvue_type_template_id_37de697e_scoped_true_render = function () {var
 var componentvue_type_template_id_37de697e_scoped_true_staticRenderFns = []
 
 
-;// ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/common/addDataSetTable.vue?vue&type=template&id=0b65d644&scoped=true
-var addDataSetTablevue_type_template_id_0b65d644_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('a-modal',{attrs:{"title":"请选择数据","width":900,"visible":_vm.visible,"destroyOnClose":true,"centered":true,"cancelText":"关闭","wrapClassName":"ant-modal-cust-warp","maskClosable":false},on:{"ok":_vm.handleOk,"cancel":_vm.handleCancel}},[_c('a-table',{staticClass:"add-table-scroll",staticStyle:{"margin-top":"20px"},attrs:{"columns":_vm.columns,"dataSource":_vm.dataSource,"loading":_vm.loading,"bordered":"","pagination":_vm.ipagination,"rowKey":_vm.rowKey,"scroll":{ x: _vm.isScorll },"row-selection":{type: _vm.isRadio ? 'radio' : 'checkbox', selectedRowKeys: _vm.selectedTableRowKeys, onChange: _vm.onSelectTableChange, onSelectAll: _vm.onSelectAll }},on:{"change":_vm.handleTableChange},scopedSlots:_vm._u([{key:"filterDropdown",fn:function(ref){
+;// ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/common/addDataSetTable.vue?vue&type=template&id=7ec399a6&scoped=true
+var addDataSetTablevue_type_template_id_7ec399a6_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('a-modal',{attrs:{"title":"请选择数据","width":900,"visible":_vm.visible,"destroyOnClose":true,"centered":true,"cancelText":"关闭","wrapClassName":"ant-modal-cust-warp","maskClosable":false},on:{"ok":_vm.handleOk,"cancel":_vm.handleCancel}},[_c('a-table',{staticClass:"add-table-scroll",staticStyle:{"margin-top":"20px"},attrs:{"columns":_vm.columns,"dataSource":_vm.dataSource,"loading":_vm.loading,"bordered":"","pagination":_vm.ipagination,"rowKey":_vm.rowKey,"scroll":{ x: _vm.isScorll },"row-selection":{type: _vm.isRadio ? 'radio' : 'checkbox', selectedRowKeys: _vm.selectedTableRowKeys, onChange: _vm.onSelectTableChange, onSelectAll: _vm.onSelectAll }},on:{"change":_vm.handleTableChange},scopedSlots:_vm._u([{key:"filterDropdown",fn:function(ref){
         var setSelectedKeys = ref.setSelectedKeys;
         var selectedKeys = ref.selectedKeys;
         var confirm = ref.confirm;
         var clearFilters = ref.clearFilters;
         var column = ref.column;
 return (column.title != '序号' && (!column.dictType || !column.dictType))?_c('div',{staticStyle:{"padding":"8px"}},[_c('a-input',{staticStyle:{"width":"188px","margin-bottom":"8px","display":"block"},attrs:{"placeholder":"输入搜索内容","value":selectedKeys[0]},on:{"change":function (e) { return setSelectedKeys(e.target.value ? [e.target.value] : []); },"pressEnter":function () { return _vm.handleSearch(selectedKeys, confirm, column.dataIndex); }}}),_c('a-button',{staticStyle:{"width":"90px","margin-right":"8px"},attrs:{"type":"primary","icon":"search","size":"small","placeholder":"请搜索"},on:{"click":function () { return _vm.handleSearch(selectedKeys, confirm, column.dataIndex); }}},[_c('span',{staticClass:"tw-text-[#fff]"},[_vm._v("搜索")])]),_c('a-button',{staticStyle:{"width":"90px"},attrs:{"size":"small"},on:{"click":function () { return _vm.handleReset(clearFilters, column.dataIndex); }}},[_vm._v("取消")])],1):(column.title != '序号' && (column.dictType == 2 || column.dictType == 1))?_c('div',{staticStyle:{"padding":"8px"}},[_c('div',{staticStyle:{"width":"100%","margin-bottom":"8px"}},[_c('query-select-dict',{staticStyle:{"width":"188px","margin-bottom":"8px","display":"block"},attrs:{"value":selectedKeys,"dictTable":column.dictType == 2 ? column.dictCode : '',"dictCode":column.dictType == 1 ? column.dictCode : '',"placeholder":("搜索 " + (column.title))},on:{"change":function (e) { return setSelectedKeys(e ? [e] : []); }}})],1),_c('div',[_c('a-button',{staticStyle:{"width":"90px","margin-right":"8px"},attrs:{"type":"primary","icon":"search","size":"small","placeholder":"请搜索"},on:{"click":function () { return _vm.handleSearch(selectedKeys, confirm, column.dataIndex); }}},[_vm._v("搜索")]),_c('a-button',{staticStyle:{"width":"90px"},attrs:{"size":"small"},on:{"click":function () { return _vm.handleReset(clearFilters, column.dataIndex); }}},[_vm._v("取消")])],1)]):_vm._e()}}],null,true)})],1)}
-var addDataSetTablevue_type_template_id_0b65d644_scoped_true_staticRenderFns = []
+var addDataSetTablevue_type_template_id_7ec399a6_scoped_true_staticRenderFns = []
 
 
 // EXTERNAL MODULE: ./src/form/modules/common/querySelectDict.vue + 3 modules
@@ -118494,6 +118494,14 @@ var querySelectDict = __webpack_require__(92967);
 
 
 
+
+
+
+
+
+
+
+
 //
 //
 //
@@ -118708,17 +118716,41 @@ var querySelectDict = __webpack_require__(92967);
       };
     },
     onSelectAll(selected, selectedRows, changeRows) {
+      const rowKey = this.rowKey;
       if (selected) {
-        this.selectedTableRowKeys = this.initdataSource.map(item => item[this.rowKey]);
-        this.selectedTableRowValues = this.initdataSource;
+        // 全选当前视图：按唯一 key 合并，不覆盖此前已选
+        const existKeys = this.selectedTableRowValues.map(item => item[rowKey]);
+        (selectedRows || []).forEach(item => {
+          if (!existKeys.some(k => k === item[rowKey])) {
+            this.selectedTableRowValues.push(item);
+          }
+        });
+        const keySet = new Set(this.selectedTableRowKeys);
+        (selectedRows || []).forEach(item => keySet.add(item[rowKey]));
+        this.selectedTableRowKeys = Array.from(keySet);
       } else {
-        this.selectedTableRowKeys = [];
-        this.selectedTableRowValues = [];
+        // 取消全选：仅移除当前变更行，保留其它筛选/分页下已选
+        const removeKeys = new Set((changeRows || []).map(item => item[rowKey]));
+        this.selectedTableRowKeys = this.selectedTableRowKeys.filter(k => !removeKeys.has(k));
+        this.selectedTableRowValues = this.selectedTableRowValues.filter(item => !removeKeys.has(item[rowKey]));
       }
     },
     onSelectTableChange(key, val) {
       this.selectedTableRowKeys = key;
-      this.selectedTableRowValues = val;
+      if (this.isRadio) {
+        this.selectedTableRowValues = val;
+        return;
+      }
+      // 多选：Ant Design 的 selectedRows 仅含当前 dataSource 可见行，
+      // 筛选/分页后再勾选若直接整表赋值会覆盖此前已选，需按唯一 key 合并
+      const rowKey = this.rowKey;
+      const existKeys = this.selectedTableRowValues.map(item => item[rowKey]);
+      (val || []).forEach(item => {
+        if (!existKeys.some(k => k === item[rowKey])) {
+          this.selectedTableRowValues.push(item);
+        }
+      });
+      this.selectedTableRowValues = this.selectedTableRowValues.filter(item => key.some(k => k === item[rowKey]));
     },
     handleSearch(selectedKeys, confirm, dataIndex, v) {
       if (v !== undefined) {
@@ -118751,11 +118783,11 @@ var querySelectDict = __webpack_require__(92967);
 ;
 var addDataSetTable_component = (0,componentNormalizer/* default */.A)(
   common_addDataSetTablevue_type_script_lang_js,
-  addDataSetTablevue_type_template_id_0b65d644_scoped_true_render,
-  addDataSetTablevue_type_template_id_0b65d644_scoped_true_staticRenderFns,
+  addDataSetTablevue_type_template_id_7ec399a6_scoped_true_render,
+  addDataSetTablevue_type_template_id_7ec399a6_scoped_true_staticRenderFns,
   false,
   null,
-  "0b65d644",
+  "7ec399a6",
   null
   
 )
@@ -138079,7 +138111,7 @@ var staticRenderFns = []
 
 
 // EXTERNAL MODULE: ./src/form/modules/components/index.js + 1030 modules
-var components = __webpack_require__(59734);
+var components = __webpack_require__(53264);
 ;// ./node_modules/_thread-loader@3.0.4@thread-loader/dist/cjs.js!./node_modules/_babel-loader@8.4.1@babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/common/Modals/CorrectionItem.vue?vue&type=script&lang=js
 //
 //
@@ -140521,7 +140553,7 @@ var component = (0,componentNormalizer/* default */.A)(
 
 /* harmony default export */ const CorrectionModal = (component.exports);
 // EXTERNAL MODULE: ./src/form/modules/components/index.js + 1030 modules
-var components = __webpack_require__(59734);
+var components = __webpack_require__(53264);
 // EXTERNAL MODULE: ./node_modules/_pubsub-js@1.9.5@pubsub-js/src/pubsub.js
 var pubsub = __webpack_require__(15934);
 var pubsub_default = /*#__PURE__*/__webpack_require__.n(pubsub);
@@ -141744,7 +141776,7 @@ var vuedraggable_umd_default = /*#__PURE__*/__webpack_require__.n(vuedraggable_u
 // EXTERNAL MODULE: ./src/api/manage.js
 var manage = __webpack_require__(5335);
 // EXTERNAL MODULE: ./src/form/modules/components/index.js + 1030 modules
-var components = __webpack_require__(59734);
+var components = __webpack_require__(53264);
 // EXTERNAL MODULE: ./src/form/util/Bus.js
 var Bus = __webpack_require__(31227);
 // EXTERNAL MODULE: ./src/form/modules/config/hnkj.js
@@ -158447,7 +158479,7 @@ function toString(value) {
 (module) {
 
 "use strict";
-module.exports = {"rE":"1.1.722"};
+module.exports = {"rE":"1.1.725"};
 
 /***/ }
 
@@ -173708,7 +173740,7 @@ var es_array_unshift = __webpack_require__(7702);
 // EXTERNAL MODULE: ./src/form/util/util.js
 var util_util = __webpack_require__(78393);
 // EXTERNAL MODULE: ./src/form/modules/components/index.js + 1030 modules
-var components = __webpack_require__(59734);
+var components = __webpack_require__(53264);
 // EXTERNAL MODULE: ./src/form/modules/widgetFormItem.vue + 5 modules
 var widgetFormItem = __webpack_require__(25509);
 // EXTERNAL MODULE: ./src/form/modules/WidgetIdeaSignItem.vue + 5 modules

package/package.json

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