@zscreate/form-component 1.1.231 → 1.1.233

package/dist/form-component.css

@@ -2299,42 +2299,42 @@ span.CodeMirror-selectedtext { background: none; }
   align-items: center;
 }
 
-.title[data-v-0f6cb378] {
+.title[data-v-032e9d71] {
   text-overflow: ellipsis;
   white-space: nowrap;
   overflow: hidden;
   max-width: 620px;
   margin-right: 10px;
 }
-.dataTableSet[data-v-0f6cb378] .ant-table-placeholder {
+.dataTableSet[data-v-032e9d71] .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-0f6cb378] .ant-form-item-control {
+.dataSetFormItem[data-v-032e9d71] .ant-form-item-control {
   margin: 0 !important;
   width: 100% !important;
 }
-.dataSetFormItem[data-v-0f6cb378] .ant-form-item-control-wrapper {
+.dataSetFormItem[data-v-032e9d71] .ant-form-item-control-wrapper {
   display: initial !important;
 }
-.dataTableSet[data-v-0f6cb378] table {
+.dataTableSet[data-v-032e9d71] table {
   border-left: none !important;
   border-right: none !important;
 }
-.dataSetFormItem[data-v-0f6cb378] .ant-form-explain {
+.dataSetFormItem[data-v-032e9d71] .ant-form-explain {
   top: 49px !important;
   left: 50% !important;
 }
-.dataSetFormItem[data-v-0f6cb378] .ant-form-item-control-wrapper {
+.dataSetFormItem[data-v-032e9d71] .ant-form-item-control-wrapper {
   width: 100% !important;
 }
-.dataTableSet[data-v-0f6cb378] .ant-table-tbody tr td:last-child {
+.dataTableSet[data-v-032e9d71] .ant-table-tbody tr td:last-child {
   border-right: none !important;
 }
-.dataTableSet[data-v-0f6cb378] .ant-table-thead tr th:last-child {
+.dataTableSet[data-v-032e9d71] .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__(5474);
+/* harmony import */ var _components_index__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(60);
 /* 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 = {
 
 /***/ }),
 
-/***/ 5474:
+/***/ 60:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
@@ -108662,9 +108662,9 @@ 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=0f6cb378&scoped=true&
-var componentvue_type_template_id_0f6cb378_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'})},[_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:({ 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 - 105 + 'px',x: '100%', } : { x: '100%', }}})],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_0f6cb378_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=032e9d71&scoped=true&
+var componentvue_type_template_id_032e9d71_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:({ 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: '100%', } : { x: '100%', }}})],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_032e9d71_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&
@@ -109087,6 +109087,11 @@ var addDataSetTable_component = (0,componentNormalizer/* default */.Z)(
 //
 //
 //
+//
+//
+//
+//
+//
 
 
 
@@ -109132,22 +109137,6 @@ var addDataSetTable_component = (0,componentNormalizer/* default */.Z)(
       // A发送来的消息
       this.departNames = msg;
     });
-    // 当我们打印 domList 时会发现它的长度为8
-    // 可table只有6个标头，在加上可选框才7个
-    // 因为我们设置`操作栏`为右固定，所以就多了个重复的`操作栏`
-    const domList = document.querySelectorAll('.ant-table-thead th');
-    console.log(domList);
-    // domList是一个类数组,先把它转为数组
-    const newThead = [...domList];
-    // 删除数组第一项'可选框'
-    // newThead.shift()
-    // 删除数组最后一项重复的`操作栏`
-    // newThead.pop()
-    // 为剩下的每一个th设置title属性
-    // this.columns是table的配置项
-    newThead.forEach((item, idx) => {
-      item.setAttribute('title', this.columns[idx].title);
-    });
   },
   destroyed() {
     this.$bus.$off("dept");
@@ -109179,10 +109168,28 @@ var addDataSetTable_component = (0,componentNormalizer/* default */.Z)(
     getColumsList() {
       (0,manage/* getAction */.s7)('/dataset/getDatasetColumns', {
         id: this.widget.options.defaultSQL.querySql
-      }).then(res => {
+      }).then(async res => {
         if (res.success) {
           let result = res.result ? res.result : [];
           this.columns = this.getColumn(result);
+          await this.$nextTick();
+          // 当我们打印 domList 时会发现它的长度为8
+          // 可table只有6个标头，在加上可选框才7个
+          // 因为我们设置`操作栏`为右固定，所以就多了个重复的`操作栏`
+          const domList = document.getElementById(this.widget.key).querySelectorAll('.ant-table-thead th');
+          console.log(domList);
+          debugger;
+          // domList是一个类数组,先把它转为数组
+          const newThead = [...domList];
+          // 删除数组第一项'可选框'
+          // newThead.shift()
+          // 删除数组最后一项重复的`操作栏`
+          // newThead.pop()
+          // 为剩下的每一个th设置title属性
+          // this.columns是table的配置项
+          newThead.forEach((item, idx) => {
+            item.setAttribute('title', this.columns[idx].title);
+          });
         }
       }).finally(() => {});
     },
@@ -109216,6 +109223,7 @@ var addDataSetTable_component = (0,componentNormalizer/* default */.Z)(
           width: "100px",
           ellipsis: true
         });
+        delete arr[arr.length - 1].width; //删除最后一列的宽度让宽度自适应解决错位的问题
         return arr;
       }
     },
@@ -109257,10 +109265,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=0f6cb378&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=032e9d71&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=0f6cb378&prod&lang=less&scoped=true&
+;// CONCATENATED MODULE: ./src/form/modules/components/DataTable/component.vue?vue&type=style&index=0&id=032e9d71&prod&lang=less&scoped=true&
 
 ;// CONCATENATED MODULE: ./src/form/modules/components/DataTable/component.vue
 
@@ -109273,11 +109281,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_0f6cb378_scoped_true_render,
-  componentvue_type_template_id_0f6cb378_scoped_true_staticRenderFns,
+  componentvue_type_template_id_032e9d71_scoped_true_render,
+  componentvue_type_template_id_032e9d71_scoped_true_staticRenderFns,
   false,
   null,
-  "0f6cb378",
+  "032e9d71",
   null
   
 )
@@ -139236,7 +139244,7 @@ var CorrectionItemvue_type_template_id_6fe27568_scoped_true_staticRenderFns = []
 
 
 // EXTERNAL MODULE: ./src/form/modules/components/index.js + 884 modules
-var components = __webpack_require__(5474);
+var components = __webpack_require__(60);
 ;// 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&
 //
 //
@@ -141136,7 +141144,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__(5474);
+var components = __webpack_require__(60);
 // EXTERNAL MODULE: ./src/form/util/Bus.js
 var Bus = __webpack_require__(767);
 // EXTERNAL MODULE: ./src/form/modules/config/hnkj.js
@@ -145662,7 +145670,7 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
 /***/ ((module) => {
 
 "use strict";
-module.exports = {"i8":"1.1.231"};
+module.exports = {"i8":"1.1.233"};
 
 /***/ })
 
@@ -148963,7 +148971,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__(5474);
+var components = __webpack_require__(60);
 // 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.231",
+  "version": "1.1.233",
   "private": false,
   "description": "",
   "main": "dist/form-component.umd.js",