n20-common-lib 2.7.61 → 2.7.62

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.7.61",
+  "version": "2.7.62",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -10,7 +10,6 @@
     "build:Jenkins_1": "vue-cli-service build --serverConfig ./server-config-jenkins.jsonc",
     "build:css": "node build_css",
     "build:doc": "node versionInfo.js && vue-cli-service build --testTheme",
-    "build:docs": "vue-cli-service build --doc",
     "build:gzip": "vue-cli-service build --gzip",
     "build:js": "vue-cli-service build --formats umd-min --target lib src/index.js --name index --dest lib  --analy",
     "build:report": "vue-cli-service build --analy",

package/src/assets/css/advanced-filter.scss

@@ -3,6 +3,7 @@
   position: relative;
   display: flex;
   align-items: center;
+  flex:1;
   padding: 8px 0;
 
   &-item.n20-advanced-filter-active {

package/src/assets/css/statis.scss

@@ -1,5 +1,5 @@
 .n20-statis {
-  font-size: 12px;
+  font-size: 14px;
   color: $--color-text-primary;
   .n20-primary {
     color: $--color-primary;
@@ -23,7 +23,7 @@
 
 .n20-statis:not(:first-child) {
   .stati-type {
-    padding-left: 12px;
+    padding-left: 4px;
   }
   .n20-statis-group & {
     .stati-type {

package/src/components/Statis/statisItem.vue

@@ -1,8 +1,8 @@
 <template>
   <div v-if="!isDbz" class="n20-statis">
     <span v-if="title" class="p-r-ss text-r stati-item-cell">{{ title }}</span
-    ><span class="stati-type stati-item-cell p-r-ss">{{ type }}</span
-    ><span class="n20-statis-division p-r-ss stati-item-cell"></span
+    > <span class="stati-type stati-item-cell p-r-ss">{{ type }}</span
+    ><span class="n20-statis-division p-r-ss stati-item-cell">|</span
     ><span v-for="(item, i) in list" :key="i" class="p-r-ss stati-item-cell"
       >{{ item.label }}:<span v-if="countLabel.includes(item.label)" class="n20-primary">{{ item.value }}</span
       ><span v-else class="n20-primary">{{ item | numerify('0,0.00', showW, showU) }}</span></span
@@ -10,10 +10,11 @@
   </div>
   <div v-else class="n20-statis">
     <span class="stati-type stati-item-cell">{{ type }}</span>
-    <span v-if="total !== null" class="stati-type stati-item-cell n20-primary">:{{ total }}</span>
-    <span v-if="title" class="text-r stati-item-cell p-l-ss">{{ title }}</span>
-    <span class="n20-statis-division p-r-ss stati-item-cell"></span>
-    <span v-for="(item, i) in list" :key="i" class="p-r-ss stati-item-cell"
+    <span v-if="total !== null">:</span>
+    <span  class="stati-type stati-item-cell n20-primary p-l-ss">{{ total }}</span>
+    <span v-if="total !== null" class="n20-statis-division p-l-ss p-r-ss stati-item-cell">|</span>
+    <span v-if="title" class="text-r stati-item-cell p-r-ss">{{ title }}</span>
+    <span v-for="(item, i) in list" :key="i" class="p-r-ss p-l-ss stati-item-cell"
       >{{ item.label }}:<span v-if="countLabel.includes(item.label)" class="n20-primary">{{ item.value }}</span>
       <span v-else class="n20-primary">{{ item | numerify('0,0.00', showW, showU) }}</span></span
     >

package/src/components/Statis/statisPopover.vue

@@ -20,7 +20,7 @@
     @show="show = true"
     @hide="show = false"
   >
-    <div slot="reference" class="flex-box p-t-ss p-b-ss">
+    <div slot="reference" class="flex-box flex-v  p-t-ss p-b-ss">
       <statisItem
         v-for="(item, i) in lists[0]['statis']"
         :key="i"
@@ -32,7 +32,7 @@
         :is-dbz="true"
         :total="total"
       />
-      <i class="n20-icon-nianfenqiehuan-youce" :class="show ? 'rotating-icon-show' : 'rotating-icon'"></i>
+      <i class="n20-icon-shouqizhedie f-s-l" :class="show ? 'rotating-icon-show' : 'rotating-icon'"></i>
     </div>
 
     <div>
@@ -80,10 +80,10 @@ export default {
 </script>
 <style>
 .rotating-icon {
-  transform: rotate(90deg);
+  transform: rotate(0deg);
 }
 
 .rotating-icon-show {
-  transform: rotate(270deg);
+  transform: rotate(180deg);
 }
 </style>

package/src/utils/xlsx2json.js

@@ -1,7 +1,7 @@
 import importG from './importGlobal.js'
 
 export default async function toJson(file, name) {
-  let { default: ExcelJS } = await importG('exceljs', () => import(/*webpackChunkName: "exceljs"*/ 'exceljs'))
+  let { default: ExcelJS } = await importG('  ', () => import(/*webpackChunkName: "exceljs"*/ 'exceljs'))
 
   const workbook = new ExcelJS.Workbook()
   return new Promise((resolve, reject) => {