@zscreate/form-component 1.1.254 → 1.1.256

package/dist/form-component.css

@@ -2299,42 +2299,42 @@ span.CodeMirror-selectedtext { background: none; }
   align-items: center;
 }
 
-.title[data-v-fa5f5a78] {
+.title[data-v-f8760fae] {
   text-overflow: ellipsis;
   white-space: nowrap;
   overflow: hidden;
   max-width: 620px;
   margin-right: 10px;
 }
-.dataTableSet[data-v-fa5f5a78] .ant-table-placeholder {
+.dataTableSet[data-v-f8760fae] .ant-table-placeholder {
   border-left: none !important;
   border-right: none !important;
   border-bottom: none !important;
   padding: 0 !important;
   padding-top: var(--paddingTop) !important;
 }
-.dataSetFormItem[data-v-fa5f5a78] .ant-form-item-control {
+.dataSetFormItem[data-v-f8760fae] .ant-form-item-control {
   margin: 0 !important;
   width: 100% !important;
 }
-.dataSetFormItem[data-v-fa5f5a78] .ant-form-item-control-wrapper {
+.dataSetFormItem[data-v-f8760fae] .ant-form-item-control-wrapper {
   display: initial !important;
 }
-.dataTableSet[data-v-fa5f5a78] table {
+.dataTableSet[data-v-f8760fae] table {
   border-left: none !important;
   border-right: none !important;
 }
-.dataSetFormItem[data-v-fa5f5a78] .ant-form-explain {
+.dataSetFormItem[data-v-f8760fae] .ant-form-explain {
   top: 49px !important;
   left: 50% !important;
 }
-.dataSetFormItem[data-v-fa5f5a78] .ant-form-item-control-wrapper {
+.dataSetFormItem[data-v-f8760fae] .ant-form-item-control-wrapper {
   width: 100% !important;
 }
-.dataTableSet[data-v-fa5f5a78] .ant-table-tbody tr td:last-child {
+.dataTableSet[data-v-f8760fae] .ant-table-tbody tr td:last-child {
   border-right: none !important;
 }
-.dataTableSet[data-v-fa5f5a78] .ant-table-thead tr th:last-child {
+.dataTableSet[data-v-f8760fae] .ant-table-thead tr th:last-child {
   border-right: none !important;
 }
 

package/dist/form-component.umd.js

@@ -74579,7 +74579,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__(7165);
-/* harmony import */ var _components_index__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(5061);
+/* harmony import */ var _components_index__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(4993);
 /* 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);
@@ -77054,7 +77054,7 @@ module.exports = {
 
 /***/ }),
 
-/***/ 5061:
+/***/ 4993:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
@@ -108751,20 +108751,20 @@ var DepartSelector_widgetDesign_component = (0,componentNormalizer/* default */.
   widgetSetup: DepartSelector_widgetSetup,
   widgetDesign: DepartSelector_widgetDesign
 });
-;// 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/DataTable/component.vue?vue&type=template&id=fa5f5a78&scoped=true&
-var componentvue_type_template_id_fa5f5a78_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return (_vm.widget)?_c('div',{staticClass:"custom_form_item",style:({ height: _vm.widget.options.height + 'px', overflow: 'hidden', '--paddingTop': _vm.paddingTop, 'border-bottom': _vm.isScroll ? '1px solid rgb(209, 210, 214)' : 'none' }),attrs:{"id":_vm.widget.key}},[_c('a-form-model-item',{ref:_vm.widget.model,staticClass:"dataSetFormItem",attrs:{"colon":false,"wrapperCol":_vm.wrapperCol,"prop":_vm.tableKey ? (_vm.tableKey + "." + _vm.tableIndex + "." + (_vm.widget.model)) : _vm.widget.model,"rules":_vm.tableKey ? _vm.rules[_vm.tableKey][_vm.widget.model] : _vm.rules[_vm.widget.model]}},[_c('div',{style:({ width: _vm.widget.options.labelWidth + 108 + 'px',lineHeight: '50px', 'text-align': 'center', color: _vm.config.color, position: 'relative', display: 'flex', 'justify-content': 'center', 'align-items': 'center' })},[(_vm.widget.options.required)?_c('span',{staticStyle:{"color":"#f56c6c","margin-right":"4px"}},[_vm._v("*")]):_vm._e(),_c('div',{directives:[{name:"ellipsis",rawName:"v-ellipsis",value:(1),expression:"1"}],staticClass:"title"},[_vm._v(_vm._s(_vm.widget.name))]),(!_vm.widget.options.disabled)?_c('a-button',{attrs:{"type":"primary","icon":"plus","size":"small"},on:{"click":_vm.addTableData}},[_vm._v("请选择数据")]):_vm._e()],1),_c('a-table',{staticClass:"dataTableSet",attrs:{"columns":_vm.columns,"dataSource":_vm.dataSource,"bordered":!_vm.widget.options.noBorder,"pagination":false,"rowKey":_vm.widget.options.defaultTableKey,"scroll":_vm.isScroll ? { y: _vm.widget.options.height - 103 + 'px', x: _vm.columns.length * 100 + 'px' } : { x:  _vm.columns.length * 100 + 'px', }}})],1),_c('addDataSetTable',{ref:"addDataSetTable",attrs:{"defaultId":_vm.widget.options.defaultSQL && _vm.widget.options.defaultSQL.querySql ? _vm.widget.options.defaultSQL.querySql : '',"rowKey":_vm.widget.options.defaultTableKey},on:{"ok":_vm.addTable}})],1):_vm._e()}
-var componentvue_type_template_id_fa5f5a78_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/DataTable/component.vue?vue&type=template&id=f8760fae&scoped=true&
+var componentvue_type_template_id_f8760fae_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return (_vm.widget)?_c('div',{staticClass:"custom_form_item",style:({ height: _vm.widget.options.height + 'px', overflow: 'hidden', '--paddingTop': _vm.paddingTop, 'border-bottom': _vm.isScroll ? '1px solid rgb(209, 210, 214)' : 'none' }),attrs:{"id":_vm.widget.key}},[_c('a-form-model-item',{ref:_vm.widget.model,staticClass:"dataSetFormItem",attrs:{"colon":false,"wrapperCol":_vm.wrapperCol,"prop":_vm.tableKey ? (_vm.tableKey + "." + _vm.tableIndex + "." + (_vm.widget.model)) : _vm.widget.model,"rules":_vm.tableKey ? _vm.rules[_vm.tableKey][_vm.widget.model] : _vm.rules[_vm.widget.model]}},[_c('div',{style:({ width: _vm.widget.options.labelWidth + 164 + 'px',lineHeight: '50px', 'text-align': 'center', color: _vm.config.color, position: 'relative', display: 'flex', 'justify-content': 'center', 'align-items': 'center' })},[(_vm.widget.options.required)?_c('span',{staticStyle:{"color":"#f56c6c","margin-right":"4px"}},[_vm._v("*")]):_vm._e(),_c('div',{directives:[{name:"ellipsis",rawName:"v-ellipsis",value:(1),expression:"1"}],staticClass:"title"},[_vm._v(_vm._s(_vm.widget.name))]),(!_vm.widget.options.disabled)?_c('a-button',{attrs:{"type":"primary","icon":"plus","size":"small"},on:{"click":_vm.addTableData}},[_vm._v("请点击选择数据列表")]):_vm._e()],1),_c('a-table',{staticClass:"dataTableSet",attrs:{"columns":_vm.columns,"dataSource":_vm.dataSource,"bordered":!_vm.widget.options.noBorder,"pagination":false,"rowKey":_vm.widget.options.defaultTableKey,"scroll":_vm.isScroll ? { y: _vm.widget.options.height - 103 + 'px', x: _vm.columns.length< 8 ? false : _vm.columns.length * 100 + 'px' } : { x:  _vm.columns.length< 8 ? false : _vm.columns.length * 100 + 'px', }}})],1),_c('addDataSetTable',{ref:"addDataSetTable",attrs:{"defaultId":_vm.widget.options.defaultSQL && _vm.widget.options.defaultSQL.querySql ? _vm.widget.options.defaultSQL.querySql : '',"rowKey":_vm.widget.options.defaultTableKey},on:{"ok":_vm.addTable}})],1):_vm._e()}
+var componentvue_type_template_id_f8760fae_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/addDataSetTable.vue?vue&type=template&id=31a59e65&scoped=true&
-var addDataSetTablevue_type_template_id_31a59e65_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',{staticStyle:{"margin-top":"20px"},attrs:{"columns":_vm.columns,"dataSource":_vm.dataSource,"loading":_vm.loading,"bordered":"","pagination":_vm.ipagination,"rowKey":_vm.rowKey,"scroll":{ x: true },"row-selection":{ selectedRowKeys: _vm.selectedTableRowKeys, onChange: _vm.onSelectTableChange, onSelectAll: _vm.onSelectAll }},on:{"change":_vm.handleTableChange},scopedSlots:_vm._u([{key:"filterDropdown",fn:function(ref){
+;// 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/addDataSetTable.vue?vue&type=template&id=0ad69836&scoped=true&
+var addDataSetTablevue_type_template_id_0ad69836_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":{ 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_31a59e65_scoped_true_staticRenderFns = []
+var addDataSetTablevue_type_template_id_0ad69836_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/querySelectDict.vue?vue&type=template&id=6dde73ee&
@@ -108984,7 +108984,8 @@ var querySelectDict_component = (0,componentNormalizer/* default */.Z)(
       },
       loading: false,
       columns: [],
-      isApi: false
+      isApi: false,
+      isScorll: false
     };
   },
   components: {
@@ -109018,7 +109019,9 @@ var querySelectDict_component = (0,componentNormalizer/* default */.Z)(
           this.columns = this.getColumn(result);
           this.getDataSource();
         }
-      }).finally(() => {});
+      }).finally(() => {
+        this.isScorll = document.querySelector('.add-table-scroll').querySelector('.ant-table-thead').offsetWidth > 852;
+      });
     },
     getDataSource() {
       this.loading = true;
@@ -109082,7 +109085,7 @@ var querySelectDict_component = (0,componentNormalizer/* default */.Z)(
           dataIndex: "index",
           align: 'center',
           customRender: (text, record, index) => `${index + 1}`,
-          width: "1px",
+          width: "80px",
           ellipsis: true
         });
         return arr;
