evui 3.3.26 → 3.3.27

package/dist/evui.common.js

@@ -7959,7 +7959,7 @@ $({ target: 'Number', stat: true }, {
 /***/ "9224":
 /***/ (function(module) {
 
-module.exports = JSON.parse("{\"a\":\"3.3.26\"}");
+module.exports = JSON.parse("{\"a\":\"3.3.27\"}");
 
 /***/ }),
 
@@ -29328,9 +29328,6 @@ var uses_sortEvent = function sortEvent(params) {
       getColumnIndex = params.getColumnIndex,
       updatePagingInfo = params.updatePagingInfo;
 
-  var _getCurrentInstance5 = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["getCurrentInstance"])(),
-      props = _getCurrentInstance5.props;
-
   function OrderQueue() {
     var _this2 = this;
 
@@ -29375,7 +29372,7 @@ var uses_sortEvent = function sortEvent(params) {
 
 
   var setSort = function setSort() {
-    var _props$columns$index;
+    var _stores$orderedColumn;
 
     var setDesc = function setDesc(a, b) {
       return a > b ? -1 : 1;
@@ -29405,19 +29402,40 @@ var uses_sortEvent = function sortEvent(params) {
     }
 
     var index = getColumnIndex(sortInfo.sortField);
-    var type = ((_props$columns$index = props.columns[index]) === null || _props$columns$index === void 0 ? void 0 : _props$columns$index.type) || 'string';
+    var type = ((_stores$orderedColumn = stores.orderedColumns[index]) === null || _stores$orderedColumn === void 0 ? void 0 : _stores$orderedColumn.type) || 'string';
     var sortFn = sortInfo.sortOrder === 'desc' ? setDesc : setAsc;
     var numberSortFn = sortInfo.sortOrder === 'desc' ? numberSetDesc : numberSetAsc;
 
+    var getColumnValue = function getColumnValue(a, b) {
+      var aCol = a[uses_ROW_DATA_INDEX][index];
+      var bCol = b[uses_ROW_DATA_INDEX][index];
+
+      if (a[uses_ROW_DATA_INDEX][index] && _typeof(a[uses_ROW_DATA_INDEX][index]) === 'object') {
+        var _stores$orderedColumn2, _stores$orderedColumn3;
+
+        aCol = a[uses_ROW_DATA_INDEX][index][(_stores$orderedColumn2 = stores.orderedColumns[index]) === null || _stores$orderedColumn2 === void 0 ? void 0 : _stores$orderedColumn2.field];
+        bCol = b[uses_ROW_DATA_INDEX][index][(_stores$orderedColumn3 = stores.orderedColumns[index]) === null || _stores$orderedColumn3 === void 0 ? void 0 : _stores$orderedColumn3.field];
+      }
+
+      return {
+        aCol: aCol,
+        bCol: bCol
+      };
+    };
+
     switch (type) {
       case 'string':
         stores.store.sort(function (a, b) {
-          if (!a[uses_ROW_DATA_INDEX][index] || typeof a[uses_ROW_DATA_INDEX][index] === 'string') {
-            var _a$ROW_DATA_INDEX$ind, _b$ROW_DATA_INDEX$ind;
+          var _getColumnValue = getColumnValue(a, b),
+              aCol = _getColumnValue.aCol,
+              bCol = _getColumnValue.bCol;
 
-            a[uses_ROW_DATA_INDEX][index] = a[uses_ROW_DATA_INDEX][index] || '';
-            b[uses_ROW_DATA_INDEX][index] = b[uses_ROW_DATA_INDEX][index] || '';
-            return sortFn((_a$ROW_DATA_INDEX$ind = a[uses_ROW_DATA_INDEX][index]) === null || _a$ROW_DATA_INDEX$ind === void 0 ? void 0 : _a$ROW_DATA_INDEX$ind.toLowerCase(), (_b$ROW_DATA_INDEX$ind = b[uses_ROW_DATA_INDEX][index]) === null || _b$ROW_DATA_INDEX$ind === void 0 ? void 0 : _b$ROW_DATA_INDEX$ind.toLowerCase());
+          if ((!aCol || typeof aCol === 'string') && (!bCol || typeof bCol === 'string')) {
+            var _aCol, _bCol;
+
+            aCol = aCol || '';
+            bCol = bCol || '';
+            return sortFn((_aCol = aCol) === null || _aCol === void 0 ? void 0 : _aCol.toLowerCase(), (_bCol = bCol) === null || _bCol === void 0 ? void 0 : _bCol.toLowerCase());
           }
 
           return 0;
@@ -29426,12 +29444,16 @@ var uses_sortEvent = function sortEvent(params) {
 
       case 'stringNumber':
         stores.store.sort(function (a, b) {
-          if (!a[uses_ROW_DATA_INDEX][index] || typeof a[uses_ROW_DATA_INDEX][index] === 'string' || typeof a[uses_ROW_DATA_INDEX][index] === 'number') {
-            var _a$ROW_DATA_INDEX$ind2, _b$ROW_DATA_INDEX$ind2;
+          var _getColumnValue2 = getColumnValue(a, b),
+              aCol = _getColumnValue2.aCol,
+              bCol = _getColumnValue2.bCol;
+
+          if (!aCol || typeof aCol === 'string' || typeof aCol === 'number') {
+            var _aCol2, _bCol2;
 
-            a[uses_ROW_DATA_INDEX][index] = a[uses_ROW_DATA_INDEX][index] === '' ? null : a[uses_ROW_DATA_INDEX][index];
-            b[uses_ROW_DATA_INDEX][index] = b[uses_ROW_DATA_INDEX][index] === '' ? null : b[uses_ROW_DATA_INDEX][index];
-            return numberSortFn((_a$ROW_DATA_INDEX$ind2 = a[uses_ROW_DATA_INDEX][index]) !== null && _a$ROW_DATA_INDEX$ind2 !== void 0 ? _a$ROW_DATA_INDEX$ind2 : null, (_b$ROW_DATA_INDEX$ind2 = b[uses_ROW_DATA_INDEX][index]) !== null && _b$ROW_DATA_INDEX$ind2 !== void 0 ? _b$ROW_DATA_INDEX$ind2 : null);
+            aCol = aCol === '' ? null : aCol;
+            bCol = bCol === '' ? null : bCol;
+            return numberSortFn((_aCol2 = aCol) !== null && _aCol2 !== void 0 ? _aCol2 : null, (_bCol2 = bCol) !== null && _bCol2 !== void 0 ? _bCol2 : null);
           }
 
           return 0;
@@ -29440,10 +29462,12 @@ var uses_sortEvent = function sortEvent(params) {
 
       default:
         stores.store.sort(function (a, b) {
-          if (!a[uses_ROW_DATA_INDEX][index] || typeof a[uses_ROW_DATA_INDEX][index] === 'number' || typeof a[uses_ROW_DATA_INDEX][index] === 'boolean') {
-            var _a$ROW_DATA_INDEX$ind3, _b$ROW_DATA_INDEX$ind3;
+          var _getColumnValue3 = getColumnValue(a, b),
+              aCol = _getColumnValue3.aCol,
+              bCol = _getColumnValue3.bCol;
 
-            return numberSortFn((_a$ROW_DATA_INDEX$ind3 = a[uses_ROW_DATA_INDEX][index]) !== null && _a$ROW_DATA_INDEX$ind3 !== void 0 ? _a$ROW_DATA_INDEX$ind3 : null, (_b$ROW_DATA_INDEX$ind3 = b[uses_ROW_DATA_INDEX][index]) !== null && _b$ROW_DATA_INDEX$ind3 !== void 0 ? _b$ROW_DATA_INDEX$ind3 : null);
+          if (!aCol || typeof aCol === 'number' || typeof aCol === 'boolean') {
+            return numberSortFn(aCol !== null && aCol !== void 0 ? aCol : null, bCol !== null && bCol !== void 0 ? bCol : null);
           }
 
           return 0;
@@ -29458,8 +29482,8 @@ var uses_sortEvent = function sortEvent(params) {
   };
 };
 var uses_filterEvent = function filterEvent(params) {
-  var _getCurrentInstance6 = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["getCurrentInstance"])(),
-      props = _getCurrentInstance6.props;
+  var _getCurrentInstance5 = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["getCurrentInstance"])(),
+      props = _getCurrentInstance5.props;
 
   var filterInfo = params.filterInfo,
       stores = params.stores,
@@ -29744,8 +29768,8 @@ var uses_filterEvent = function filterEvent(params) {
   };
 };
 var uses_contextMenuEvent = function contextMenuEvent(params) {
-  var _getCurrentInstance7 = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["getCurrentInstance"])(),
-      emit = _getCurrentInstance7.emit;
+  var _getCurrentInstance6 = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["getCurrentInstance"])(),
+      emit = _getCurrentInstance6.emit;
 
   var contextInfo = params.contextInfo,
       stores = params.stores,
@@ -29835,8 +29859,8 @@ var uses_contextMenuEvent = function contextMenuEvent(params) {
   };
 };
 var uses_storeEvent = function storeEvent(params) {
-  var _getCurrentInstance8 = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["getCurrentInstance"])(),
-      props = _getCurrentInstance8.props;
+  var _getCurrentInstance7 = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["getCurrentInstance"])(),
+      props = _getCurrentInstance7.props;
 
   var selectInfo = params.selectInfo,
       checkInfo = params.checkInfo,
@@ -29898,8 +29922,8 @@ var uses_storeEvent = function storeEvent(params) {
   };
 };
 var uses_pagingEvent = function pagingEvent(params) {
-  var _getCurrentInstance9 = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["getCurrentInstance"])(),
-      emit = _getCurrentInstance9.emit;
+  var _getCurrentInstance8 = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["getCurrentInstance"])(),
+      emit = _getCurrentInstance8.emit;
 
   var stores = params.stores,
       pageInfo = params.pageInfo,