eoss-ui 0.4.28 → 0.4.29

package/lib/button-group.js

@@ -2682,7 +2682,7 @@ module.exports = require("qs");
 // 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/button-group/src/main.vue?vue&type=template&id=332093dd&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/button-group/src/main.vue?vue&type=template&id=0753b411&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -2699,7 +2699,7 @@ var render = function () {
                 _vm._b(
                   {
                     key: index,
-                    attrs: { size: _vm.size, type: item.type },
+                    attrs: { stop: _vm.stop, size: _vm.size, type: item.type },
                     on: {
                       click: function ($event) {
                         _vm.handleClick({ row: _vm.data, handle: item })
@@ -2753,7 +2753,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/button-group/src/main.vue?vue&type=template&id=332093dd&
+// CONCATENATED MODULE: ./packages/button-group/src/main.vue?vue&type=template&id=0753b411&
 
 // EXTERNAL MODULE: ./src/utils/util.js
 var util = __webpack_require__(0);
@@ -2794,6 +2794,7 @@ var util = __webpack_require__(0);
 //
 //
 //
+//
 
 
 /* harmony default export */ var mainvue_type_script_lang_js_ = ({
@@ -2813,6 +2814,7 @@ var util = __webpack_require__(0);
       default: 3
     },
     rules: Function,
+    stop: Boolean,
     trigger: {
       type: String,
       default: 'click'

package/lib/button.js

@@ -2747,7 +2747,10 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
     message: [Object, Boolean],
     alert: [Object, Boolean],
     mapFields: Object,
-    useCaseCode: String
+    useCaseCode: String,
+    closed: Function,
+    stop: Boolean,
+    syncKeys: Object
   },
   data: function data() {
     return {};
@@ -2760,21 +2763,23 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
       if (this.open && this.link) {
         var windows = void 0;
         var fields = [];
-        var param = {};
+        var param = this.param ? this.param : {};
         evt.stopPropagation();
         evt.preventDefault();
         var width = util["a" /* default */].win.top.screen.availWidth - 10;
         var height = util["a" /* default */].win.top.screen.availHeight - 60;
+        var flag = true;
         if (this.esForm) {
           var params = util["a" /* default */].getParams({ url: this.link });
           var modal = this.esForm.models;
           var models = util["a" /* default */].extend({}, params || {}, modal);
-          var flag = true;
           if (this.required) {
             if (Array.isArray(this.required)) {
               this.esForm.validateField(this.required, function (res) {
                 if (res) {
                   flag = false;
+                } else {
+                  flag = true;
                 }
               });
               if (flag) {
@@ -2791,12 +2796,16 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
               this.esForm.validateField(fields, function (res) {
                 if (res) {
                   flag = false;
+                } else {
+                  flag = true;
                 }
               });
             } else {
               this.esForm.validateField(this.required, function (res) {
                 if (res) {
                   flag = false;
+                } else {
+                  flag = true;
                 }
               });
               if (flag) {
@@ -2868,39 +2877,41 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
               }
             }
           }
-          if (flag) {
-            if (this.specs) {
-              if (typeof this.specs === 'boolean') {
-                windows = util["a" /* default */].win.top.open(util["a" /* default */].urlJoinParams({ url: this.link, param: param }), this.name, 'width=' + width + 'px,height=' + height + 'px,resizable=yes,status=yes,menubar=no,scrollbars=yes');
-              } else {
-                windows = util["a" /* default */].win.top.open(util["a" /* default */].urlJoinParams({ url: this.link, param: param }), this.name, this.specs);
-              }
-            } else {
-              windows = util["a" /* default */].win.top.open(util["a" /* default */].urlJoinParams({ url: this.link, param: param }));
+        }
+        if (this.btnGroup && this.syncKeys) {
+          var data = this.btnGroup.data;
+          if (data && Object.keys(data).length && Object.keys(this.syncKeys).length) {
+            for (var _i2 in this.syncKeys) {
+              param[_i2] = data[this.syncKeys[_i2]];
             }
           }
-        } else {
+        }
+        if (flag) {
           if (this.specs) {
             if (typeof this.specs === 'boolean') {
-              windows = util["a" /* default */].win.top.open(this.link, this.name, 'width=' + width + 'px,height=' + height + 'px,resizable=yes,status=yes,menubar=no,scrollbars=yes');
+              windows = util["a" /* default */].win.top.open(util["a" /* default */].urlJoinParams({ url: this.link, param: param }), this.name, 'width=' + width + 'px,height=' + height + 'px,resizable=yes,status=yes,menubar=no,scrollbars=yes');
             } else {
-              windows = util["a" /* default */].win.top.open(this.link, this.name, this.specs);
+              windows = util["a" /* default */].win.top.open(util["a" /* default */].urlJoinParams({ url: this.link, param: param }), this.name, this.specs);
             }
           } else {
-            windows = util["a" /* default */].win.top.open(this.link);
+            windows = util["a" /* default */].win.top.open(util["a" /* default */].urlJoinParams({ url: this.link, param: param }));
           }
         }
         if (windows) {
-          if (this.reload) {
-            var times = setInterval(function () {
-              if (windows.closed) {
-                clearInterval(times);
+          var times = setInterval(function () {
+            if (windows.closed) {
+              clearInterval(times);
+              _this.closed && _this.closed(param);
+              if (_this.reload) {
                 _this.esSelect && _this.esSelect.reload(null, param, true);
                 _this.esTable && _this.esTable.reload(param);
               }
-            }, 1000);
-          }
+            }
+          }, 1000);
         }
+      } else if (this.stop) {
+        evt.stopPropagation();
+        evt.preventDefault();
       }
       this.$emit('click', evt);
     }

package/lib/data-table.js

@@ -2742,8 +2742,8 @@ module.exports = require("vue");
 // 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/data-table/src/main.vue?vue&type=template&id=02ca227b&
-var mainvue_type_template_id_02ca227b_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/main.vue?vue&type=template&id=ac61a5d4&
+var mainvue_type_template_id_ac61a5d4_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -2824,7 +2824,7 @@ var mainvue_type_template_id_02ca227b_render = function () {
                     "el-table",
                     Object.assign({}, _vm.$attrs, {
                       data: _vm.datas,
-                      emptyText: _vm.text || _vm.emptyText,
+                      emptyText: _vm.emptyText,
                       showSummary: _vm.showTotal,
                       sumText: _vm.sumText || _vm.totalText,
                       totalRow: _vm.restotalRow || _vm.totalRow,
@@ -3077,10 +3077,10 @@ var mainvue_type_template_id_02ca227b_render = function () {
   )
 }
 var staticRenderFns = []
-mainvue_type_template_id_02ca227b_render._withStripped = true
+mainvue_type_template_id_ac61a5d4_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=02ca227b&
+// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=ac61a5d4&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -3133,8 +3133,8 @@ childrenvue_type_template_id_796433ee_render._withStripped = true
 
 // CONCATENATED MODULE: ./packages/data-table/src/children.vue?vue&type=template&id=796433ee&
 
-// 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=1f31fcc6&
-var columnvue_type_template_id_1f31fcc6_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=5fcbf848&
+var columnvue_type_template_id_5fcbf848_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -3995,6 +3995,7 @@ var columnvue_type_template_id_1f31fcc6_render = function () {
                 _vm.item.type === "handle" && !scope.row.hideHandle
                   ? _c("es-button-group", {
                       attrs: {
+                        stop: "",
                         contents: _vm.item.contents || _vm.item.events,
                         data: scope.row,
                       },
@@ -4094,11 +4095,11 @@ var columnvue_type_template_id_1f31fcc6_render = function () {
         2
       )
 }
-var columnvue_type_template_id_1f31fcc6_staticRenderFns = []
-columnvue_type_template_id_1f31fcc6_render._withStripped = true
+var columnvue_type_template_id_5fcbf848_staticRenderFns = []
+columnvue_type_template_id_5fcbf848_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/column.vue?vue&type=template&id=1f31fcc6&
+// CONCATENATED MODULE: ./packages/data-table/src/column.vue?vue&type=template&id=5fcbf848&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(9);
@@ -4666,6 +4667,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
 //
 //
 //
+//
 
 
 
@@ -5000,8 +5002,8 @@ var componentNormalizer = __webpack_require__(2);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_columnvue_type_script_lang_js_,
-  columnvue_type_template_id_1f31fcc6_render,
-  columnvue_type_template_id_1f31fcc6_staticRenderFns,
+  columnvue_type_template_id_5fcbf848_render,
+  columnvue_type_template_id_5fcbf848_staticRenderFns,
   false,
   null,
   null,
@@ -5618,11 +5620,6 @@ var mainvue_type_script_lang_js_components;
       default: true
     },
     // 无数据时显示的文本
-    text: {
-      type: String,
-      default: ''
-    },
-    // 无数据时显示的文本
     emptyText: {
       type: String,
       default: ''
@@ -6509,7 +6506,7 @@ var mainvue_type_script_lang_js_components;
 
 var main_component = Object(componentNormalizer["a" /* default */])(
   src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_02ca227b_render,
+  mainvue_type_template_id_ac61a5d4_render,
   staticRenderFns,
   false,
   null,