@@ -109122,8 +109125,9 @@ var querySelectDict_component = (0,componentNormalizer/* default */.Z)(
       this.queryParam.requestParams[dataIndex] = selectedKeys[0];
       this.getDataSource();
     },
-    handleReset(clearFilters, dataIndex) {
+    handleReset(clearFilters, dataIndex, v, c, e) {
       clearFilters();
+      if (!this.queryParam.requestParams[dataIndex]) return;
       this.ipagination.current = 1;
       this.queryParam.requestParams[dataIndex] = "";
       this.getDataSource();
@@ -109142,11 +109146,11 @@ var querySelectDict_component = (0,componentNormalizer/* default */.Z)(
 ;
 var addDataSetTable_component = (0,componentNormalizer/* default */.Z)(
   common_addDataSetTablevue_type_script_lang_js_,
-  addDataSetTablevue_type_template_id_31a59e65_scoped_true_render,
-  addDataSetTablevue_type_template_id_31a59e65_scoped_true_staticRenderFns,
+  addDataSetTablevue_type_template_id_0ad69836_scoped_true_render,
+  addDataSetTablevue_type_template_id_0ad69836_scoped_true_staticRenderFns,
   false,
   null,
-  "31a59e65",
+  "0ad69836",
   null
   
 )
@@ -109354,10 +109358,10 @@ var addDataSetTable_component = (0,componentNormalizer/* default */.Z)(
 });
 ;// CONCATENATED MODULE: ./src/form/modules/components/DataTable/component.vue?vue&type=script&lang=js&
  /* harmony default export */ const components_DataTable_componentvue_type_script_lang_js_ = (DataTable_componentvue_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/DataTable/component.vue?vue&type=style&index=0&id=fa5f5a78&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/DataTable/component.vue?vue&type=style&index=0&id=f8760fae&prod&lang=less&scoped=true&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/form/modules/components/DataTable/component.vue?vue&type=style&index=0&id=fa5f5a78&prod&lang=less&scoped=true&
+;// CONCATENATED MODULE: ./src/form/modules/components/DataTable/component.vue?vue&type=style&index=0&id=f8760fae&prod&lang=less&scoped=true&
 
 ;// CONCATENATED MODULE: ./src/form/modules/components/DataTable/component.vue
 
@@ -109370,11 +109374,11 @@ var addDataSetTable_component = (0,componentNormalizer/* default */.Z)(
 
 var DataTable_component_component = (0,componentNormalizer/* default */.Z)(
   components_DataTable_componentvue_type_script_lang_js_,
-  componentvue_type_template_id_fa5f5a78_scoped_true_render,
-  componentvue_type_template_id_fa5f5a78_scoped_true_staticRenderFns,
+  componentvue_type_template_id_f8760fae_scoped_true_render,
+  componentvue_type_template_id_f8760fae_scoped_true_staticRenderFns,
   false,
   null,
-  "fa5f5a78",
+  "f8760fae",
   null
   
 )
@@ -139413,7 +139417,7 @@ var CorrectionItemvue_type_template_id_6fe27568_scoped_true_staticRenderFns = []
 
 
 // EXTERNAL MODULE: ./src/form/modules/components/index.js + 884 modules
-var components = __webpack_require__(5061);
+var components = __webpack_require__(4993);
 ;// 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&
 //
 //
@@ -141313,7 +141317,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__(5061);
+var components = __webpack_require__(4993);
 // EXTERNAL MODULE: ./src/form/util/Bus.js
 var Bus = __webpack_require__(767);
 // EXTERNAL MODULE: ./src/form/modules/config/hnkj.js
@@ -145839,7 +145843,7 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
 /***/ ((module) => {
 
 "use strict";
-module.exports = {"i8":"1.1.254"};
+module.exports = {"i8":"1.1.256"};
 
 /***/ })
 
@@ -149140,7 +149144,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__(5061);
+var components = __webpack_require__(4993);
 // 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.254",
+  "version": "1.1.256",
   "private": false,
   "description": "",
   "main": "dist/form-component.umd.js",