eoss-ui 0.5.81-beta11 → 0.5.81-beta13

package/lib/button-group.js

@@ -3911,7 +3911,7 @@ module.exports = require("sm-crypto");
 // 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=1a095074&
+// 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=70bfc4f2&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3931,7 +3931,7 @@ var render = function () {
                             "es-upload",
                             _vm._g(
                               _vm._b(
-                                { staticClass: "el-button" },
+                                {},
                                 "es-upload",
                                 Object.assign(
                                   {},
@@ -3944,7 +3944,8 @@ var render = function () {
                                     method: "post",
                                     btnSize: _vm.size,
                                     showFileList: false,
-                                    selectType: item.type ? item.type : "",
+                                    selectType:
+                                      _vm.mode == "plus" ? "text" : item.type,
                                   }
                                 ),
                                 false
@@ -3961,7 +3962,8 @@ var render = function () {
                                   attrs: {
                                     stop: _vm.stop,
                                     size: _vm.size,
-                                    type: item.type,
+                                    type:
+                                      _vm.mode == "plus" ? "text" : item.type,
                                   },
                                   on: {
                                     click: function ($event) {
@@ -4018,9 +4020,16 @@ var render = function () {
             [
               _c(
                 "el-button",
-                { attrs: { size: _vm.size } },
+                {
+                  attrs: {
+                    size: _vm.size,
+                    type: _vm.mode == "plus" ? "text" : "",
+                  },
+                },
                 [
-                  _vm.moreText
+                  _vm.mode == "plus"
+                    ? [_vm._v("更多")]
+                    : _vm.moreText
                     ? [
                         _vm._v(
                           "\n        " + _vm._s(_vm.moreText) + "\n        "
@@ -4043,6 +4052,14 @@ var render = function () {
                   return _c(
                     "el-dropdown-item",
                     {
+                      directives: [
+                        {
+                          name: "show",
+                          rawName: "v-show",
+                          value: !item.hide,
+                          expression: "!item.hide",
+                        },
+                      ],
                       key: index,
                       class: {
                         "es-dropdown-padding": item.upload || item.selector,
@@ -4151,7 +4168,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/button-group/src/main.vue?vue&type=template&id=1a095074&
+// CONCATENATED MODULE: ./packages/button-group/src/main.vue?vue&type=template&id=70bfc4f2&
 
 // EXTERNAL MODULE: ./src/utils/util.js
 var util = __webpack_require__(0);
@@ -4279,6 +4296,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 //
 //
 //
+//
 
 
 /* harmony default export */ var mainvue_type_script_lang_js_ = ({
@@ -4290,6 +4308,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
   },
 
   props: {
+    mode: String,
     value: String,
     data: Object,
     contents: { type: Array, default: [] },
@@ -4301,7 +4320,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
     stop: Boolean,
     trigger: {
       type: String,
-      default: 'click'
+      default: 'hover'
     },
     useCaseCodeKey: String,
     moreText: String,

package/lib/button.js

@@ -4127,7 +4127,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
       }
     }
     var tag = 'el-button';
-    var clas = ['es-button'];
+    var clas = '';
     var props = {};
     var attrs = {};
     var listeners = {};
@@ -4149,6 +4149,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
         size: this.size
       };
     } else {
+      clas = ['es-button'];
       props = _extends({}, this.$attrs, { type: this._type, size: this.size });
       listeners = _extends({}, this.$listeners, { click: this.handleClick });
       if (this.link && !this.open) {

package/lib/data-table.js

@@ -3931,8 +3931,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=39809074&
-var mainvue_type_template_id_39809074_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=af715ef0&
+var mainvue_type_template_id_af715ef0_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -3963,7 +3963,12 @@ var mainvue_type_template_id_39809074_render = function () {
             "es-toolbar",
             _vm._g(
               _vm._b(
-                { ref: "toolbar" },
+                {
+                  ref: "toolbar",
+                  class: {
+                    "es-table-toolbar-plus": _vm.mode == "plus",
+                  },
+                },
                 "es-toolbar",
                 {
                   contents: _vm.toolbars,
@@ -4004,7 +4009,10 @@ var mainvue_type_template_id_39809074_render = function () {
             {
               ref: "esTableContent",
               staticClass: "es-data-table-content",
-              class: _vm.border == "none" ? "es-table-border-none" : "",
+              class: {
+                "es-table-border-none": _vm.border == "none",
+                "es-table-plus": _vm.mode == "plus",
+              },
               staticStyle: {},
             },
             [
@@ -4107,6 +4115,7 @@ var mainvue_type_template_id_39809074_render = function () {
                                       Object.assign(
                                         {},
                                         {
+                                          mode: _vm.mode,
                                           name: _vm.name,
                                           indexs: index,
                                           form: _vm.form,
@@ -4213,6 +4222,7 @@ var mainvue_type_template_id_39809074_render = function () {
                     _vm._g(
                       _vm._b(
                         {
+                          ref: "pagination",
                           staticClass: "es-table-page",
                           style: { "text-align": _vm.page.position },
                           attrs: { position: _vm.page.position },
@@ -4236,16 +4246,19 @@ var mainvue_type_template_id_39809074_render = function () {
             2
           )
         : _vm._e(),
-      _c("sizer", { ref: "sizer", attrs: { data: _vm.theads } }),
+      _c("sizer", {
+        ref: "sizer",
+        attrs: { data: _vm.theads, mode: _vm.mode },
+      }),
     ],
     1
   )
 }
 var staticRenderFns = []
-mainvue_type_template_id_39809074_render._withStripped = true
+mainvue_type_template_id_af715ef0_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=39809074&
+// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=af715ef0&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -4302,8 +4315,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=2dabb50c&
-var columnvue_type_template_id_2dabb50c_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=75ab695e&
+var columnvue_type_template_id_75ab695e_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4980,6 +4993,7 @@ var columnvue_type_template_id_2dabb50c_render = function () {
                         {
                           attrs: {
                             stop: "",
+                            mode: _vm.mode,
                             contents: _vm.contents || _vm.events,
                             data: scope,
                           },
@@ -5021,11 +5035,11 @@ var columnvue_type_template_id_2dabb50c_render = function () {
     2
   )
 }
-var columnvue_type_template_id_2dabb50c_staticRenderFns = []
-columnvue_type_template_id_2dabb50c_render._withStripped = true
+var columnvue_type_template_id_75ab695e_staticRenderFns = []
+columnvue_type_template_id_75ab695e_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/column.vue?vue&type=template&id=2dabb50c&
+// CONCATENATED MODULE: ./packages/data-table/src/column.vue?vue&type=template&id=75ab695e&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(13);
@@ -5454,6 +5468,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
 //
 //
 //
+//
 
 
 
@@ -5502,6 +5517,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
     }
   },
   props: {
+    mode: String,
     service: String,
     form: Boolean,
     readonly: Boolean,
@@ -5895,8 +5911,8 @@ var componentNormalizer = __webpack_require__(3);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_columnvue_type_script_lang_js_,
-  columnvue_type_template_id_2dabb50c_render,
-  columnvue_type_template_id_2dabb50c_staticRenderFns,
+  columnvue_type_template_id_75ab695e_render,
+  columnvue_type_template_id_75ab695e_staticRenderFns,
   false,
   null,
   null,
@@ -5965,8 +5981,8 @@ var children_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var children = (children_component.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/sizer.vue?vue&type=template&id=58e4111d&
-var sizervue_type_template_id_58e4111d_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/sizer.vue?vue&type=template&id=1e94400e&
+var sizervue_type_template_id_1e94400e_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -5990,6 +6006,7 @@ var sizervue_type_template_id_58e4111d_render = function () {
                   "row-key": "id",
                   "default-expand-all": "",
                   height: "500px",
+                  mode: _vm.mode,
                   data: _vm.theads,
                   thead: _vm.thead,
                   "tree-props": { children: "childHead" },
@@ -6017,11 +6034,11 @@ var sizervue_type_template_id_58e4111d_render = function () {
       )
     : _vm._e()
 }
-var sizervue_type_template_id_58e4111d_staticRenderFns = []
-sizervue_type_template_id_58e4111d_render._withStripped = true
+var sizervue_type_template_id_1e94400e_staticRenderFns = []
+sizervue_type_template_id_1e94400e_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/sizer.vue?vue&type=template&id=58e4111d&
+// CONCATENATED MODULE: ./packages/data-table/src/sizer.vue?vue&type=template&id=1e94400e&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/sizer.vue?vue&type=script&lang=js&
 var sizervue_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; };
@@ -6051,11 +6068,13 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
 //
 //
 //
+//
 
 
 /* harmony default export */ var sizervue_type_script_lang_js_ = ({
   name: 'Sizer',
   props: {
+    mode: String,
     data: Array
   },
   computed: {
@@ -6109,6 +6128,7 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
   },
   mounted: function mounted() {
     this.newThead = util["a" /* default */].extend(true, [], this.data);
+    console.log(this.mode, 90909);
   },
 
   methods: {
@@ -6191,8 +6211,8 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
 
 var sizer_component = Object(componentNormalizer["a" /* default */])(
   src_sizervue_type_script_lang_js_,
-  sizervue_type_template_id_58e4111d_render,
-  sizervue_type_template_id_58e4111d_staticRenderFns,
+  sizervue_type_template_id_1e94400e_render,
+  sizervue_type_template_id_1e94400e_staticRenderFns,
   false,
   null,
   null,
@@ -6387,6 +6407,9 @@ var mainvue_type_script_lang_js_components, _watch;
 //
 //
 //
+//
+//
+//
 
 
 
@@ -6395,6 +6418,7 @@ var mainvue_type_script_lang_js_components, _watch;
 
 
 
+var dataTableMode = util["a" /* default */].win.top.dataTableMode || util["a" /* default */].win.dataTableMode || 'default';
 /* harmony default export */ var mainvue_type_script_lang_js_ = ({
   name: 'EsDataTable',
   inheritAttrs: false,
@@ -6418,6 +6442,10 @@ var mainvue_type_script_lang_js_components, _watch;
     }
   },
   props: {
+    mode: {
+      type: String,
+      default: dataTableMode
+    },
     service: String,
     loading: {
       type: Boolean,
@@ -6665,7 +6693,8 @@ var mainvue_type_script_lang_js_components, _watch;
       config: {
         pageNum: 1,
         pageSize: 20,
-        totalCount: 0
+        totalCount: 0,
+        layout: this.mode == 'plus' ? 'total, sizes, prev, pager, next, jumper' : undefined
       },
       searchWhere: {},
       advanceWhere: {},
@@ -6868,7 +6897,7 @@ var mainvue_type_script_lang_js_components, _watch;
       }
     },
     zoom: {
-      handler: function handler(val) {
+      handler: function handler() {
         if (this.tableHeight != 'auto' && this.tableHeight !== false && this.display) {
           this.resetHeight();
           this.doLayout();
@@ -6897,7 +6926,7 @@ var mainvue_type_script_lang_js_components, _watch;
     },
     param: {
       deep: true,
-      handler: function handler(val) {
+      handler: function handler() {
         this.getTableData();
       }
     }
@@ -6907,12 +6936,6 @@ var mainvue_type_script_lang_js_components, _watch;
     handler: function handler(val) {
       if ((typeof val === 'undefined' ? 'undefined' : _typeof(val)) === 'object') {
         this.config = util["a" /* default */].extend({}, this.config, val);
-      } else {
-        this.config = {
-          pageNum: 1,
-          pageSize: 20,
-          totalCount: 0
-        };
       }
     }
   }, _watch['config.pageNum'] = function configPageNum() {
@@ -7174,6 +7197,7 @@ var mainvue_type_script_lang_js_components, _watch;
             _this10.theadData = results.theadData || [];
             _this10.list = results.data || results.records || [];
             _this10.config.totalCount = results.count || results.total || results.totalCount;
+            _this10.config.pageCount = results.pageCount;
             _this10.getOptions(_this10.theadData);
           }
         } else {
@@ -7246,6 +7270,7 @@ var mainvue_type_script_lang_js_components, _watch;
             });
           }
           _this11.config.totalCount = results.count || results.total || results.totalCount;
+          _this11.config.pageCount = results.pageCount;
           _this11.checked && _this11.$nextTick(function () {
             _this11.checkSelect(_this11.checked);
           });
@@ -7649,8 +7674,8 @@ var mainvue_type_script_lang_js_components, _watch;
                 height = height - ele.offsetHeight - parseInt(util["a" /* default */].getStyle(ele, 'margin-top'), 10) - parseInt(util["a" /* default */].getStyle(ele, 'margin-bottom'), 10);
               }
             }
-            height -= _this14.showToolbar ? 45 : 0;
-            height -= _this14.page === false ? 0 : 46;
+            height -= _this14.showToolbar ? _this14.$refs.toolbar.$el.offsetHeight : 0;
+            height -= _this14.page === false ? 0 : _this14.$refs.pagination.$el.offsetHeight;
             height -= _this14.title ? _this14.$refs.title.offsetHeight : 0;
             height -= parseInt(util["a" /* default */].getStyle(_this14.$refs.esTableContent, 'padding-top'), 10);
             height -= parseInt(util["a" /* default */].getStyle(_this14.$refs.esTableContent, 'padding-bottom'), 10);
@@ -7745,7 +7770,7 @@ var mainvue_type_script_lang_js_components, _watch;
 
 var main_component = Object(componentNormalizer["a" /* default */])(
   src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_39809074_render,
+  mainvue_type_template_id_af715ef0_render,
   staticRenderFns,
   false,
   null,