n20-common-lib 2.7.0-beta.20 → 2.7.0-beta.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.7.0-beta.20",
+  "version": "2.7.0-beta.22",
   "private": false,
   "main": "src/index.js",
   "scripts": {

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

@@ -152,6 +152,7 @@
 
 
 .n20-advanced-filter {
+  box-sizing: border-box;
   position: relative;
   display: flex;
   align-items: center;
@@ -226,6 +227,8 @@
       padding-left: 0;
       border: none;
       width: 100%;
+      white-space: nowrap;
+      text-overflow: ellipsis;
       background-color: transparent;
     }
 
@@ -233,8 +236,6 @@
       margin-left: 0;
     }
 
-
-
     .el-input__inner:active,
     .el-input__inner:focus {
       box-shadow: none;
@@ -320,6 +321,7 @@
     display: inline-block;
     white-space: nowrap;
     text-overflow: ellipsis;
+    line-height: 1;
 
     .el-select.el-select--small {
       .el-select__tags {

package/src/assets/css/cl-layout-header.scss

@@ -280,7 +280,7 @@ $--header-color: #3d4a57;
   color: #333333;
 }
 
-.menu {
+.n20_menu_header {
   color: #33383d;
   letter-spacing: 0;
   line-height: 22px;
@@ -362,7 +362,7 @@ $--header-color: #3d4a57;
   z-index: 900;
 }
 
-.menu.show_drawer {
+.n20_menu_header.show_drawer {
   max-height: calc(90vh - 50px);
   min-height: 350px;
   overflow-y: auto;

package/src/components/AdvancedFilter/formItemRender.vue

@@ -352,6 +352,7 @@ export default {
               style: {
                 width: calcTextWidth(item, form[item.value])
               },
+              title: form[item.value],
               ruleField: true,
               'rule-form': 'ruleValidate',
               ruleErrorHide: item.ruleErrorHide,
@@ -473,7 +474,12 @@ export default {
         elementDom = h('inputNumber', {
           directives: [{ name: 'rule-key' }],
           ruleField: true,
-          attrs: { 'rule-form': 'ruleValidate', rules: item.rules, ruleErrorHide: item.ruleErrorHide },
+          attrs: {
+            'rule-form': 'ruleValidate',
+            title: form[item.value],
+            rules: item.rules,
+            ruleErrorHide: item.ruleErrorHide
+          },
           style: {
             width: calcWidth(form[item.value])
           },

package/src/components/AdvancedFilter/index.vue

@@ -125,6 +125,7 @@ export default {
       GroupData: [],
       checkList: [],
       defineCheckList: [],
+      cancelCheck: [],
       userNo: sessionStorage.getItem('userNo')
     }
   },
@@ -152,8 +153,19 @@ export default {
   },
   created() {
     this.getFilterList()
+    this.getDefaultCheck()
   },
   methods: {
+    getDefaultCheck() {
+      let _checkList = this.filterList
+        .filter((item) => {
+          if (item.isDefault) {
+            return item
+          }
+        })
+        .map((item) => item[this.onlyKey])
+      this.defineCheckList = cloneDeep(_checkList)
+    },
     getOnlyKey(data) {
       return getOnlyKey(this.onlyKey, data)
     },
@@ -291,7 +303,7 @@ export default {
       this.checkList = this.defineCheckList
     },
     cancel() {
-      this.checkList = this.defineCheckList
+      this.checkList = this.cancelCheck
       this.$refs.advanced_popover.showPopper = false
     },
     savaCheck() {
@@ -379,7 +391,7 @@ export default {
             }
           }
           this.checkList = this.GroupData.map((res) => res.id)
-          this.defineCheckList = cloneDeep(this.checkList)
+          this.cancelCheck = cloneDeep(this.checkList)
           // 查找排序，在this.filterList中查找this.checkList中的每一项，并将其排在前面
           this.filterList = this.filterList.sort((a, b) => {
             if (this.checkList.includes(a[this.onlyKey]) && !this.checkList.includes(b[this.onlyKey])) {

package/src/components/Descriptions/index.vue

@@ -16,7 +16,6 @@ export default {
     }
   },
   created() {
-    console.log(this.$slots.default)
     this.resize()
     window.addEventListener('resize', this.resize)
   },

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

@@ -1,7 +1,7 @@
 <template>
-  <div class="pointer menu">
-    <div class="menu_drawer_layout menu_drawer_box">
-      <div v-for="(item, i) in menus" :key="i" class="menu-system-item">
+  <div class="pointer n20_menu_header">
+    <div class="n20_menu_header_drawer_layout n20_menu_header_drawer_box">
+      <div v-for="(item, i) in menus" :key="i" class="n20_menu_header-system-item">
         <div class="flex-box flex-v" @click="clickSystem(item)">
           <svg
             style="width: 2em; height: 2em; vertical-align: -0.15em; fill: currentColor; overflow: hidden"
@@ -9,16 +9,16 @@
           >
             <use :xlink:href="item.icon"></use>
           </svg>
-          <span class="m-l-s menu-system-item_title">{{ item.NAME }}</span>
+          <span class="m-l-s n20_menu_header-system-item_title">{{ item.NAME }}</span>
         </div>
-        <div v-if="item.menuTree.length" class="menu_drawer_layout menu-system-child">
+        <div v-if="item.menuTree.length" class="n20_menu_header_drawer_layout n20_menu_header-system-child">
           <div
             v-for="(row, i) in item.menuTree"
             :key="i"
-            class="menu-first-item"
+            class="n20_menu_header-first-item"
             @click="clickMenu(row, item.menuTree)"
           >
-            <span class="menu-first-item_title">{{ row.title }}</span>
+            <span class="n20_menu_header-first-item_title">{{ row.title }}</span>
           </div>
         </div>
       </div>

package/src/components/LoginTemporary/indexN.vue

@@ -330,6 +330,9 @@ export default {
     pluginPlatform() {
       return this.jsonData.pluginPlatform
     },
+    showSystem() {
+      return this.jsonData.showSystem
+    },
     loginSloganHtml() {
       return this.form.LOGIN_SLOGAN || this.jsonData.loginSloganHtml || ''
     },
@@ -430,14 +433,13 @@ export default {
     },
 
     async init() {
-      const { _layoutData = {}, loginSetting, screenInspect, showSystem } = await getJsonc('/server-config.jsonc')
+      const { _layoutData = {}, loginSetting, screenInspect } = await getJsonc('/server-config.jsonc')
       let _loginSetting = loginSetting || _layoutData.loginSetting
-      this.showSystem = showSystem
-      if (_loginSetting !== 'JSON' && showSystem) {
+      this.jsonData = _layoutData
+      if (_loginSetting !== 'JSON' && this.jsonData.showSystem) {
         await this.getSysSet()
       }
       screenInspect && this.getScreenSetting()
-      this.jsonData = _layoutData
 
       if (this.systemList.length <= 1) {
         this.$set(this.form, 'LOGIN_TYPE', 'T0')