eoss-ui 0.5.81-beta20 → 0.5.81-beta22

package/lib/data-table.js

@@ -4320,8 +4320,8 @@ childrenvue_type_template_id_44b7ff61_render._withStripped = true
 
 // CONCATENATED MODULE: ./packages/data-table/src/children.vue?vue&type=template&id=44b7ff61&
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/column.vue?vue&type=template&id=00a637ce&
-var columnvue_type_template_id_00a637ce_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/column.vue?vue&type=template&id=7bee268b&
+var columnvue_type_template_id_7bee268b_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4401,7 +4401,7 @@ var columnvue_type_template_id_00a637ce_render = function () {
                                         },
                                       },
                                       "component",
-                                      _vm.formOption,
+                                      _vm.getOptions(scope.row.formConfigs),
                                       false
                                     )
                                   )
@@ -4457,7 +4457,7 @@ var columnvue_type_template_id_00a637ce_render = function () {
                                         },
                                       },
                                       "es-select",
-                                      _vm.formOption,
+                                      _vm.getOptions(scope.row.formConfigs),
                                       false
                                     )
                                   )
@@ -4513,7 +4513,7 @@ var columnvue_type_template_id_00a637ce_render = function () {
                                         },
                                       },
                                       "es-cascader",
-                                      _vm.formOption,
+                                      _vm.getOptions(scope.row.formConfigs),
                                       false
                                     )
                                   )
@@ -4553,7 +4553,7 @@ var columnvue_type_template_id_00a637ce_render = function () {
                                         },
                                       },
                                       "es-select-ganged",
-                                      _vm.formOption,
+                                      _vm.getOptions(scope.row.formConfigs),
                                       false
                                     )
                                   )
@@ -4592,7 +4592,7 @@ var columnvue_type_template_id_00a637ce_render = function () {
                                         },
                                       },
                                       "es-radio-group",
-                                      _vm.formOption,
+                                      _vm.getOptions(scope.row.formConfigs),
                                       false
                                     )
                                   )
@@ -4631,7 +4631,7 @@ var columnvue_type_template_id_00a637ce_render = function () {
                                         },
                                       },
                                       "es-checkbox-group",
-                                      _vm.formOption,
+                                      _vm.getOptions(scope.row.formConfigs),
                                       false
                                     )
                                   )
@@ -4670,7 +4670,7 @@ var columnvue_type_template_id_00a637ce_render = function () {
                                         },
                                       },
                                       "es-switch",
-                                      _vm.formOption,
+                                      _vm.getOptions(scope.row.formConfigs),
                                       false
                                     )
                                   )
@@ -4736,7 +4736,7 @@ var columnvue_type_template_id_00a637ce_render = function () {
                                         },
                                       },
                                       "es-date-picker",
-                                      _vm.formOption,
+                                      _vm.getOptions(scope.row.formConfigs),
                                       false
                                     )
                                   )
@@ -4787,7 +4787,7 @@ var columnvue_type_template_id_00a637ce_render = function () {
                                         },
                                       },
                                       "es-input-number",
-                                      _vm.formOption,
+                                      _vm.getOptions(scope.row.formConfigs),
                                       false
                                     )
                                   )
@@ -4822,7 +4822,7 @@ var columnvue_type_template_id_00a637ce_render = function () {
                                           },
                                         },
                                         "es-selector",
-                                        _vm.formOption,
+                                        _vm.getOptions(scope.row.formConfigs),
                                         false
                                       ),
                                       _vm.exclAttribute({
@@ -4906,7 +4906,9 @@ var columnvue_type_template_id_00a637ce_render = function () {
                                                     },
                                                   },
                                                   "input",
-                                                  _vm.formOption,
+                                                  _vm.getOptions(
+                                                    scope.row.formConfigs
+                                                  ),
                                                   false
                                                 )
                                               )
@@ -4973,7 +4975,9 @@ var columnvue_type_template_id_00a637ce_render = function () {
                                                     },
                                                   },
                                                   "textarea",
-                                                  _vm.formOption,
+                                                  _vm.getOptions(
+                                                    scope.row.formConfigs
+                                                  ),
                                                   false
                                                 )
                                               ),
@@ -5030,7 +5034,9 @@ var columnvue_type_template_id_00a637ce_render = function () {
                                               },
                                             },
                                             "es-input",
