@lambo-design/shared 1.0.0-beta.316 → 1.0.0-beta.318

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.316",
+  "version": "1.0.0-beta.318",
   "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/style.js

@@ -1,24 +1,24 @@
-const SPECIAL_CHARS_REGEXP = /([\:\-\_]+(.))/g
-const MOZ_HACK_REGEXP = /^moz([A-Z])/
-
-function camelCase(name) {
-  return name
-    .replace(SPECIAL_CHARS_REGEXP, function (_, separator, letter, offset) {
-      return offset ? letter.toUpperCase() : letter
-    })
-    .replace(MOZ_HACK_REGEXP, 'Moz$1')
-}
-// getStyle
-export function getStyle(element, styleName) {
-  if (!element || !styleName) return null
-  styleName = camelCase(styleName)
-  if (styleName === 'float') {
-    styleName = 'cssFloat'
-  }
-  try {
-    const computed = document.defaultView.getComputedStyle(element, '')
-    return element.style[styleName] || computed ? computed[styleName] : null
-  } catch (e) {
-    return element.style[styleName]
-  }
-}
+const SPECIAL_CHARS_REGEXP = /([\:\-\_]+(.))/g
+const MOZ_HACK_REGEXP = /^moz([A-Z])/
+
+function camelCase(name) {
+  return name
+    .replace(SPECIAL_CHARS_REGEXP, function (_, separator, letter, offset) {
+      return offset ? letter.toUpperCase() : letter
+    })
+    .replace(MOZ_HACK_REGEXP, 'Moz$1')
+}
+// getStyle
+export function getStyle(element, styleName) {
+  if (!element || !styleName) return null
+  styleName = camelCase(styleName)
+  if (styleName === 'float') {
+    styleName = 'cssFloat'
+  }
+  try {
+    const computed = document.defaultView.getComputedStyle(element, '')
+    return element.style[styleName] || computed ? computed[styleName] : null
+  } catch (e) {
+    return element.style[styleName]
+  }
+}

package/utils/transfer-queue.js

@@ -1,7 +1,7 @@
-let transferIndex = 1000
-
-function transferIncrease() {
-  transferIndex++
-}
-
-export { transferIndex, transferIncrease }
+let transferIndex = 1000
+
+function transferIncrease() {
+  transferIndex++
+}
+
+export { transferIndex, transferIncrease }