eoss-ui 0.4.83 → 0.4.85

package/lib/wxlogin.js

@@ -147,6 +147,8 @@ var JSONbigToString = json_bigint__WEBPACK_IMPORTED_MODULE_3___default()({ store
  * @param {Boolean} [mix = false] - 是否混合传参
  * @param {Boolean} [defaults = false] - 是否传入默认参数userId
  * @param {Object} [loading] - loading加载对象
+ * @param {String} [publicKey] - sm2加密公钥
+ * @param {Array} [secret] - 要加密的字段属性名称，默认所有
  **/
 // 请求
 var pendingRequest = new Map();
@@ -180,7 +182,9 @@ var ajax = function ajax(_ref) {
       mix = _ref$mix === undefined ? false : _ref$mix,
       _ref$defaults = _ref.defaults,
       defaults = _ref$defaults === undefined ? false : _ref$defaults,
-      loading = _ref.loading;
+      loading = _ref.loading,
+      publicKey = _ref.publicKey,
+      secret = _ref.secret;
 
   var header = headers || {};
   if (!method) {
@@ -392,15 +396,60 @@ var ajax = function ajax(_ref) {
   if (!Object.prototype.hasOwnProperty.call(params, 'userId') && userId && defaults) {
     params.userId = getStorage('userId');
   }
-  if (!mix && method === 'get') {
-    data = {};
-  }
-  if (method === 'post') {
-    if (!mix) {
+  if (!mix) {
+    if (method === 'get') {
+      data = {};
+    } else {
       params = {};
     }
-    if (format && !header['content-type']) {
-      data = qs__WEBPACK_IMPORTED_MODULE_2___default.a.stringify(data);
+  }
+  if (publicKey) {
+    if (Object.keys(params).length) {
+      if (secret && Array.isArray(secret) && secret.length) {
+        secret.forEach(function (item) {
+          if (Object.prototype.hasOwnProperty.call(params, item) && params[item] !== '' && params[item] !== null) {
+            params[item] = esmEncrypt({
+              data: params[item],
+              key: publicKey
+            });
+          }
+        });
+      } else {
+        for (var i in params) {
+          if (params[i] !== '' && params[i] !== null) {
+            params[i] = esmEncrypt({
+              data: params[i],
+              key: publicKey
+            });
+          }
+        }
+      }
+    }
+    if (Object.keys(data).length) {
+      if (secret && Array.isArray(secret) && secret.length) {
+        secret.forEach(function (item) {
+          if (Object.prototype.hasOwnProperty.call(data, item) && data[item] !== '' && data[item] !== null) {
+            data[item] = esmEncrypt({
+              data: data[item],
+              key: publicKey
+            });
+          }
+        });
+      } else {
+        for (var _i in data) {
+          if (data[_i] !== '' && data[_i] !== null) {
+            data[_i] = esmEncrypt({
+              data: data[_i],
+              key: publicKey
+            });
+          }
+        }
+      }
+    }
+  }
+  if (method === 'post' && format) {
+    data = qs__WEBPACK_IMPORTED_MODULE_2___default.a.stringify(data);
+    if (!header['content-type']) {
       header['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
     }
   }
@@ -433,10 +482,10 @@ var arrUnique = function arrUnique(data, key) {
     }
   } else {
     var obj = {};
-    for (var _i = 0; _i < data.length; _i++) {
-      if (!obj[data[_i][key]]) {
-        newArr.push(data[_i]);
-        obj[data[_i][key]] = true;
+    for (var _i2 = 0; _i2 < data.length; _i2++) {
+      if (!obj[data[_i2][key]]) {
+        newArr.push(data[_i2]);
+        obj[data[_i2][key]] = true;
       }
     }
   }
@@ -889,12 +938,12 @@ var exportXls = function exportXls(_ref6) {
     }
     tbody += '</tr>';
   }
-  for (var _i2 in others) {
-    fields.splice(_i2, 0, others[_i2][0]);
-    aligns.splice(_i2, 0, others[_i2][1]);
+  for (var _i3 in others) {
+    fields.splice(_i3, 0, others[_i3][0]);
+    aligns.splice(_i3, 0, others[_i3][1]);
   }
 
-  var _loop2 = function _loop2(_i3) {
+  var _loop2 = function _loop2(_i4) {
     tbody += '<tr>';
 
     var _loop3 = function _loop3(_x2) {
@@ -902,9 +951,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[_i3][fields[_x2]])) {
+        if (Array.isArray(data[_i4][fields[_x2]])) {
           field = [];
-          data[_i3][fields[_x2]].forEach(function (ele) {
+          data[_i4][fields[_x2]].forEach(function (ele) {
             option[fields[_x2]].forEach(function (item) {
               // eslint-disable-next-line eqeqeq
               if (item[valueKey] == ele) {
@@ -914,9 +963,9 @@ var exportXls = function exportXls(_ref6) {
             });
           });
           field = field.join(' ');
-        } else if (typeof data[_i3][fields[_x2]] === 'string' && keys[fields[_x2]] && keys[fields[_x2]].multiple) {
+        } else if (typeof data[_i4][fields[_x2]] === 'string' && keys[fields[_x2]] && keys[fields[_x2]].multiple) {
           field = [];
-          data[_i3][fields[_x2]].split(',').forEach(function (ele) {
+          data[_i4][fields[_x2]].split(',').forEach(function (ele) {
             option[fields[_x2]].forEach(function (item) {
               // eslint-disable-next-line eqeqeq
               if (item[valueKey] == ele) {
@@ -929,24 +978,24 @@ var exportXls = function exportXls(_ref6) {
         } else {
           option[fields[_x2]].forEach(function (item) {
             // eslint-disable-next-line eqeqeq
-            if (item[valueKey] == data[_i3][fields[_x2]]) {
+            if (item[valueKey] == data[_i4][fields[_x2]]) {
               field = item[labelKey];
               return;
             }
           });
         }
-      } else if (_typeof(data[_i3][fields[_x2]]) === 'object' && keys[fields[_x2]]) {
-        if (Array.isArray(data[_i3][fields[_x2]])) {
-          data[_i3][fields[_x2]].forEach(function (item) {
+      } 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) {
             field = [];
             field.push({}.toString.call(item) === '[object Object]' ? item[labelKey] : item);
           });
           field = field.join(' ');
         } else {
-          field = data[_i3][fields[_x2]][labelKey];
+          field = data[_i4][fields[_x2]][labelKey];
         }
       } else {
-        field = data[_i3][fields[_x2]];
+        field = data[_i4][fields[_x2]];
       }
       tbody += '<td align="' + aligns[_x2] + '">' + field + '</td>';
     };
@@ -957,8 +1006,8 @@ var exportXls = function exportXls(_ref6) {
     tbody += '</tr>';
   };
 
-  for (var _i3 = 0; _i3 < data.length; _i3++) {
-    _loop2(_i3);
+  for (var _i4 = 0; _i4 < data.length; _i4++) {
+    _loop2(_i4);
   }
   if (!name) {
     name = 'table_' + new Date().getTime();
@@ -1383,8 +1432,8 @@ var getRgb = function getRgb($color) {
       $color = colorNew;
     }
     // 处理六位的颜色值，转为RGB
-    for (var _i4 = 1; _i4 < 7; _i4 += 2) {
-      rgb.push(parseInt('0x' + $color.slice(_i4, _i4 + 2), 16));
+    for (var _i5 = 1; _i5 < 7; _i5 += 2) {
+      rgb.push(parseInt('0x' + $color.slice(_i5, _i5 + 2), 16));
     }
   } else {
     rgb = $color.replace(/(?:\(|\)|rgb|RGB)*/g, '').split(',');
@@ -2426,22 +2475,22 @@ var setStorage = function setStorage(_ref14) {
         sessionStorage.setItem(key[i], value);
       }
     } else {
-      for (var _i5 in key) {
-        var val = _typeof(key[_i5]) === 'object' ? JSON.stringify(key[_i5]) : key[_i5];
-        sessionStorage.setItem(_i5, val);
+      for (var _i6 in key) {
+        var val = _typeof(key[_i6]) === 'object' ? JSON.stringify(key[_i6]) : key[_i6];
+        sessionStorage.setItem(_i6, val);
       }
     }
   } else {
     if (typeof key === 'string') {
       localStorage.setItem(key, value);
     } else if (Array.isArray(key)) {
-      for (var _i6 in key) {
-        localStorage.setItem(key[_i6], value);
+      for (var _i7 in key) {
+        localStorage.setItem(key[_i7], value);
       }
     } else {
-      for (var _i7 in key) {
-        var _val = _typeof(key[_i7]) === 'object' ? JSON.stringify(key[_i7]) : key[_i7];
-        localStorage.setItem(_i7, _val);
+      for (var _i8 in key) {
+        var _val = _typeof(key[_i8]) === 'object' ? JSON.stringify(key[_i8]) : key[_i8];
+        localStorage.setItem(_i8, _val);
       }
     }
   }

package/package.json

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

package/packages/button-group/src/main.vue

@@ -10,7 +10,9 @@
         :type="item.type"
         @click="handleClick({ row: data, handle: item })"
       >
-        {{ item.text }}
+        {{
+          item.template ? item.template({ row: data, config: item }) : item.text
+        }}
       </es-button>
       <el-dropdown
         v-if="other.length > 0 && index == btns.length - 1"
@@ -27,7 +29,11 @@
             :command="item"
           >
             <i :class="item.icon" v-if="item.icon"></i
-            >{{ item.text }}</el-dropdown-item
+            >{{
+              item.template
+                ? item.template({ row: data, config: item })
+                : item.text
+            }}</el-dropdown-item
           >
         </el-dropdown-menu>
       </el-dropdown>

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

@@ -1207,56 +1207,60 @@ export default {
       }
     },
     resetHeight(warn) {
-      if (this.full && !this.height && !this.maxHeight) {
-        let height = parseInt(
-          util.getStyle(this.$el.parentNode, 'height', '%'),
-          10
-        );
-        height =
-          (height == NaN ? 0 : height) -
-          parseInt(util.getStyle(this.$el.parentNode, 'padding-top'), 10) -
-          parseInt(util.getStyle(this.$el.parentNode, 'padding-bottom'), 10);
-        for (let i = 0; i < this.$el.parentNode.childNodes.length; i++) {
-          let ele = this.$el.parentNode.childNodes[i];
-          if (ele !== this.$el && ele.offsetHeight !== undefined) {
+      this.$nextTick(() => {
+        if (this.full && !this.height && !this.maxHeight) {
+          let height = this.$el.parentNode.offsetHeight;
+          if (height) {
+            height = parseInt(
+              util.getStyle(this.$el.parentNode, 'height', '%'),
+              10
+            );
             height =
-              height -
-              ele.offsetHeight -
-              parseInt(util.getStyle(ele, 'margin-top'), 10) -
-              parseInt(util.getStyle(ele, 'margin-bottom'), 10);
+              (height == NaN ? 0 : height) -
+              parseInt(util.getStyle(this.$el.parentNode, 'padding-top'), 10) -
+              parseInt(
+                util.getStyle(this.$el.parentNode, 'padding-bottom'),
+                10
+              );
+            for (let i = 0; i < this.$el.parentNode.childNodes.length; i++) {
+              let ele = this.$el.parentNode.childNodes[i];
+              if (ele !== this.$el && ele.offsetHeight !== undefined) {
+                height =
+                  height -
+                  ele.offsetHeight -
+                  parseInt(util.getStyle(ele, 'margin-top'), 10) -
+                  parseInt(util.getStyle(ele, 'margin-bottom'), 10);
+              }
+            }
+            height -= this.showToolbar ? 45 : 0;
+            height -= this.page === false ? 0 : 46;
+            height -= this.title ? this.$refs.title.offsetHeight : 0;
+            height -= parseInt(
+              util.getStyle(this.$refs.esTableContent, 'padding-top'),
+              10
+            );
+            height -= parseInt(
+              util.getStyle(this.$refs.esTableContent, 'padding-bottom'),
+              10
+            );
+            let emptyText = this.$refs.esTableContent.querySelector(
+              '.el-table__empty-text'
+            );
+            let eht = 0;
+            if (emptyText) {
+              eht = emptyText.offsetHeight;
+              let thead =
+                this.$refs.esTableContent.querySelector('.el-table__header');
+              thead && (eht += thead.offsetHeight);
+            }
+            if (height > 1 && height - eht > 1) {
+              this.tableHeight = height;
+            } else {
+              console.warn(this.$el.parentNode, `获取不到高度！`);
+            }
           }
         }
-        height -= this.showToolbar ? 45 : 0;
-        height -= this.page === false ? 0 : 46;
-        height -= this.title ? this.$refs.title.offsetHeight : 0;
-        height -= parseInt(
-          util.getStyle(this.$refs.esTableContent, 'padding-top'),
-          10
-        );
-        height -= parseInt(
-          util.getStyle(this.$refs.esTableContent, 'padding-bottom'),
-          10
-        );
-        let emptyText = this.$refs.esTableContent.querySelector(
-          '.el-table__empty-text'
-        );
-        let eht = 0;
-        if (emptyText) {
-          eht = emptyText.offsetHeight;
-          let thead =
-            this.$refs.esTableContent.querySelector('.el-table__header');
-          thead && (eht += thead.offsetHeight);
-        }
-        if (height > 1 && height - eht > 1) {
-          this.tableHeight = height;
-        } else if (warn) {
-          console.warn(this.$el.parentNode, `获取不到高度！`);
-        } else {
-          this.$nextTick(() => {
-            this.resetHeight(true);
-          });
-        }
-      }
+      });
     },
     validate(callback) {
       let form = this.elForm || this.$refs.esTableForm;

package/packages/form/src/main.vue

@@ -71,10 +71,10 @@
                         class="es-collapse-title-handler"
                       >
                         <es-label
+                          v-if="item.label"
                           :contents="item.label"
                           :event="item.label.event"
                           :events="item.label.events"
-                          v-if="item.label"
                         ></es-label>
                         <span v-if="item.text || item.type === 'text'">{{
                           item.text || item.contents
@@ -195,9 +195,8 @@
                       {{ item.text }}
                     </div>
                     <el-form-item
-                      v-else
+                      v-else-if="!item.hide"
                       ref="es-form-pane"
-                      v-show="!item.hide"
                       :key="item.name"
                       :label-width="labelWidth"
                       :prop="item.name"
@@ -249,8 +248,14 @@
                           showLabel
                         "
                         :contents="item.label"
-                        :event="item.label.event"
-                        :events="item.label.events"
+                        v-bind="
+                          item.label
+                            ? {
+                                event: item.label.event,
+                                events: item.label.events
+                              }
+                            : {}
+                        "
                         :plain="item.plain || item.name === undefined"
                       ></es-label>
                       <es-input-number
@@ -1133,9 +1138,8 @@
                   {{ item.text }}
                 </div>
                 <el-form-item
-                  v-else
+                  v-else-if="!item.hide"
                   ref="es-form-pane"
-                  v-show="!item.hide"
                   :key="item.name"
                   :label-width="labelWidth"
                   :prop="item.name"
@@ -1186,8 +1190,14 @@
                       showLabel
                     "
                     :contents="item.label"
-                    :event="item.label.event"
-                    :events="item.label.events"
+                    v-bind="
+                      item.label
+                        ? {
+                            event: item.label.event,
+                            events: item.label.events
+                          }
+                        : {}
+                    "
                     :plain="item.plain || item.name === undefined"
                   ></es-label>
                   <es-input-number
@@ -1983,10 +1993,10 @@
                     </template>
                     <div v-else :key="index" class="es-collapse-title-handler">
                       <es-label
+                        v-if="item.label"
                         :contents="item.label"
                         :event="item.label.event"
                         :events="item.label.events"
-                        v-if="item.label"
                       ></es-label>
                       <span v-if="item.text || item.type === 'text'">{{
                         item.text || item.contents
@@ -2094,9 +2104,8 @@
                     {{ item.text }}
                   </div>
                   <el-form-item
-                    v-else
+                    v-else-if="!item.hide"
                     ref="es-form-pane"
-                    v-show="!item.hide"
                     :key="item.name"
                     :label-width="labelWidth"
                     :prop="item.name"
@@ -2151,8 +2160,14 @@
                         showLabel
                       "
                       :contents="item.label"
-                      :event="item.label.event"
-                      :events="item.label.events"
+                      v-bind="
+                        item.label
+                          ? {
+                              event: item.label.event,
+                              events: item.label.events
+                            }
+                          : {}
+                      "
                       :plain="item.plain || item.name === undefined"
                     ></es-label>
                     <es-input-number
@@ -2987,9 +3002,8 @@
                 {{ item.text }}
               </div>
               <el-form-item
-                v-else
+                v-else-if="!item.hide"
                 ref="es-form-pane"
-                v-show="!item.hide"
                 :key="item.name"
                 :label-width="labelWidth"
                 :prop="item.name"
@@ -3040,8 +3054,14 @@
                     showLabel
                   "
                   :contents="item.label"
-                  :event="item.label.event"
-                  :events="item.label.events"
+                  v-bind="
+                    item.label
+                      ? {
+                          event: item.label.event,
+                          events: item.label.events
+                        }
+                      : {}
+                  "
                   :plain="item.plain || item.name === undefined"
                 ></es-label>
                 <es-input-number

package/packages/form/src/table.vue

@@ -110,12 +110,18 @@
                 :rowspan="item.labelRow"
               >
                 <es-label
+                  v-if="item.type !== 'table'"
                   :contents="item.label"
-                  :event="item.label.event"
-                  :events="item.label.events"
+                  v-bind="
+                    item.label
+                      ? {
+                          event: item.label.event,
+                          events: item.label.events
+                        }
+                      : {}
+                  "
                   :plain="item.plain"
                   :rules="item.rules"
-                  v-if="item.type !== 'table'"
                 ></es-label>
               </td>
               <td
@@ -156,13 +162,18 @@
                 ></expand-dom>
                 <template v-else>
                   <es-label
-                    v-if="item.type === 'label' || item.type === 'empty'"
+                    v-if="
+                      (item.type === 'label' || item.type === 'empty') &&
+                      !item.hide
+                    "
                     :contents="item.text"
-                    :event="item.label.event"
-                    :events="item.label.events"
+                    v-bind="{
+                      event: item.event,
+                      events: item.events
+                    }"
                   ></es-label>
                   <el-form-item
-                    v-else
+                    v-else-if="!item.hide"
                     label-width="0"
                     :prop="item.name"
                     :rules="getRules(item)"

package/src/index.js

@@ -117,7 +117,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.4.83',
+  version: '0.4.85',
   install,
   Button,
   ButtonGroup,

package/src/utils/util.js

@@ -43,6 +43,8 @@ import { MessageBox, Loading } from 'eoss-element';
  * @param {Boolean} [mix = false] - 是否混合传参
  * @param {Boolean} [defaults = false] - 是否传入默认参数userId
  * @param {Object} [loading] - loading加载对象
+ * @param {String} [publicKey] - sm2加密公钥
+ * @param {Array} [secret] - 要加密的字段属性名称，默认所有
  **/
 // 请求
 const pendingRequest = new Map();
@@ -66,7 +68,9 @@ const ajax = function ({
   format = true,
   mix = false,
   defaults = false,
-  loading
+  loading,
+  publicKey,
+  secret
 }) {
   let header = headers || {};
   if (!method) {
@@ -336,15 +340,60 @@ const ajax = function ({
   if (!Object.prototype.hasOwnProperty.call(params, 'userId') && userId && defaults) {
     params.userId = getStorage('userId');
   }
-  if (!mix && method === 'get') {
-    data = {};
-  }
-  if (method === 'post') {
-    if (!mix) {
+  if (!mix) {
+    if (method === 'get') {
+      data = {};
+    } else {
       params = {};
     }
-    if (format && !header['content-type']) {
-      data = qs.stringify(data);
+  }
+  if (publicKey) {
+    if (Object.keys(params).length) {
+      if (secret && Array.isArray(secret) && secret.length) {
+        secret.forEach(item => {
+          if (Object.prototype.hasOwnProperty.call(params, item) && params[item] !== '' && params[item] !== null) {
+            params[item] = esmEncrypt({
+              data: params[item],
+              key: publicKey
+            });
+          }
+        });
+      } else {
+        for (let i in params) {
+          if (params[i] !== '' && params[i] !== null) {
+            params[i] = esmEncrypt({
+              data: params[i],
+              key: publicKey
+            });
+          }
+        }
+      }
+    }
+    if (Object.keys(data).length) {
+      if (secret && Array.isArray(secret) && secret.length) {
+        secret.forEach(item => {
+          if (Object.prototype.hasOwnProperty.call(data, item) && data[item] !== '' && data[item] !== null) {
+            data[item] = esmEncrypt({
+              data: data[item],
+              key: publicKey
+            });
+          }
+        });
+      } else {
+        for (let i in data) {
+          if (data[i] !== '' && data[i] !== null) {
+            data[i] = esmEncrypt({
+              data: data[i],
+              key: publicKey
+            });
+          }
+        }
+      }
+    }
+  }
+  if (method === 'post' && format) {
+    data = qs.stringify(data);
+    if (!header['content-type']) {
       header['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
     }
   }