-                                            _vm.formOption,
+                                            _vm.getOptions(
+                                              scope.row.formConfigs
+                                            ),
                                             false
                                           )
                                         ),
@@ -5128,11 +5134,11 @@ var columnvue_type_template_id_00a637ce_render = function () {
     2
   )
 }
-var columnvue_type_template_id_00a637ce_staticRenderFns = []
-columnvue_type_template_id_00a637ce_render._withStripped = true
+var columnvue_type_template_id_7bee268b_staticRenderFns = []
+columnvue_type_template_id_7bee268b_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/column.vue?vue&type=template&id=00a637ce&
+// CONCATENATED MODULE: ./packages/data-table/src/column.vue?vue&type=template&id=7bee268b&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(13);
@@ -5144,6 +5150,8 @@ var util = __webpack_require__(0);
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/column.vue?vue&type=script&lang=js&
 
 
+var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
 var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
 function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; }
@@ -5897,9 +5905,13 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       return data;
     },
     getType: function getType(config, types) {
-      var type = config && config[this.field || this.prop] ? config[this.field || this.prop] : this.type;
+      var type = config && config[this.field || this.prop] ? config[this.field || this.prop]['type'] || config[this.field || this.prop] : this.type;
       return Array.isArray(types) ? types.includes(type) : type == types;
     },
+    getOptions: function getOptions(config) {
+      var option = config && config[this.field || this.prop];
+      return option && (typeof option === 'undefined' ? 'undefined' : _typeof(option)) == 'object' ? _extends({}, this.formOption, option) : this.formOption;
+    },
     getData: function getData(res) {
       return res && res[this.field || this.prop] ? res[this.field || this.prop] : this.option;
     },
@@ -6066,8 +6078,8 @@ var componentNormalizer = __webpack_require__(3);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_columnvue_type_script_lang_js_,
-  columnvue_type_template_id_00a637ce_render,
-  columnvue_type_template_id_00a637ce_staticRenderFns,
+  columnvue_type_template_id_7bee268b_render,
+  columnvue_type_template_id_7bee268b_staticRenderFns,
   false,
   null,
   null,
@@ -6383,7 +6395,7 @@ var external_qs_ = __webpack_require__(4);
 var external_qs_default = /*#__PURE__*/__webpack_require__.n(external_qs_);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/main.vue?vue&type=script&lang=js&
-var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+var mainvue_type_script_lang_js_typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
 
 var mainvue_type_script_lang_js_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
@@ -6955,7 +6967,7 @@ var dataTableMode = util["a" /* default */].win.top.dataTableMode || util["a" /*
         if (this.list && this.list.length) {
           return this.list;
         }
-        if (this.page && (_typeof(this.page) === 'object' && (!Object.prototype.hasOwnProperty.call(this.page, 'totalCount') || this.page.totalCount == 0) || this.page === true)) {
+        if (this.page && (mainvue_type_script_lang_js_typeof(this.page) === 'object' && (!Object.prototype.hasOwnProperty.call(this.page, 'totalCount') || this.page.totalCount == 0) || this.page === true)) {
           this.config.totalCount = this.data.length - this.lose;
         }
         if (this.page && this.data.length > this.config.pageSize) {
@@ -7089,7 +7101,7 @@ var dataTableMode = util["a" /* default */].win.top.dataTableMode || util["a" /*
     immediate: true,
     deep: true,
     handler: function handler(val) {
-      if ((typeof val === 'undefined' ? 'undefined' : _typeof(val)) === 'object') {
+      if ((typeof val === 'undefined' ? 'undefined' : mainvue_type_script_lang_js_typeof(val)) === 'object') {
         this.config = util["a" /* default */].extend({}, this.config, val);
       }
     }
