eoss-ui 0.5.49 → 0.5.50

package/lib/wujie.js

@@ -151,6 +151,7 @@ var JSONbigToString = json_bigint__WEBPACK_IMPORTED_MODULE_3___default()({ store
  * @param {Object} [loading] - loading加载对象
  * @param {String} [publicKey] - sm2加密公钥
  * @param {Array} [secret] - 要加密的字段属性名称，默认所有
+ * @param {Array} [encodes] - 需要对参数值进行encodeURIComponent编码的参数值名称
  **/
 // 请求
 var pendingRequest = new Map();
@@ -186,7 +187,9 @@ var ajax = function ajax(_ref) {
       defaults = _ref$defaults === undefined ? false : _ref$defaults,
       loading = _ref.loading,
       publicKey = _ref.publicKey,
-      secret = _ref.secret;
+      secret = _ref.secret,
+      _ref$encodes = _ref.encodes,
+      encodes = _ref$encodes === undefined ? ['cd'] : _ref$encodes;
 
   var header = headers || {};
   if (!method) {
@@ -416,6 +419,17 @@ var ajax = function ajax(_ref) {
   if (!mix) {
     if (method === 'get') {
       data = {};
+      // params = qs.stringify(params, {arrayFormat: 'brackets'});
+      if (encodes && encodes.length) {
+        var other = {};
+        for (var i in params) {
+          if (encodes.includes(i)) {
+            other[i] = encodeURIComponent(params[i]);
+            delete params[i];
+          }
+        }
+        url = urlJoinParams({ url: url, param: other });
+      }
     } else {
       params = {};
     }
@@ -432,10 +446,10 @@ var ajax = function ajax(_ref) {
           }
         });
       } else {
-        for (var i in params) {
-          if (params[i] !== '' && params[i] !== null) {
-            params[i] = esmEncrypt({
-              data: params[i],
+        for (var _i in params) {
+          if (params[_i] !== '' && params[_i] !== null) {
+            params[_i] = esmEncrypt({
+              data: params[_i],
               key: publicKey
             });
           }
@@ -453,10 +467,10 @@ var ajax = function ajax(_ref) {
           }
         });
       } else {
-        for (var _i in data) {
-          if (data[_i] !== '' && data[_i] !== null) {
-            data[_i] = esmEncrypt({
-              data: data[_i],
+        for (var _i2 in data) {
+          if (data[_i2] !== '' && data[_i2] !== null) {
+            data[_i2] = esmEncrypt({
+              data: data[_i2],
               key: publicKey
             });
           }
@@ -503,10 +517,10 @@ var arrUnique = function arrUnique(data, key) {
     }
   } else {
     var obj = {};
-    for (var _i2 = 0; _i2 < data.length; _i2++) {
-      if (!obj[data[_i2][key]]) {
-        newArr.push(data[_i2]);
-        obj[data[_i2][key]] = true;
+    for (var _i3 = 0; _i3 < data.length; _i3++) {
+      if (!obj[data[_i3][key]]) {
+        newArr.push(data[_i3]);
+        obj[data[_i3][key]] = true;
       }
     }
   }
@@ -985,12 +999,12 @@ var exportXls = function exportXls(_ref6) {
     }
     tbody += '</tr>';
   }
-  for (var _i3 in others) {
-    fields.splice(_i3, 0, others[_i3][0]);
-    aligns.splice(_i3, 0, others[_i3][1]);
+  for (var _i4 in others) {
+    fields.splice(_i4, 0, others[_i4][0]);
+    aligns.splice(_i4, 0, others[_i4][1]);
   }
 
-  var _loop2 = function _loop2(_i4) {
+  var _loop2 = function _loop2(_i5) {
     tbody += '<tr>';
 
     var _loop3 = function _loop3(_x2) {
@@ -998,9 +1012,9 @@ var exportXls = function exportXls(_ref6) {
       var valueKey = keys[fields[_x2]] && keys[fields[_x2]].valueKey ? keys[fields[_x2]].valueKey : 'value';
       var labelKey = keys[fields[_x2]] && keys[fields[_x2]].labelKey ? keys[fields[_x2]].labelKey : 'name';
       if (option[fields[_x2]]) {
-        if (Array.isArray(data[_i4][fields[_x2]])) {
+        if (Array.isArray(data[_i5][fields[_x2]])) {
           field = [];
-          data[_i4][fields[_x2]].forEach(function (ele) {
+          data[_i5][fields[_x2]].forEach(function (ele) {
             option[fields[_x2]].forEach(function (item) {
               // eslint-disable-next-line eqeqeq
               if (item[valueKey] == ele) {
@@ -1010,9 +1024,9 @@ var exportXls = function exportXls(_ref6) {
             });
           });
           field = field.join(' ');
-        } else if (typeof data[_i4][fields[_x2]] === 'string' && keys[fields[_x2]] && keys[fields[_x2]].multiple) {
+        } else if (typeof data[_i5][fields[_x2]] === 'string' && keys[fields[_x2]] && keys[fields[_x2]].multiple) {
           field = [];
-          data[_i4][fields[_x2]].split(',').forEach(function (ele) {
+          data[_i5][fields[_x2]].split(',').forEach(function (ele) {
             option[fields[_x2]].forEach(function (item) {
               // eslint-disable-next-line eqeqeq
               if (item[valueKey] == ele) {
@@ -1025,24 +1039,24 @@ var exportXls = function exportXls(_ref6) {
         } else {
           option[fields[_x2]].forEach(function (item) {
             // eslint-disable-next-line eqeqeq
-            if (item[valueKey] == data[_i4][fields[_x2]]) {
+            if (item[valueKey] == data[_i5][fields[_x2]]) {
               field = item[labelKey];
               return;
             }
           });
         }
-      } else if (_typeof(data[_i4][fields[_x2]]) === 'object' && keys[fields[_x2]]) {
-        if (Array.isArray(data[_i4][fields[_x2]])) {
-          data[_i4][fields[_x2]].forEach(function (item) {
+      } else if (_typeof(data[_i5][fields[_x2]]) === 'object' && keys[fields[_x2]]) {
+        if (Array.isArray(data[_i5][fields[_x2]])) {
+          data[_i5][fields[_x2]].forEach(function (item) {
             field = [];
             field.push({}.toString.call(item) === '[object Object]' ? item[labelKey] : item);
           });
           field = field.join(' ');
         } else {
-          field = data[_i4][fields[_x2]][labelKey];
+          field = data[_i5][fields[_x2]][labelKey];
         }
       } else {
-        field = data[_i4][fields[_x2]];
+        field = data[_i5][fields[_x2]];
       }
       tbody += '<td align="' + aligns[_x2] + '">' + field + '</td>';
     };
@@ -1053,8 +1067,8 @@ var exportXls = function exportXls(_ref6) {
     tbody += '</tr>';
   };
 
-  for (var _i4 = 0; _i4 < data.length; _i4++) {
-    _loop2(_i4);
+  for (var _i5 = 0; _i5 < data.length; _i5++) {
+    _loop2(_i5);
   }
   if (!name) {
     name = 'table_' + new Date().getTime();
@@ -1510,8 +1524,8 @@ var getRgb = function getRgb($color) {
       $color = colorNew;
     }
     // 处理六位的颜色值，转为RGB
-    for (var _i5 = 1; _i5 < 7; _i5 += 2) {
-      rgb.push(parseInt('0x' + $color.slice(_i5, _i5 + 2), 16));
+    for (var _i6 = 1; _i6 < 7; _i6 += 2) {
+      rgb.push(parseInt('0x' + $color.slice(_i6, _i6 + 2), 16));
     }
   } else {
     rgb = $color.replace(/(?:\(|\)|rgb|RGB)*/g, '').split(',');
@@ -2600,22 +2614,22 @@ var setStorage = function setStorage(_ref14) {
         localStorage.setItem(key[i], value);
       }
     } else {
-      for (var _i6 in key) {
-        var val = _typeof(key[_i6]) === 'object' ? JSON.stringify(key[_i6]) : key[_i6];
-        localStorage.setItem(_i6, val);
+      for (var _i7 in key) {
+        var val = _typeof(key[_i7]) === 'object' ? JSON.stringify(key[_i7]) : key[_i7];
+        localStorage.setItem(_i7, val);
       }
     }
   } else {
     if (typeof key === 'string') {
       sessionStorage.setItem(key, value);
     } else if (Array.isArray(key)) {
-      for (var _i7 in key) {
-        sessionStorage.setItem(key[_i7], value);
+      for (var _i8 in key) {
+        sessionStorage.setItem(key[_i8], value);
       }
     } else {
-      for (var _i8 in key) {
-        var _val = _typeof(key[_i8]) === 'object' ? JSON.stringify(key[_i8]) : key[_i8];
-        sessionStorage.setItem(_i8, _val);
+      for (var _i9 in key) {
+        var _val = _typeof(key[_i9]) === 'object' ? JSON.stringify(key[_i9]) : key[_i9];
+        sessionStorage.setItem(_i9, _val);
       }
     }
   }
@@ -2833,17 +2847,18 @@ var toFunction = function toFunction(str) {
  * @date 2022年5月7日
  * @param {string} [$color] - 颜色值
  **/
-var updateTheme = function updateTheme($color, send) {
-  $color = $color ? $color : '#409eff';
+var updateTheme = function updateTheme(color, send) {
+  color = color ? color : '#409eff';
   if (send === undefined) {
     send = true;
   }
-  document.documentElement.style.setProperty('--theme-primary', $color);
+  localStorage.setItem('theme', color);
+  document.documentElement.style.setProperty('--theme-primary', color);
   for (var i = 1; i < 11; i++) {
     if (i === 6) {
-      document.documentElement.style.setProperty('--theme-primary-light-' + i, $color);
+      document.documentElement.style.setProperty('--theme-primary-light-' + i, color);
     } else {
-      var light = getColor($color, i);
+      var light = getColor(color, i);
       document.documentElement.style.setProperty('--theme-primary-light-' + i, light);
     }
   }

package/lib/wxlogin.js

@@ -151,6 +151,7 @@ var JSONbigToString = json_bigint__WEBPACK_IMPORTED_MODULE_3___default()({ store
  * @param {Object} [loading] - loading加载对象
  * @param {String} [publicKey] - sm2加密公钥
  * @param {Array} [secret] - 要加密的字段属性名称，默认所有
+ * @param {Array} [encodes] - 需要对参数值进行encodeURIComponent编码的参数值名称
  **/
 // 请求
 var pendingRequest = new Map();
@@ -186,7 +187,9 @@ var ajax = function ajax(_ref) {
       defaults = _ref$defaults === undefined ? false : _ref$defaults,
       loading = _ref.loading,
       publicKey = _ref.publicKey,
-      secret = _ref.secret;
+      secret = _ref.secret,
+      _ref$encodes = _ref.encodes,
+      encodes = _ref$encodes === undefined ? ['cd'] : _ref$encodes;
 
   var header = headers || {};
   if (!method) {
@@ -416,6 +419,17 @@ var ajax = function ajax(_ref) {
   if (!mix) {
     if (method === 'get') {
       data = {};
+      // params = qs.stringify(params, {arrayFormat: 'brackets'});
+      if (encodes && encodes.length) {
+        var other = {};
+        for (var i in params) {
+          if (encodes.includes(i)) {
+            other[i] = encodeURIComponent(params[i]);
+            delete params[i];
+          }
+        }
+        url = urlJoinParams({ url: url, param: other });
+      }
     } else {
       params = {};
     }
@@ -432,10 +446,10 @@ var ajax = function ajax(_ref) {
           }
         });
       } else {
-        for (var i in params) {
-          if (params[i] !== '' && params[i] !== null) {
-            params[i] = esmEncrypt({
-              data: params[i],
+        for (var _i in params) {
+          if (params[_i] !== '' && params[_i] !== null) {
+            params[_i] = esmEncrypt({
+              data: params[_i],
               key: publicKey
             });
           }
@@ -453,10 +467,10 @@ var ajax = function ajax(_ref) {
           }
         });
       } else {
-        for (var _i in data) {
-          if (data[_i] !== '' && data[_i] !== null) {
-            data[_i] = esmEncrypt({
-              data: data[_i],
+        for (var _i2 in data) {
+          if (data[_i2] !== '' && data[_i2] !== null) {
+            data[_i2] = esmEncrypt({
+              data: data[_i2],
               key: publicKey
             });
           }
@@ -503,10 +517,10 @@ var arrUnique = function arrUnique(data, key) {
     }
   } else {
     var obj = {};
-    for (var _i2 = 0; _i2 < data.length; _i2++) {
-      if (!obj[data[_i2][key]]) {
-        newArr.push(data[_i2]);
-        obj[data[_i2][key]] = true;
+    for (var _i3 = 0; _i3 < data.length; _i3++) {
+      if (!obj[data[_i3][key]]) {
+        newArr.push(data[_i3]);
+        obj[data[_i3][key]] = true;
       }
     }
   }
@@ -985,12 +999,12 @@ var exportXls = function exportXls(_ref6) {
     }
     tbody += '</tr>';
   }
-  for (var _i3 in others) {
-    fields.splice(_i3, 0, others[_i3][0]);
-    aligns.splice(_i3, 0, others[_i3][1]);
+  for (var _i4 in others) {
+    fields.splice(_i4, 0, others[_i4][0]);
+    aligns.splice(_i4, 0, others[_i4][1]);
   }
 
-  var _loop2 = function _loop2(_i4) {
+  var _loop2 = function _loop2(_i5) {
     tbody += '<tr>';
 
     var _loop3 = function _loop3(_x2) {
@@ -998,9 +1012,9 @@ var exportXls = function exportXls(_ref6) {
       var valueKey = keys[fields[_x2]] && keys[fields[_x2]].valueKey ? keys[fields[_x2]].valueKey : 'value';
       var labelKey = keys[fields[_x2]] && keys[fields[_x2]].labelKey ? keys[fields[_x2]].labelKey : 'name';
       if (option[fields[_x2]]) {
-        if (Array.isArray(data[_i4][fields[_x2]])) {
+        if (Array.isArray(data[_i5][fields[_x2]])) {
           field = [];
-          data[_i4][fields[_x2]].forEach(function (ele) {
+          data[_i5][fields[_x2]].forEach(function (ele) {
             option[fields[_x2]].forEach(function (item) {
               // eslint-disable-next-line eqeqeq
               if (item[valueKey] == ele) {
@@ -1010,9 +1024,9 @@ var exportXls = function exportXls(_ref6) {
             });
           });
           field = field.join(' ');
-        } else if (typeof data[_i4][fields[_x2]] === 'string' && keys[fields[_x2]] && keys[fields[_x2]].multiple) {
+        } else if (typeof data[_i5][fields[_x2]] === 'string' && keys[fields[_x2]] && keys[fields[_x2]].multiple) {
           field = [];
-          data[_i4][fields[_x2]].split(',').forEach(function (ele) {
+          data[_i5][fields[_x2]].split(',').forEach(function (ele) {
             option[fields[_x2]].forEach(function (item) {
               // eslint-disable-next-line eqeqeq
               if (item[valueKey] == ele) {
@@ -1025,24 +1039,24 @@ var exportXls = function exportXls(_ref6) {
         } else {
           option[fields[_x2]].forEach(function (item) {
             // eslint-disable-next-line eqeqeq
-            if (item[valueKey] == data[_i4][fields[_x2]]) {
+            if (item[valueKey] == data[_i5][fields[_x2]]) {
               field = item[labelKey];
               return;
             }
           });
         }
-      } else if (_typeof(data[_i4][fields[_x2]]) === 'object' && keys[fields[_x2]]) {
-        if (Array.isArray(data[_i4][fields[_x2]])) {
-          data[_i4][fields[_x2]].forEach(function (item) {
+      } else if (_typeof(data[_i5][fields[_x2]]) === 'object' && keys[fields[_x2]]) {
+        if (Array.isArray(data[_i5][fields[_x2]])) {
+          data[_i5][fields[_x2]].forEach(function (item) {
             field = [];
             field.push({}.toString.call(item) === '[object Object]' ? item[labelKey] : item);
           });
           field = field.join(' ');
         } else {
-          field = data[_i4][fields[_x2]][labelKey];
+          field = data[_i5][fields[_x2]][labelKey];
         }
       } else {
-        field = data[_i4][fields[_x2]];
+        field = data[_i5][fields[_x2]];
       }
       tbody += '<td align="' + aligns[_x2] + '">' + field + '</td>';
     };
@@ -1053,8 +1067,8 @@ var exportXls = function exportXls(_ref6) {
     tbody += '</tr>';
   };
 
-  for (var _i4 = 0; _i4 < data.length; _i4++) {
-    _loop2(_i4);
+  for (var _i5 = 0; _i5 < data.length; _i5++) {
+    _loop2(_i5);
   }
   if (!name) {
     name = 'table_' + new Date().getTime();
@@ -1510,8 +1524,8 @@ var getRgb = function getRgb($color) {
       $color = colorNew;
     }
     // 处理六位的颜色值，转为RGB
-    for (var _i5 = 1; _i5 < 7; _i5 += 2) {
-      rgb.push(parseInt('0x' + $color.slice(_i5, _i5 + 2), 16));
+    for (var _i6 = 1; _i6 < 7; _i6 += 2) {
+      rgb.push(parseInt('0x' + $color.slice(_i6, _i6 + 2), 16));
     }
   } else {
     rgb = $color.replace(/(?:\(|\)|rgb|RGB)*/g, '').split(',');
@@ -2600,22 +2614,22 @@ var setStorage = function setStorage(_ref14) {
         localStorage.setItem(key[i], value);
       }
     } else {
-      for (var _i6 in key) {
-        var val = _typeof(key[_i6]) === 'object' ? JSON.stringify(key[_i6]) : key[_i6];
-        localStorage.setItem(_i6, val);
+      for (var _i7 in key) {
+        var val = _typeof(key[_i7]) === 'object' ? JSON.stringify(key[_i7]) : key[_i7];
+        localStorage.setItem(_i7, val);
       }
     }
   } else {
     if (typeof key === 'string') {
       sessionStorage.setItem(key, value);
     } else if (Array.isArray(key)) {
-      for (var _i7 in key) {
-        sessionStorage.setItem(key[_i7], value);
+      for (var _i8 in key) {
+        sessionStorage.setItem(key[_i8], value);
       }
     } else {
-      for (var _i8 in key) {
-        var _val = _typeof(key[_i8]) === 'object' ? JSON.stringify(key[_i8]) : key[_i8];
-        sessionStorage.setItem(_i8, _val);
+      for (var _i9 in key) {
+        var _val = _typeof(key[_i9]) === 'object' ? JSON.stringify(key[_i9]) : key[_i9];
+        sessionStorage.setItem(_i9, _val);
       }
     }
   }
@@ -2833,17 +2847,18 @@ var toFunction = function toFunction(str) {
  * @date 2022年5月7日
  * @param {string} [$color] - 颜色值
  **/
-var updateTheme = function updateTheme($color, send) {
-  $color = $color ? $color : '#409eff';
+var updateTheme = function updateTheme(color, send) {
+  color = color ? color : '#409eff';
   if (send === undefined) {
     send = true;
   }
-  document.documentElement.style.setProperty('--theme-primary', $color);
+  localStorage.setItem('theme', color);
+  document.documentElement.style.setProperty('--theme-primary', color);
   for (var i = 1; i < 11; i++) {
     if (i === 6) {
-      document.documentElement.style.setProperty('--theme-primary-light-' + i, $color);
+      document.documentElement.style.setProperty('--theme-primary-light-' + i, color);
     } else {
-      var light = getColor($color, i);
+      var light = getColor(color, i);
       document.documentElement.style.setProperty('--theme-primary-light-' + i, light);
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.5.49",
+  "version": "0.5.50",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [

package/packages/data-table/src/main.vue

@@ -199,6 +199,7 @@ export default {
       type: String,
       default: 'get'
     },
+    isEncodeURI: Boolean,
     format: {
       type: Boolean,
       default: true
@@ -377,6 +378,12 @@ export default {
     isJoin: {
       type: Boolean,
       default: true
+    },
+    ajaxConfig: {
+      type: Object,
+      default() {
+        return {};
+      }
     }
   },
   data() {
@@ -913,6 +920,7 @@ export default {
       this.tableLoading = true;
       util
         .ajax({
+          ...this.ajaxConfig,
           url: this.url,
           method: this.method,
           format: this.format,
@@ -1049,6 +1057,7 @@ export default {
       let keys = Object.keys(params);
       util
         .ajax({
+          ...(handle.ajaxConfig || {}),
           url: handle.action,
           data:
             keys.length == 1 && handle.format === false

package/packages/form/src/main.vue

@@ -4042,7 +4042,13 @@ export default {
     zoom: false,
     showMsg: true,
     validated: Function,
-    enterSubmit: Boolean
+    enterSubmit: Boolean,
+    ajaxConfig: {
+      type: Object,
+      default() {
+        return {};
+      }
+    }
   },
   data() {
     return {
@@ -4905,6 +4911,7 @@ export default {
                 }
                 await util
                   .ajax({
+                    ...this.ajaxConfig,
                     url:
                       typeof this.action === 'object'
                         ? this.action[this.actionType]
@@ -4984,6 +4991,7 @@ export default {
               }
               await util
                 .ajax({
+                  ...this.ajaxConfig,
                   url:
                     typeof this.action === 'object'
                       ? this.action[this.actionType]

package/packages/main/src/main.vue

@@ -1064,7 +1064,7 @@ export default {
             if (typeof id === 'string') {
               this.isTabs = false;
             }
-            if (item.pid === 'root') {
+            if (item.pid === 'root' || Array.isArray(id)) {
               return [item.id].concat(id);
             } else if (typeof id === 'string') {
               return [item.id, id];

package/packages/main/src/userinfo.vue

@@ -49,10 +49,10 @@ export default {
         job: '',
         orgName: '',
         depName: '',
-        idcard: '',
+        idCard: '',
         phone: '',
         email: '',
-        officetel: '',
+        officeTel: '',
         oldpassword: '',
         password: '',
         notify: []
@@ -272,10 +272,10 @@ export default {
             this.results = results.simpleUserInfo;
             this.values.orgName = results.simpleUserInfo.orgName;
             this.values.depName = results.simpleUserInfo.depName;
-            this.values.idcard = results.simpleUserInfo.idcard;
+            this.values.idCard = results.simpleUserInfo.idCard;
             this.values.phone = results.simpleUserInfo.phone;
             this.values.email = results.simpleUserInfo.email;
-            this.values.officetel = results.simpleUserInfo.officetel;
+            this.values.officeTel = results.simpleUserInfo.officeTel;
             if (results.userScanBindImgUrl) {
               this.userScanBindImgUrl = results.userScanBindImgUrl;
               this.qrcode =
@@ -356,7 +356,7 @@ export default {
           url: updateUserInfo,
           params: {
             email: this.values.email,
-            officeTel: this.values.officetel,
+            officeTel: this.values.officeTel,
             phone: this.values.phone,
             oldPassword:
               this.secret &&