n20-common-lib 2.8.16 → 2.8.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.8.16",
+  "version": "2.8.18",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/assets/css/button.scss

@@ -240,4 +240,16 @@ $--button-margin-left: 6px;
 
 .el-button-dropdown-item {
   margin-left: 27px !important;
+}
+
+.el-button--default.is-active {
+  color: $--color-primary;
+  background: $--color-white;
+  border-color: $--color-primary;
+
+  &:focus {
+    color: $--color-primary;
+    background: $--color-white;
+    border-color: $--color-primary;
+  }
 }

package/src/components/Filters/index.vue

@@ -10,7 +10,14 @@
     @show="show"
   >
     <template slot="reference">
-      <el-button icon="n20-icon-iconfontshaixuan" plain onlyicon size="mini" @click="clickBtn" />
+      <el-button
+        icon="n20-icon-iconfontshaixuan"
+        :class="isValueCpt ? 'is-active' : ''"
+        plain
+        onlyicon
+        size="mini"
+        @click="clickBtn"
+      />
     </template>
     <el-form
       v-show="showPopC"
@@ -81,10 +88,10 @@
 </template>
 
 <script>
-import formItemInput from './form-item-input.vue'
+import getWidth from '../../utils/asciiWidth'
 import footerBox from '../FooterBox/index.vue'
 import showColumn, { getColumns } from '../ShowColumn/index.vue'
-import getWidth from '../../utils/asciiWidth'
+import formItemInput from './form-item-input.vue'
 
 export default {
   name: 'Filters',
@@ -190,6 +197,17 @@ export default {
       if (this.width !== undefined) return this.width
 
       return this.labelWidthAs + 240
+    },
+    isValueCpt() {
+      let values = Object.values(this.form).some((value) => {
+        if (Array.isArray(value)) {
+          return value.length > 0
+        } else {
+          return value !== '' && value !== null && value !== undefined
+        }
+      })
+
+      return values
     }
   },
   methods: {

package/src/components/Layout/HeaderWrap/indexN.vue

@@ -145,14 +145,14 @@
         <div class="uif-user-w" :style="{ backgroundImage: headerUserInfoBg ? `url(${headerUserInfoBg})` : undefined }">
           <div class="uif-img-w">
             <img class="_img" :src="headerUserUrl" />
-            <cl-upload
+            <upload
               :action="`/bems/1.0/upload/${userNo}_img`"
               accept="image/*"
               msg-type="message"
               :on-success="getUserImg"
             >
               <div slot="trigger" class="_edit">{{ '更换头像' | $lc }}</div>
-            </cl-upload>
+            </upload>
           </div>
           <div class="uif-name">
             <span>{{ userNo }}</span
@@ -320,6 +320,7 @@ import realUrl from '../../../assets/realUrl'
 import auth from '../../../utils/auth.js'
 import axios from '../../../utils/axios.js'
 import { linkPush } from '../../../utils/urlToGo.js'
+import upload from '../../Upload/index.vue'
 dayjs.extend(duration)
 
 import { siteTree2menus } from '../../LoginTemporary/utils'
@@ -398,7 +399,8 @@ export default {
     changePwd,
     noticePop,
     switchUser,
-    operatingStatus
+    operatingStatus,
+    upload
   },
   props: {
     beforeLogout: {