@@ -7147,7 +7159,7 @@ var dataTableMode = util["a" /* default */].win.top.dataTableMode || util["a" /*
     setData: function setData() {
       var _this5 = this;
 
-      if (this.page && (_typeof(this.page) === 'object' && (!Object.prototype.hasOwnProperty.call(this.page, 'totalCount') || this.page.totalCount == 0) || this.page === true)) {
+      if (this.page && (mainvue_type_script_lang_js_typeof(this.page) === 'object' && (!Object.prototype.hasOwnProperty.call(this.page, 'totalCount') || this.page.totalCount == 0) || this.page === true)) {
         this.config.totalCount = this.data.length - this.lose;
       }
       if (this.page && this.data.length > this.config.pageSize) {
@@ -7271,7 +7283,7 @@ var dataTableMode = util["a" /* default */].win.top.dataTableMode || util["a" /*
           _index += (this.config.pageNum - 1) * this.config.pageSize;
         }
         var rows = {};
-        if (this.rowData && _typeof(this.rowData) == 'object') {
+        if (this.rowData && mainvue_type_script_lang_js_typeof(this.rowData) == 'object') {
           rows = this.rowData;
         } else if (_index && this.rowData === true) {
           rows = JSON.parse(JSON.stringify(this.data[_index - 1]));

package/lib/dialog.js

@@ -3943,7 +3943,7 @@ module.exports = require("wujie-vue2");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/dialog/src/main.vue?vue&type=template&id=b9446116&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/dialog/src/main.vue?vue&type=template&id=2c75b6d0&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3959,8 +3959,8 @@ var render = function () {
           attrs: {
             title: _vm.titles,
             visible: _vm.show,
-            width: _vm.wd,
-            height: _vm.ht,
+            width: _vm._width,
+            height: _vm._height,
             "close-on-click-modal": _vm.shadeClose,
             showScale: _vm.showScale,
             drag: _vm.drag,
@@ -4458,7 +4458,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/dialog/src/main.vue?vue&type=template&id=b9446116&
+// CONCATENATED MODULE: ./packages/dialog/src/main.vue?vue&type=template&id=2c75b6d0&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(13);
@@ -4748,6 +4748,10 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
 
 var mainvue_type_script_lang_js_bus = external_wujie_vue2_default.a.bus;
 
+var availWidth = 0;
+var availHeight = 0;
+availWidth = util["a" /* default */].win.top.document.body.offsetWidth - 260;
+availHeight = util["a" /* default */].win.top.document.body.offsetHeight - 60;
 /* harmony default export */ var mainvue_type_script_lang_js_ = ({
   name: 'EsDialog',
   inheritAttrs: false,
@@ -4829,6 +4833,12 @@ var mainvue_type_script_lang_js_bus = external_wujie_vue2_default.a.bus;
   computed: {
     wujieName: function wujieName() {
       return this.name ? this.name : util["a" /* default */].uuid(16);
+    },
+    _width: function _width() {
+      return this.width ? this.width : this.sizes[this.size]['width'];
+    },
+    _height: function _height() {
+      return this.height ? this.height : this.sizes[this.size]['height'];
     }
   },
   watch: {
@@ -4852,12 +4862,11 @@ var mainvue_type_script_lang_js_bus = external_wujie_vue2_default.a.bus;
         sm: { width: '960px', height: '500px' },
         md: { width: '1060px', height: '600px' },
         lg: { width: '1200px', height: '800px' },
+        max: { width: availWidth + 'px', height: availHeight + 'px' },
         full: { width: '100%', height: '100%' }
       },
       show: this.visible,
       defaultProps: {},
-      wd: '',
-      ht: '',
       zoom: 1,
       scales: { zoom: 1 }
     };
@@ -4865,19 +4874,6 @@ var mainvue_type_script_lang_js_bus = external_wujie_vue2_default.a.bus;
   created: function created() {
     var _this = this;
 
-    var availWidth = 0;
-    var availHeight = 0;
-    availWidth = util["a" /* default */].win.top.document.body.offsetWidth - 260;
-    availHeight = util["a" /* default */].win.top.document.body.offsetHeight - 60;
-    this.sizes.max = { width: availWidth + 'px', height: availHeight + 'px' };
-    if (this.size === 'full' || this.width == '100%' && this.height == '100%') {
-      this.full = true;
-      this.wd = '100%';
-      this.ht = '100%';
-    } else {
-      this.wd = this.width ? this.width : this.sizes[this.size]['width'];
-      this.ht = this.height ? this.height : this.sizes[this.size]['height'];
-    }
     if (this.busEvent) {
       bus["a" /* default */].$on(this.busEvent, function () {
         var _ref = _asyncToGenerator( /*#__PURE__*/regenerator_default.a.mark(function _callee(res) {