@zscreate/form-component 1.1.315 → 1.1.316

package/dist/form-component.css

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

package/dist/form-component.umd.js

@@ -45460,7 +45460,7 @@ let getFileExt = filename => {
 /* 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__(8396);
-/* harmony import */ var _components_index__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(1526);
+/* harmony import */ var _components_index__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(6469);
 /* 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);
@@ -48005,7 +48005,7 @@ module.exports = {
 
 /***/ }),
 
-/***/ 1526:
+/***/ 6469:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
@@ -80409,9 +80409,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=f94f15c0&scoped=true&
-var componentvue_type_template_id_f94f15c0_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.map(function (item) { return item.width ? item.width : 0; }).reduce(function (a, b) { return a + b; }, 0) < 751 ? false : _vm.columns.map(function (item) { return item.width ? item.width : 0; }).reduce(function (a, b) { return a + b; }, 0)  + 'px'} : { x: this.columns.map(function (item) { return item.width ? item.width : 0; }).reduce(function (a, b) { return a + b; }, 0) < 751 ? false : this.columns.map(function (item) { return item.width ? item.width : 0; }).reduce(function (a, b) { return a + b; }, 0)  + '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_f94f15c0_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=afb8e90c&scoped=true&
+var componentvue_type_template_id_afb8e90c_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.map(function (item) { return item.width ? item.width : 0; }).reduce(function (a, b) { return a + b; }, 0) < 751 ? false : _vm.columns.map(function (item) { return item.width ? item.width : 0; }).reduce(function (a, b) { return a + b; }, 0)  + 'px'} : { x: this.columns.map(function (item) { return item.width ? item.width : 0; }).reduce(function (a, b) { return a + b; }, 0) < 751 ? false : this.columns.map(function (item) { return item.width ? item.width : 0; }).reduce(function (a, b) { return a + b; }, 0)  + '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_afb8e90c_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=3cc248d0&scoped=true&
@@ -80921,6 +80921,7 @@ var addDataSetTable_component = (0,componentNormalizer/* default */.Z)(
         if (Array.isArray(val)) {
           this.dataSource = val;
         }
+        debugger;
         if ((!this.columns || this.columns.length == 0) && val && Array.isArray(val) && val.length > 0) {
           this.getColumsList();
         }
@@ -80938,7 +80939,7 @@ var addDataSetTable_component = (0,componentNormalizer/* default */.Z)(
       }).then(async res => {
         if (res.success) {
           let result = res.result ? res.result : [];
-          this.columns = this.getColumn(result);
+          this.columns = result.length > 0 ? this.getColumn(result) : [];
           await this.$nextTick();
           // 当我们打印 domList 时会发现它的长度为8
           // 可table只有6个标头，在加上可选框才7个
@@ -81044,10 +81045,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=f94f15c0&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=afb8e90c&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=f94f15c0&prod&lang=less&scoped=true&
+;// CONCATENATED MODULE: ./src/form/modules/components/DataTable/component.vue?vue&type=style&index=0&id=afb8e90c&prod&lang=less&scoped=true&
 
 ;// CONCATENATED MODULE: ./src/form/modules/components/DataTable/component.vue
 
@@ -81060,11 +81061,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_f94f15c0_scoped_true_render,
-  componentvue_type_template_id_f94f15c0_scoped_true_staticRenderFns,
+  componentvue_type_template_id_afb8e90c_scoped_true_render,
+  componentvue_type_template_id_afb8e90c_scoped_true_staticRenderFns,
   false,
   null,
-  "f94f15c0",
+  "afb8e90c",
   null
   
 )
@@ -110227,7 +110228,7 @@ var staticRenderFns = []
 
 
 // EXTERNAL MODULE: ./src/form/modules/components/index.js + 894 modules
-var components = __webpack_require__(1526);
+var components = __webpack_require__(6469);
 ;// 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&
 //
 //
@@ -111587,7 +111588,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /* harmony default export */ const CorrectionModal = (component.exports);
 // EXTERNAL MODULE: ./src/form/modules/components/index.js + 894 modules
-var components = __webpack_require__(1526);
+var components = __webpack_require__(6469);
 // EXTERNAL MODULE: ./node_modules/_pubsub-js@1.9.4@pubsub-js/src/pubsub.js
 var pubsub = __webpack_require__(2980);
 var pubsub_default = /*#__PURE__*/__webpack_require__.n(pubsub);
@@ -112728,7 +112729,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 + 894 modules
-var components = __webpack_require__(1526);
+var components = __webpack_require__(6469);
 // EXTERNAL MODULE: ./src/form/util/Bus.js
 var Bus = __webpack_require__(767);
 // EXTERNAL MODULE: ./src/form/modules/config/hnkj.js
@@ -120771,7 +120772,7 @@ function toNumber(value) {
 /***/ ((module) => {
 
 "use strict";
-module.exports = {"i8":"1.1.315"};
+module.exports = {"i8":"1.1.316"};
 
 /***/ })
 
@@ -124105,7 +124106,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 + 894 modules
-var components = __webpack_require__(1526);
+var components = __webpack_require__(6469);
 // 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.315",
+  "version": "1.1.316",
   "private": false,
   "description": "",
   "main": "dist/form-component.umd.js",