@lambo-design/shared 1.0.0-beta.315 → 1.0.0-beta.317

package/nstyles/third/ag.less

@@ -207,4 +207,20 @@
 
 .column-highlight {
   background: var(--ag-selected-row-background-color);
-}
+}
+.heard-highlight {
+  background: var(--ag-selected-row-background-color) !important;
+  border-bottom: 2px solid rgb(120, 180, 99) !important;
+  color: #000 !important;
+}
+.cellClick-highlight {
+  background: rgb(120, 180, 99) !important;
+  font-weight: 700 !important;
+  color: #000 !important;
+}
+.cellClick-index-highlight {
+  border-left: 2px solid rgb(120, 180, 99) !important;
+  background: var(--ag-selected-row-background-color) !important;
+  font-weight: 700 !important;
+  color: #000 !important;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/shared",
-  "version": "1.0.0-beta.315",
+  "version": "1.0.0-beta.317",
   "description": "",
   "main": "index.js",
   "author": "lambo",

package/utils/excel.js

@@ -85,6 +85,14 @@ let bodyStyle = {
   alignment: {vertical: "center"}
 }
 
+/**
+ * 表格底部扩展行样式
+ * @type {alignment: {vertical: string}}
+ */
+let footerStyle = {
+  alignment: {vertical: "center"}
+}
+
 /**
  * 过滤掉filterData中titleRules、typeRules相关的列
  * @param filterData
@@ -304,7 +312,7 @@ export const enums_to_value = (enums,jsonData)=>{
   }
 }
 
-function auto_width(ws, data) {
+function auto_width(ws, data, startRow=0) {
   /*set worksheet max width per col*/
   const colWidth = data.map(row => row.map(val => {
     /*if null/undefined*/
@@ -320,7 +328,12 @@ function auto_width(ws, data) {
   }))
   /*start in the first row*/
   let result = colWidth[0];
-  for (let i = 1; i < colWidth.length; i++) {
+  if (startRow > 0) {
+    // 排除header中title和search数据
+    result = colWidth[startRow];
+  }
+  // 计算列宽时，查询条件行数据不参与计算
+  for (let i = startRow > 0 ? startRow : 1; i < colWidth.length; i++) {
     for (let j = 0; j < colWidth[i].length; j++) {
       if (result[j]['wch'] < colWidth[i][j]['wch']) {
         result[j]['wch'] = colWidth[i][j]['wch'] > 7 ? colWidth[i][j]['wch'] : 7;
@@ -451,7 +464,7 @@ function merge_content({ws, tableData, spanColumnKeys, startRow}) {
   ws['!merges'] = ws['!merges'].concat(mergeData)
 }
 
-function add_style({ws, title, startRow}) {
+function add_style({ws, title, startRow, footerRow}) {
 
   // 补充空白数据
   let rangs = ws['!ref'].split(":");
@@ -475,9 +488,16 @@ function add_style({ws, title, startRow}) {
   })
 
   let titleReg = new RegExp("^[A-Z]1$", "im");
-  let titleExtReg = new RegExp("^[A-Z][2-" + parseInt(startRow>0?startRow:2) + "]$", "im");
+  let titleExtReg = new RegExp("^[A-Z][1-" + parseInt(startRow>0?startRow:2) + "]$", "im");
   let headReg = new RegExp("^[A-Z]+[" + parseInt(startRow + 1) + "-" + parseInt(startRow + title.length) + "]$", "im");
   let bodyReg = new RegExp("^[A-Z]+([" + parseInt(startRow + title.length) + "-9]|[1-9]\\d+)$", "im");
+  let footerExtReg = null
+
+  if (footerRow === 1) {
+    // 底部扩展最后一行正则表达式 该行样式需要无边框
+    footerExtReg = new RegExp("^[A-Z]" + rowSum + "$", "im");
+  }
+
   Object.keys(ws).forEach(item => {
     if(titleReg.test(item)&&startRow>0){
       /**
@@ -494,6 +514,11 @@ function add_style({ws, title, startRow}) {
        * 加载表头样式：蓝色背景，水平垂直居中，边框
        */
       ws[item].s = headStyle
+    }  else if (footerExtReg && footerExtReg.test(item)) {
+      /**
+       * 加载表尾样式：无边框，垂直居中
+       */
+      ws[item].s = footerStyle
     } else if (bodyReg.test(item)) {
       /**
        * 表体样式： 垂直居中，边框
@@ -561,7 +586,8 @@ export const export_array_to_excel = ({key, data, title, header = [], footer = [
 
   const ws = XLSX.utils.aoa_to_sheet(arr);
   if (autoWidth) {
-    auto_width(ws, arr);
+    // 计算列宽时，查询条件行数据不参与计算
+    auto_width(ws, arr, header.length);
   }
   // 合并表头
   if (!ws['!merges']) ws['!merges'] = [];
@@ -569,9 +595,8 @@ export const export_array_to_excel = ({key, data, title, header = [], footer = [
     merge_cell({ws, data:title, startRow: header.length})
   }
   merge_cell({ws,data:header,startRow: 0 })
-  console.log(data)
   merge_content(ws, data, spanColumns, title.length + header.length)
-  add_style({ws, title, startRow: header.length})
+  add_style({ws, title, startRow: header.length, footerRow: footer.length})
   XLSX.utils.book_append_sheet(wb, ws, '');
   if(format === 'csv'){
     XLSX.writeFile(wb, filename + '.' + format,{

package/utils/storage.js

@@ -1,198 +1,198 @@
-/*
- * Copyright 2019 WeBank
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-/* \
-|*|
-|*|  :: cookies.js ::
-|*|
-|*|  A complete cookies reader/writer framework with full unicode support.
-|*|
-|*|  https://developer.mozilla.org/en-US/docs/DOM/document.cookie
-|*|
-|*|  This framework is released under the GNU Public License, version 3 or later.
-|*|  http://www.gnu.org/licenses/gpl-3.0-standalone.html
-|*|
-|*|  Syntaxes:
-|*|
-|*|  * docCookies.setItem(name, value[, end[, path[, domain[, secure]]]])
-|*|  * docCookies.getItem(name)
-|*|  * docCookies.removeItem(name[, path], domain)
-|*|  * docCookies.hasItem(name)
-|*|  * docCookies.keys()
-|*|
-\ */
-
-let docCookies = {
-  getItem: function(sKey) {
-    return decodeURIComponent(document.cookie.replace(new RegExp('(?:(?:^|.*;)\\s*' + encodeURIComponent(sKey).replace(/[\-\.\+\*]/g, '\\$&') + '\\s*\\=\\s*([^;]*).*$)|^.*$'), '$1')) || null;
-  },
-  setItem: function(sKey, sValue, vEnd, sPath, sDomain, bSecure) {
-    if (!sKey || /^(?:expires|max\-age|path|domain|secure)$/i.test(sKey)) {
-      return false;
-    }
-    let sExpires = '';
-    if (vEnd) {
-      switch (vEnd.constructor) {
-        case Number:
-          sExpires = vEnd === Infinity ? '; expires=Fri, 31 Dec 9999 23:59:59 GMT' : '; max-age=' + vEnd;
-          break;
-        case String:
-          sExpires = '; expires=' + vEnd;
-          break;
-        case Date:
-          sExpires = '; expires=' + vEnd.toUTCString();
-          break;
-      }
-    }
-    document.cookie = encodeURIComponent(sKey) + '=' + encodeURIComponent(sValue) + sExpires + (sDomain ? '; domain=' + sDomain : '') + (sPath ? '; path=' + sPath : '') + (bSecure ? '; secure' : '');
-    return true;
-  },
-  removeItem: function(sKey, sPath, sDomain) {
-    if (!sKey || !this.hasItem(sKey)) {
-      return false;
-    }
-    document.cookie = encodeURIComponent(sKey) + '=; expires=Thu, 01 Jan 1970 00:00:00 GMT' + (sDomain ? '; domain=' + sDomain : '') + (sPath ? '; path=' + sPath : '');
-    return true;
-  },
-  hasItem: function(sKey) {
-    return (new RegExp('(?:^|;\\s*)' + encodeURIComponent(sKey).replace(/[\-\.\+\*]/g, '\\$&') + '\\s*\\=')).test(document.cookie);
-  },
-  keys: /* optional method: you can safely remove it! */ function() {
-    let aKeys = document.cookie.replace(/((?:^|\s*;)[^\=]+)(?=;|$)|^\s*|\s*(?:\=[^;]*)?(?:\1|$)/g, '').split(/\s*(?:\=[^;]*)?;\s*/);
-    for (let nIdx = 0; nIdx < aKeys.length; nIdx++) {
-      aKeys[nIdx] = decodeURIComponent(aKeys[nIdx]);
-    }
-    return aKeys;
-  },
-};
-
-/**
- * 操作cookie、sessionStorage、localStorage、缓存
- */
-
-const
-  SESSION = 'session';
-
-const LOCAL = 'local';
-
-const COOKIE = 'cookie';
-
-export default {
-  set: function(key, value, category = SESSION, expired) {
-    let { storage, isWebStorage = true } = this._map(category);
-
-    if (isWebStorage) {
-      storageManager.set(key, value, storage);
-    } else {
-      cookieManager.set(key, value, expired);
-    }
-  },
-  get: function(key, category = SESSION) {
-    let { storage, isWebStorage = true } = this._map(category);
-
-    if (isWebStorage) {
-      return storageManager.get(key, storage);
-    } else {
-      return cookieManager.get(key);
-    }
-  },
-  clear: function(category = SESSION) {
-    let { storage, isWebStorage = true } = this._map(category);
-
-    if (isWebStorage) {
-      storageManager.clear(storage);
-    } else {
-      cookieManager.clear();
-    }
-  },
-  remove: function(key, category = SESSION) {
-    let { storage, isWebStorage = true } = this._map(category);
-
-    if (isWebStorage) {
-      storageManager.remove(key, storage);
-    } else {
-      cookieManager.remove(key);
-    }
-  },
-  _map: function(category) {
-    let isWebStorage = true; let storage;
-
-    switch (true) {
-      case category === SESSION:
-        storage = 'sessionStorage';
-        break;
-      case category === LOCAL:
-        storage = 'localStorage';
-        break;
-      case category === COOKIE:
-        storage = 'cookie';
-        isWebStorage = false;
-        break;
-      default:
-        storage = 'sessionStorage';
-    }
-
-    return { isWebStorage, storage };
-  },
-};
-
-let isProd = process.env.NODE_ENV === 'production';
-
-export const storageManager = {
-  set: function(key, value, storage) {
-    try {
-      window[storage].setItem(key, JSON.stringify(value));
-    } catch (e) {
-      !isProd && console.error(e);
-    }
-  },
-  get: function(key, storage) {
-    try {
-      if (window[storage].getItem(key)) {
-        return JSON.parse(window[storage].getItem(key));
-      } else {
-        return window[storage].getItem(key);
-      }
-    } catch (e) {
-      !isProd && console.error(e, key);
-    }
-  },
-  clear: function(storage) {
-    window[storage].clear();
-  },
-  remove: function(key, storage) {
-    window[storage].removeItem(key);
-  },
-};
-
-export const cookieManager = {
-  set: function(key, value, expired) {
-    if (expired) docCookies.setItem(key, value, expired);
-    else docCookies.setItem(key, value);
-  },
-  get: function(key) {
-    return docCookies.getItem(key);
-  },
-  clear: function() {
-    docCookies.keys().forEach((key) => {
-      docCookies.removeItem(key);
-    });
-  },
-  remove: function(key) {
-    docCookies.removeItem(key);
-  },
-};
+/*
+ * Copyright 2019 WeBank
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+/* \
+|*|
+|*|  :: cookies.js ::
+|*|
+|*|  A complete cookies reader/writer framework with full unicode support.
+|*|
+|*|  https://developer.mozilla.org/en-US/docs/DOM/document.cookie
+|*|
+|*|  This framework is released under the GNU Public License, version 3 or later.
+|*|  http://www.gnu.org/licenses/gpl-3.0-standalone.html
+|*|
+|*|  Syntaxes:
+|*|
+|*|  * docCookies.setItem(name, value[, end[, path[, domain[, secure]]]])
+|*|  * docCookies.getItem(name)
+|*|  * docCookies.removeItem(name[, path], domain)
+|*|  * docCookies.hasItem(name)
+|*|  * docCookies.keys()
+|*|
+\ */
+
+let docCookies = {
+  getItem: function(sKey) {
+    return decodeURIComponent(document.cookie.replace(new RegExp('(?:(?:^|.*;)\\s*' + encodeURIComponent(sKey).replace(/[\-\.\+\*]/g, '\\$&') + '\\s*\\=\\s*([^;]*).*$)|^.*$'), '$1')) || null;
+  },
+  setItem: function(sKey, sValue, vEnd, sPath, sDomain, bSecure) {
+    if (!sKey || /^(?:expires|max\-age|path|domain|secure)$/i.test(sKey)) {
+      return false;
+    }
+    let sExpires = '';
+    if (vEnd) {
+      switch (vEnd.constructor) {
+        case Number:
+          sExpires = vEnd === Infinity ? '; expires=Fri, 31 Dec 9999 23:59:59 GMT' : '; max-age=' + vEnd;
+          break;
+        case String:
+          sExpires = '; expires=' + vEnd;
+          break;
+        case Date:
+          sExpires = '; expires=' + vEnd.toUTCString();
+          break;
+      }
+    }
+    document.cookie = encodeURIComponent(sKey) + '=' + encodeURIComponent(sValue) + sExpires + (sDomain ? '; domain=' + sDomain : '') + (sPath ? '; path=' + sPath : '') + (bSecure ? '; secure' : '');
+    return true;
+  },
+  removeItem: function(sKey, sPath, sDomain) {
+    if (!sKey || !this.hasItem(sKey)) {
+      return false;
+    }
+    document.cookie = encodeURIComponent(sKey) + '=; expires=Thu, 01 Jan 1970 00:00:00 GMT' + (sDomain ? '; domain=' + sDomain : '') + (sPath ? '; path=' + sPath : '');
+    return true;
+  },
+  hasItem: function(sKey) {
+    return (new RegExp('(?:^|;\\s*)' + encodeURIComponent(sKey).replace(/[\-\.\+\*]/g, '\\$&') + '\\s*\\=')).test(document.cookie);
+  },
+  keys: /* optional method: you can safely remove it! */ function() {
+    let aKeys = document.cookie.replace(/((?:^|\s*;)[^\=]+)(?=;|$)|^\s*|\s*(?:\=[^;]*)?(?:\1|$)/g, '').split(/\s*(?:\=[^;]*)?;\s*/);
+    for (let nIdx = 0; nIdx < aKeys.length; nIdx++) {
+      aKeys[nIdx] = decodeURIComponent(aKeys[nIdx]);
+    }
+    return aKeys;
+  },
+};
+
+/**
+ * 操作cookie、sessionStorage、localStorage、缓存
+ */
+
+const
+  SESSION = 'session';
+
+const LOCAL = 'local';
+
+const COOKIE = 'cookie';
+
+export default {
+  set: function(key, value, category = SESSION, expired) {
+    let { storage, isWebStorage = true } = this._map(category);
+
+    if (isWebStorage) {
+      storageManager.set(key, value, storage);
+    } else {
+      cookieManager.set(key, value, expired);
+    }
+  },
+  get: function(key, category = SESSION) {
+    let { storage, isWebStorage = true } = this._map(category);
+
+    if (isWebStorage) {
+      return storageManager.get(key, storage);
+    } else {
+      return cookieManager.get(key);
+    }
+  },
+  clear: function(category = SESSION) {
+    let { storage, isWebStorage = true } = this._map(category);
+
+    if (isWebStorage) {
+      storageManager.clear(storage);
+    } else {
+      cookieManager.clear();
+    }
+  },
+  remove: function(key, category = SESSION) {
+    let { storage, isWebStorage = true } = this._map(category);
+
+    if (isWebStorage) {
+      storageManager.remove(key, storage);
+    } else {
+      cookieManager.remove(key);
+    }
+  },
+  _map: function(category) {
+    let isWebStorage = true; let storage;
+
+    switch (true) {
+      case category === SESSION:
+        storage = 'sessionStorage';
+        break;
+      case category === LOCAL:
+        storage = 'localStorage';
+        break;
+      case category === COOKIE:
+        storage = 'cookie';
+        isWebStorage = false;
+        break;
+      default:
+        storage = 'sessionStorage';
+    }
+
+    return { isWebStorage, storage };
+  },
+};
+
+let isProd = process.env.NODE_ENV === 'production';
+
+export const storageManager = {
+  set: function(key, value, storage) {
+    try {
+      window[storage].setItem(key, JSON.stringify(value));
+    } catch (e) {
+      !isProd && console.error(e);
+    }
+  },
+  get: function(key, storage) {
+    try {
+      if (window[storage].getItem(key)) {
+        return JSON.parse(window[storage].getItem(key));
+      } else {
+        return window[storage].getItem(key);
+      }
+    } catch (e) {
+      !isProd && console.error(e, key);
+    }
+  },
+  clear: function(storage) {
+    window[storage].clear();
+  },
+  remove: function(key, storage) {
+    window[storage].removeItem(key);
+  },
+};
+
+export const cookieManager = {
+  set: function(key, value, expired) {
+    if (expired) docCookies.setItem(key, value, expired);
+    else docCookies.setItem(key, value);
+  },
+  get: function(key) {
+    return docCookies.getItem(key);
+  },
+  clear: function() {
+    docCookies.keys().forEach((key) => {
+      docCookies.removeItem(key);
+    });
+  },
+  remove: function(key) {
+    docCookies.removeItem(key);
+  },
+};

package/utils/type.js

@@ -1,102 +1,102 @@
-/*
- * Copyright 2019 WeBank
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-const objectToString = Object.prototype.toString;
-const OBJECT_STRING = '[object Object]';
-
-/**
- * 是否是普通对象
- * @param {any} obj
- * @return {Boolean}
- */
-export function isPlainObject(obj) {
-  return objectToString.call(obj) === OBJECT_STRING;
-}
-
-/**
- * 是否是数字
- * @param {any} value
- * @return {Boolean}
- */
-export function isNumber(value) {
-  return typeof value === 'number';
-}
-
-/**
- * 是否是日期
- * @param {any} value
- * @return {Boolean}
- */
-export function isDate(value) {
-  return objectToString.call(value) === '[object Date]';
-}
-
-/**
- * 是否是函数
- * @param {any} value
- * @return {Boolean}
- */
-export function isFunction(value) {
-  return typeof value === 'function';
-}
-
-/**
- * 是否是函数
- * @param {any} value
- * @return {Boolean}
- */
-export function isObject(value) {
-  let type = typeof value;
-  return !!value && (type == 'object' || type == 'function');
-}
-
-/**
- * 是否是数组
- * @param {any} value
- * @return {Boolean}
- */
-export function isArray(value) {
-  return Array.isArray(value);
-}
-
-/**
- * 是否像对象
- * @param {any} value
- * @return {Boolean}
- */
-export function isObjectLike(value) {
-  return !!value && typeof value == 'object';
-}
-
-/**
- * 是否是字符串
- * @param {any} value
- * @return {Boolean}
- */
-export function isString(value) {
-  return typeof value == 'string' ||
-        (!isArray(value) && isObjectLike(value) && objectToString.call(value) == '[object String]');
-}
-
-/**
- * 是否是空的
- * @param {any} value
- * @return {Boolean}
- */
-export function isNull(value) {
-  return value === undefined || value === null || value === '';
-}
+/*
+ * Copyright 2019 WeBank
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+const objectToString = Object.prototype.toString;
+const OBJECT_STRING = '[object Object]';
+
+/**
+ * 是否是普通对象
+ * @param {any} obj
+ * @return {Boolean}
+ */
+export function isPlainObject(obj) {
+  return objectToString.call(obj) === OBJECT_STRING;
+}
+
+/**
+ * 是否是数字
+ * @param {any} value
+ * @return {Boolean}
+ */
+export function isNumber(value) {
+  return typeof value === 'number';
+}
+
+/**
+ * 是否是日期
+ * @param {any} value
+ * @return {Boolean}
+ */
+export function isDate(value) {
+  return objectToString.call(value) === '[object Date]';
+}
+
+/**
+ * 是否是函数
+ * @param {any} value
+ * @return {Boolean}
+ */
+export function isFunction(value) {
+  return typeof value === 'function';
+}
+
+/**
+ * 是否是函数
+ * @param {any} value
+ * @return {Boolean}
+ */
+export function isObject(value) {
+  let type = typeof value;
+  return !!value && (type == 'object' || type == 'function');
+}
+
+/**
+ * 是否是数组
+ * @param {any} value
+ * @return {Boolean}
+ */
+export function isArray(value) {
+  return Array.isArray(value);
+}
+
+/**
+ * 是否像对象
+ * @param {any} value
+ * @return {Boolean}
+ */
+export function isObjectLike(value) {
+  return !!value && typeof value == 'object';
+}
+
+/**
+ * 是否是字符串
+ * @param {any} value
+ * @return {Boolean}
+ */
+export function isString(value) {
+  return typeof value == 'string' ||
+        (!isArray(value) && isObjectLike(value) && objectToString.call(value) == '[object String]');
+}
+
+/**
+ * 是否是空的
+ * @param {any} value
+ * @return {Boolean}
+ */
+export function isNull(value) {
+  return value === undefined || value === null || value === '';
+}