eoss-ui 0.5.77 → 0.5.78

package/lib/data-table-form.js

@@ -2312,7 +2312,7 @@ var isObject = function isObject(obj) {
  * @param {Object} [_obj] - 对象
  **/
 var isObjectEqual = function isObjectEqual(obj, _obj) {
-  if (obj === undefined && _obj || obj && _obj === undefined) {
+  if (obj === undefined && _obj || obj && _obj === undefined || obj === undefined && _obj === undefined) {
     return false;
   }
   var aProps = Object.getOwnPropertyNames(obj);

package/lib/data-table.js

@@ -2312,7 +2312,7 @@ var isObject = function isObject(obj) {
  * @param {Object} [_obj] - 对象
  **/
 var isObjectEqual = function isObjectEqual(obj, _obj) {
-  if (obj === undefined && _obj || obj && _obj === undefined) {
+  if (obj === undefined && _obj || obj && _obj === undefined || obj === undefined && _obj === undefined) {
     return false;
   }
   var aProps = Object.getOwnPropertyNames(obj);
@@ -3928,8 +3928,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=f80417f8&
-var mainvue_type_template_id_f80417f8_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=58029cb3&
+var mainvue_type_template_id_58029cb3_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4240,10 +4240,10 @@ var mainvue_type_template_id_f80417f8_render = function () {
   )
 }
 var staticRenderFns = []
-mainvue_type_template_id_f80417f8_render._withStripped = true
+mainvue_type_template_id_58029cb3_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=f80417f8&
+// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=58029cb3&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -6486,6 +6486,10 @@ var mainvue_type_script_lang_js_components, _watch;
       type: Boolean,
       default: false
     },
+    orders: {
+      type: String,
+      default: 'asc'
+    },
     // 是否筛选列功能
     filter: {
       type: Boolean,
@@ -6690,6 +6694,8 @@ var mainvue_type_script_lang_js_components, _watch;
 
     theads: {
       get: function get() {
+        var _this = this;
+
         var thead = [];
         var addfilter = false;
         var types = this.theadData.filter(function (item) {
@@ -6721,7 +6727,11 @@ var mainvue_type_script_lang_js_components, _watch;
         }
         if (this.numbers && !types.includes('index')) {
           var index = 1;
-          if (this.infiniteScroll) {
+          if (this.orders == 'desc') {
+            index = function index(num) {
+              return _this.config.totalCount - num;
+            };
+          } else if (this.infiniteScroll) {
             index = typeof this.index == 'boolean' ? 1 : this.index;
           } else if (this.index || this.index === 0) {
             index = this.index === true ? (this.config.pageNum - 1) * this.config.pageSize + 1 : this.index;
@@ -6753,15 +6763,17 @@ var mainvue_type_script_lang_js_components, _watch;
     },
     datas: {
       get: function get() {
-        var _this = this;
+        var _this2 = this;
 
         if (this.list && this.list.length) {
           return this.list;
         }
-        this.config.totalCount = this.data.length - this.lose;
+        if (this.config.totalCount == 0 && this.data.length) {
+          this.config.totalCount = this.data.length - this.lose;
+        }
         if (this.page && this.data.length > this.config.pageSize) {
           return this.data.filter(function (item, index) {
-            return index > (_this.config.pageNum - 1) * _this.config.pageSize - 1 && index < _this.config.pageNum * _this.config.pageSize;
+            return index > (_this2.config.pageNum - 1) * _this2.config.pageSize - 1 && index < _this2.config.pageNum * _this2.config.pageSize;
           });
         }
         return this.data;
@@ -6919,10 +6931,10 @@ var mainvue_type_script_lang_js_components, _watch;
     }
   }, _watch),
   beforeCreate: function beforeCreate() {
-    var _this2 = this;
+    var _this3 = this;
 
     this.getTableData = Object(external_throttle_debounce_["debounce"])(500, function (res) {
-      _this2.getTableDatas(res);
+      _this3.getTableDatas(res);
     });
   },
   created: function created() {
@@ -6947,55 +6959,55 @@ var mainvue_type_script_lang_js_components, _watch;
       return [method, url, external_qs_default.a.stringify(params), external_qs_default.a.stringify(data)].join('&');
     },
     getOptions: function getOptions(res) {
-      var _this3 = this;
+      var _this4 = this;
 
       var sysCodes = [];
       res.forEach(function (item) {
         if (item.sysCode || item.url) {
           item.sysCode && sysCodes.push(item.sysCode);
           var params = util["a" /* default */].extend({}, item.sysCode ? { sysAppCode: item.sysCode, code: item.sysCode } : {}, item.param ? item.param : {});
-          var key = _this3.getRequestKey({
-            method: _this3.method,
-            url: item.sysCode ? _this3.findCode : item.url,
+          var key = _this4.getRequestKey({
+            method: _this4.method,
+            url: item.sysCode ? _this4.findCode : item.url,
             params: params,
             data: {}
           });
-          if (!_this3.requests.includes(key)) {
+          if (!_this4.requests.includes(key)) {
             util["a" /* default */].ajax({
-              url: item.sysCode ? _this3.findCode : item.url,
-              method: _this3.method,
+              url: item.sysCode ? _this4.findCode : item.url,
+              method: _this4.method,
               params: params,
               data: params
             }).then(function (res) {
               if (res.rCode === 0) {
                 if (item.type == 'ganged') {
-                  _this3.$set(_this3.options, item.sysCode || item.field || item.prop, [JSON.parse(JSON.stringify(res.results))]);
+                  _this4.$set(_this4.options, item.sysCode || item.field || item.prop, [JSON.parse(JSON.stringify(res.results))]);
                   if (item.sysCode) {
-                    bus["a" /* default */].$emit(item.sysCode, JSON.parse(JSON.stringify(_this3.options[item.sysCode])));
+                    bus["a" /* default */].$emit(item.sysCode, JSON.parse(JSON.stringify(_this4.options[item.sysCode])));
                   }
                 } else {
-                  _this3.$set(_this3.options, item.sysCode || item.field || item.prop, JSON.parse(JSON.stringify(res.results)));
+                  _this4.$set(_this4.options, item.sysCode || item.field || item.prop, JSON.parse(JSON.stringify(res.results)));
                   if (item.sysCode) {
                     bus["a" /* default */].$emit(item.sysCode, JSON.parse(JSON.stringify(res.results)));
                   }
                 }
-                _this3.requests.push(key);
+                _this4.requests.push(key);
               } else {
                 var msg = res.msg || '系统错误，请联系管理员！';
-                _this3.$message.error(msg);
+                _this4.$message.error(msg);
               }
             }).catch(function (err) {
               if (err.message && err.message !== 'canceled') {
-                _this3.$message.error(err.message);
+                _this4.$message.error(err.message);
               }
             });
           }
         } else {
           if (item.childHead && item.childHead.length) {
-            _this3.getOptions(item.childHead);
+            _this4.getOptions(item.childHead);
           }
           if (item.children && item.children.length) {
-            _this3.getOptions(item.children);
+            _this4.getOptions(item.children);
           }
         }
       });
@@ -7007,7 +7019,7 @@ var mainvue_type_script_lang_js_components, _watch;
       return util["a" /* default */].getObjectType(item) === 'object';
     },
     chekOpenTotalArea: function chekOpenTotalArea() {
-      var _this4 = this;
+      var _this5 = this;
 
       if (this.total || this.showSummary) {
         this.showTotal = true;
@@ -7016,7 +7028,7 @@ var mainvue_type_script_lang_js_components, _watch;
       var arr = JSON.parse(JSON.stringify(this.theads));
       arr.forEach(function (item) {
         if (item.total) {
-          _this4.showTotal = true;
+          _this5.showTotal = true;
         }
       });
     },
@@ -7063,13 +7075,13 @@ var mainvue_type_script_lang_js_components, _watch;
       }
     },
     getRow: function getRow(thead, obj) {
-      var _this5 = this;
+      var _this6 = this;
 
       thead.forEach(function (item) {
         if (item.field) {
           obj[item['field']] = item.defaultValue || '';
         } else if (item.children && item.children.length) {
-          _this5.getRow(item.children, obj);
+          _this6.getRow(item.children, obj);
         }
       });
     },
@@ -7096,27 +7108,27 @@ var mainvue_type_script_lang_js_components, _watch;
       });
     },
     checkSelect: function checkSelect(newVal) {
-      var _this6 = this;
+      var _this7 = this;
 
       this.$nextTick(function () {
         if (util["a" /* default */].getObjectType(newVal) === 'array') {
           newVal.forEach(function (row) {
             if (util["a" /* default */].isObject(row)) {
-              _this6.$refs.oaTable.toggleRowSelection(row, true);
-            } else _this6.datas.forEach(function (item) {
-              if (item[_this6.checkedKey] === row) {
-                _this6.$refs.oaTable.toggleRowSelection(item, true);
+              _this7.$refs.oaTable.toggleRowSelection(row, true);
+            } else _this7.datas.forEach(function (item) {
+              if (item[_this7.checkedKey] === row) {
+                _this7.$refs.oaTable.toggleRowSelection(item, true);
                 return;
               }
             });
           });
         } else if (newVal === true) {
-          _this6.toggleAllSelection();
+          _this7.toggleAllSelection();
         }
       });
     },
     getTheads: function getTheads() {
-      var _this7 = this;
+      var _this8 = this;
 
       util["a" /* default */].ajax({
         url: this.thead,
@@ -7128,27 +7140,27 @@ var mainvue_type_script_lang_js_components, _watch;
         if (res.rCode === 0) {
           var results = res.results;
           if (Array.isArray(results)) {
-            _this7.theadData = results;
+            _this8.theadData = results;
           } else {
-            _this7.theadData = results.theadData || [];
-            _this7.list = results.data || results.records || [];
-            _this7.config.totalCount = results.count || results.total || results.totalCount;
-            _this7.getOptions(_this7.theadData);
+            _this8.theadData = results.theadData || [];
+            _this8.list = results.data || results.records || [];
+            _this8.config.totalCount = results.count || results.total || results.totalCount;
+            _this8.getOptions(_this8.theadData);
           }
         } else {
-          _this7.theadData = [];
+          _this8.theadData = [];
           var msg = res.msg || '系统错误，请联系管理员！';
-          _this7.$message.error(msg);
+          _this8.$message.error(msg);
         }
-        _this7.$emit('success', res);
+        _this8.$emit('success', res);
       }).catch(function (err) {
         if (err.message && err.message !== 'canceled') {
-          _this7.$message.error(err.message);
+          _this8.$message.error(err.message);
         }
       });
     },
     getTableDatas: function getTableDatas(res) {
-      var _this8 = this;
+      var _this9 = this;
 
       var where = void 0;
       var first = void 0;
@@ -7188,42 +7200,42 @@ var mainvue_type_script_lang_js_components, _watch;
         params: reqData,
         data: reqData
       })).then(function (res) {
-        _this8.tableLoading = false;
+        _this9.tableLoading = false;
         if (res.rCode === 0 || res.status === 'success') {
-          if (_this8.isReload) {
-            _this8.list = [];
-            _this8.isReload = false;
+          if (_this9.isReload) {
+            _this9.list = [];
+            _this9.isReload = false;
           }
-          var results = _this8.parseData !== undefined ? _this8.parseData(res.results || res.data || res) : res.results || res.data;
-          if (_this8.infiniteScroll) {
-            _this8.list = _this8.list.concat(results.data || results.records || results.list);
-            _this8.config.pageNum += 1;
+          var results = _this9.parseData !== undefined ? _this9.parseData(res.results || res.data || res) : res.results || res.data;
+          if (_this9.infiniteScroll) {
+            _this9.list = _this9.list.concat(results.data || results.records || results.list);
+            _this9.config.pageNum += 1;
           } else {
-            _this8.$nextTick(function () {
-              _this8.list = results.data || results.records || results.list || [];
-              _this8.$refs.oaTable && _this8.$refs.oaTable.resetScroll && _this8.$refs.oaTable.resetScroll(0, 0);
+            _this9.$nextTick(function () {
+              _this9.list = results.data || results.records || results.list || [];
+              _this9.$refs.oaTable && _this9.$refs.oaTable.resetScroll && _this9.$refs.oaTable.resetScroll(0, 0);
             });
           }
-          _this8.config.totalCount = results.count || results.total || results.totalCount;
-          _this8.checked && _this8.$nextTick(function () {
-            _this8.checkSelect(_this8.checked);
+          _this9.config.totalCount = results.count || results.total || results.totalCount;
+          _this9.checked && _this9.$nextTick(function () {
+            _this9.checkSelect(_this9.checked);
           });
-          if (_this8.infiniteScroll && _this8.config.totalCount === _this8.list.length) {
-            _this8.infiniteDisabled = true;
+          if (_this9.infiniteScroll && _this9.config.totalCount === _this9.list.length) {
+            _this9.infiniteDisabled = true;
           }
         } else {
-          _this8.list = [];
+          _this9.list = [];
           //this.tableHeight = false;
           var msg = res.msg || '系统错误，请联系管理员！';
-          _this8.$message.error(msg);
+          _this9.$message.error(msg);
         }
-        _this8.$emit('success', res);
+        _this9.$emit('success', res);
       }).catch(function (err) {
         //this.tableHeight = false;
         if (err.message && err.message !== 'canceled') {
-          _this8.$message.error(err.message);
+          _this9.$message.error(err.message);
         }
-        _this8.tableLoading = false;
+        _this9.tableLoading = false;
       });
     },
     selectionChange: function selectionChange(data) {
@@ -7253,7 +7265,6 @@ var mainvue_type_script_lang_js_components, _watch;
     },
     doLayout: function doLayout() {
       this.$refs.oaTable.doLayout();
-      this.$refs.oaTable.updateScroll();
     },
     sort: function sort(prop, order) {
       this.$refs.oaTable.sort(prop, order);
@@ -7269,7 +7280,7 @@ var mainvue_type_script_lang_js_components, _watch;
       this.$emit('change', data, this.datas);
     },
     handleAjax: function handleAjax(handle, row) {
-      var _this9 = this;
+      var _this10 = this;
 
       this.changeLoading(true, handle.text + '\u4E2D...');
       var params = handle.param || {};
@@ -7325,9 +7336,9 @@ var mainvue_type_script_lang_js_components, _watch;
         method: handle.method,
         format: handle.format
       })).then(function (res) {
-        _this9.changeLoading(false);
+        _this10.changeLoading(false);
         if (res.rCode === 0) {
-          _this9.$message({
+          _this10.$message({
             message: handle.text + '\u6210\u529F',
             duration: 2000,
             type: 'success',
@@ -7335,17 +7346,17 @@ var mainvue_type_script_lang_js_components, _watch;
               var first = Object.prototype.hasOwnProperty.call(handle, 'first') ? handle.first : false;
               var reload = handle.reload || true;
               if (reload) {
-                _this9.reload({}, first);
+                _this10.reload({}, first);
               }
             }
           });
         } else {
-          _this9.$message.error(res.msg || handle.text + '\u5931\u8D25\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\uFF01');
+          _this10.$message.error(res.msg || handle.text + '\u5931\u8D25\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\uFF01');
         }
       }).catch(function (err) {
-        _this9.changeLoading(false);
+        _this10.changeLoading(false);
         if (err.message && err.message !== 'canceled') {
-          _this9.$message.error(err.message);
+          _this10.$message.error(err.message);
         }
       });
     },
@@ -7370,7 +7381,7 @@ var mainvue_type_script_lang_js_components, _watch;
       return mainvue_type_script_lang_js_extends({}, obj, item);
     },
     handleClick: function handleClick(res) {
-      var _this10 = this;
+      var _this11 = this;
 
       var row = res.row,
           handle = res.handle;
@@ -7406,7 +7417,7 @@ var mainvue_type_script_lang_js_components, _watch;
             cancelButtonText: '取消',
             type: 'warning'
           }).then(function () {
-            _this10.handleAjax(handle, rows);
+            _this11.handleAjax(handle, rows);
           }).catch(function () {});
         } else {
           this.handleAjax(handle, rows);
@@ -7494,7 +7505,7 @@ var mainvue_type_script_lang_js_components, _watch;
           var type = ['selection', 'index', 'expand'];
           thead = thead.map(function (item) {
             return item.filter(function (ele) {
-              return !type.includes(ele.type) && ele.label !== text && !_this10.exportExcludeLabel.includes(ele.label);
+              return !type.includes(ele.type) && ele.label !== text && !_this11.exportExcludeLabel.includes(ele.label);
             });
           });
           util["a" /* default */].exportXls({
@@ -7594,40 +7605,40 @@ var mainvue_type_script_lang_js_components, _watch;
       }
     },
     resetHeight: function resetHeight(warn) {
-      var _this11 = this;
+      var _this12 = this;
 
       this.$nextTick(function () {
-        if (_this11.full && !_this11.height && !_this11.maxHeight) {
-          var height = _this11.$el.parentNode.offsetHeight;
+        if (_this12.full && !_this12.height && !_this12.maxHeight) {
+          var height = _this12.$el.parentNode.offsetHeight;
           if (height) {
-            height = parseInt(util["a" /* default */].getStyle(_this11.$el.parentNode, 'height', '%'), 10);
-            height = (height == NaN ? 0 : height) - parseInt(util["a" /* default */].getStyle(_this11.$el.parentNode, 'padding-top'), 10) - parseInt(util["a" /* default */].getStyle(_this11.$el.parentNode, 'padding-bottom'), 10);
-            for (var i = 0; i < _this11.$el.parentNode.childNodes.length; i++) {
-              var ele = _this11.$el.parentNode.childNodes[i];
-              if (ele !== _this11.$el && ele.offsetHeight !== undefined) {
+            height = parseInt(util["a" /* default */].getStyle(_this12.$el.parentNode, 'height', '%'), 10);
+            height = (height == NaN ? 0 : height) - parseInt(util["a" /* default */].getStyle(_this12.$el.parentNode, 'padding-top'), 10) - parseInt(util["a" /* default */].getStyle(_this12.$el.parentNode, 'padding-bottom'), 10);
+            for (var i = 0; i < _this12.$el.parentNode.childNodes.length; i++) {
+              var ele = _this12.$el.parentNode.childNodes[i];
+              if (ele !== _this12.$el && ele.offsetHeight !== undefined) {
                 height = height - ele.offsetHeight - parseInt(util["a" /* default */].getStyle(ele, 'margin-top'), 10) - parseInt(util["a" /* default */].getStyle(ele, 'margin-bottom'), 10);
               }
             }
-            height -= _this11.showToolbar ? 45 : 0;
-            height -= _this11.page === false ? 0 : 46;
-            height -= _this11.title ? _this11.$refs.title.offsetHeight : 0;
-            height -= parseInt(util["a" /* default */].getStyle(_this11.$refs.esTableContent, 'padding-top'), 10);
-            height -= parseInt(util["a" /* default */].getStyle(_this11.$refs.esTableContent, 'padding-bottom'), 10);
-            var emptyText = _this11.$refs.esTableContent.querySelector('.el-table__empty-text');
+            height -= _this12.showToolbar ? 45 : 0;
+            height -= _this12.page === false ? 0 : 46;
+            height -= _this12.title ? _this12.$refs.title.offsetHeight : 0;
+            height -= parseInt(util["a" /* default */].getStyle(_this12.$refs.esTableContent, 'padding-top'), 10);
+            height -= parseInt(util["a" /* default */].getStyle(_this12.$refs.esTableContent, 'padding-bottom'), 10);
+            var emptyText = _this12.$refs.esTableContent.querySelector('.el-table__empty-text');
             var eht = 0;
             if (emptyText) {
               eht = emptyText.offsetHeight;
-              var thead = _this11.$refs.esTableContent.querySelector('.el-table__header');
+              var thead = _this12.$refs.esTableContent.querySelector('.el-table__header');
               thead && (eht += thead.offsetHeight);
             }
             if (height > 1 && height - eht > 1) {
-              _this11.tableHeight = height;
+              _this12.tableHeight = height;
             } else {
-              console.warn(_this11.$el.parentNode, '\u83B7\u53D6\u4E0D\u5230\u9AD8\u5EA6\uFF01');
+              console.warn(_this12.$el.parentNode, '\u83B7\u53D6\u4E0D\u5230\u9AD8\u5EA6\uFF01');
             }
           } else if (!warn) {
             setTimeout(function () {
-              _this11.resetHeight(true);
+              _this12.resetHeight(true);
             }, 1000);
           }
         }
@@ -7660,31 +7671,31 @@ var mainvue_type_script_lang_js_components, _watch;
       this.$emit('update-drag-sort', data, event);
     },
     mergeThead: function mergeThead(res) {
-      var _this12 = this;
+      var _this13 = this;
 
       this.theadData = res;
       this.icon = true;
       setTimeout(function () {
-        _this12.show = true;
+        _this13.show = true;
       }, 100);
     },
     setOptions: function setOptions(val, sysCode) {
       this.$set(this.options, sysCode, val);
     },
     bindEventBus: function bindEventBus() {
-      var _this13 = this;
+      var _this14 = this;
 
       this.sysCodes.forEach(function (item) {
         bus["a" /* default */].$on(item, function (val) {
-          _this13.setOptions(val, item);
+          _this14.setOptions(val, item);
         });
       });
     },
     unbindEventBus: function unbindEventBus() {
-      var _this14 = this;
+      var _this15 = this;
 
       this.sysCodes.forEach(function (item) {
-        bus["a" /* default */].$off(item, _this14.setOptions);
+        bus["a" /* default */].$off(item, _this15.setOptions);
       });
     },
     reset: function reset() {
@@ -7704,7 +7715,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_f80417f8_render,
+  mainvue_type_template_id_58029cb3_render,
   staticRenderFns,
   false,
   null,

package/lib/date-picker.js

@@ -2313,7 +2313,7 @@ var isObject = function isObject(obj) {
  * @param {Object} [_obj] - 对象
  **/
 var isObjectEqual = function isObjectEqual(obj, _obj) {
-  if (obj === undefined && _obj || obj && _obj === undefined) {
+  if (obj === undefined && _obj || obj && _obj === undefined || obj === undefined && _obj === undefined) {
     return false;
   }
   var aProps = Object.getOwnPropertyNames(obj);

package/lib/dialog.js

@@ -2312,7 +2312,7 @@ var isObject = function isObject(obj) {
  * @param {Object} [_obj] - 对象
  **/
 var isObjectEqual = function isObjectEqual(obj, _obj) {
-  if (obj === undefined && _obj || obj && _obj === undefined) {
+  if (obj === undefined && _obj || obj && _obj === undefined || obj === undefined && _obj === undefined) {
     return false;
   }
   var aProps = Object.getOwnPropertyNames(obj);