n20-common-lib 2.7.0-beta.21 → 2.7.0-beta.23

package/package.json

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

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

@@ -1,157 +1,5 @@
-// &-item {
-//   position: relative;
-//   display: inline-block;
-//   vertical-align: middle;
-//   max-width: 426px;
-//   margin-right: 8px;
-//   padding-left: 8px;
-//   border-radius: 4px;
-//   border: 1px solid #dcdfe5;
-//   background: #fff;
-//   cursor: pointer;
-
-//   &__name {
-//     display: inline-block;
-//     vertical-align: middle;
-//     white-space: nowrap;
-//     overflow: hidden;
-//     max-width: 168px;
-//     margin-right: 6px;
-//     color: #182b50;
-//   }
-
-//   &__value {
-//     display: inline-block;
-//     vertical-align: middle;
-//     white-space: nowrap;
-//     overflow: hidden;
-//     text-overflow: ellipsis;
-//     max-width: 312px;
-
-//     //margin-right: 14px;
-//     .el-input .el-input__inner {
-//       border: none;
-//       padding-left: 0;
-//       background-color: transparent;
-//     }
-
-//     .el-input__inner:focus {
-//       box-shadow: none;
-//     }
-
-//   }
-
-//   .filter_remove {
-//     display: none;
-//     position: absolute;
-//     height: 13px;
-//     width: 13px;
-//     background: #f1f1f1;
-//     right: -5px;
-//     top: -7px;
-//     font-size: 14px;
-//     z-index: 1;
-//     border-radius: 50%;
-//     cursor: pointer;
-//   }
-
-//   &:hover {
-//     .filter_remove {
-//       display: block;
-//     }
-//   }
-
-
-
-//   .el-form-item__label {
-//     padding: 0;
-//     display: inline-block;
-//     vertical-align: middle;
-//     white-space: nowrap;
-//     overflow: hidden;
-//     text-overflow: ellipsis;
-//     margin-right: 4px;
-//   }
-
-
-//   .el-range-editor.el-input__inner {
-//     min-width: 168px;
-//     max-width: 224px;
-
-//     .el-range-input {
-//       background-color: transparent;
-//     }
-//   }
-
-//   .n20-date-editor.el-date-editor--datetimerange.el-range-editor--small.has-value {
-//     min-width: 168px;
-//     max-width: 380px;
-//   }
-
-//   .n20-date-editor .el-input__prefix {
-//     display: none;
-//   }
-
-//   .el-input,
-//   .el-input__inner {
-//     border: none;
-//     width: 100%;
-//     background-color: transparent;
-//   }
-
-
-
-//   .el-input__inner:active,
-//   .el-input__inner:focus {
-//     box-shadow: none;
-//     border: none;
-//     border-color: #fff;
-//   }
-
-//   .el-checkbox-group {
-//     height: 32px;
-//     line-height: 32px;
-//     vertical-align: middle;
-//     padding: 0 10px;
-//   }
-
-//   .el-radio-group {
-//     padding: 0 10px;
-//   }
-
-//   .n20-num-w {
-//     padding-left: 5px;
-
-//     .el-input,
-//     .el-input__inner {
-//       padding-left: 0;
-//     }
-
-//     .el-input--suffix .el-input__inner {
-//       padding-right: 26px;
-//     }
-//   }
-
-//   .n20-numberRange {
-//     padding-right: 8px;
-//   }
-
-//   &-close {
-//     display: none;
-//     position: absolute;
-//     top: -6px;
-//     right: -20px;
-//   }
-
-//   &:hover {
-//     .n20-advanced-filter-item-close {
-//       display: inline-block;
-//     }
-//   }
-// }
-
-
 .n20-advanced-filter {
+  box-sizing: border-box;
   position: relative;
   display: flex;
   align-items: center;
@@ -226,6 +74,8 @@
       padding-left: 0;
       border: none;
       width: 100%;
+      white-space: nowrap;
+      text-overflow: ellipsis;
       background-color: transparent;
     }
 
@@ -233,8 +83,6 @@
       margin-left: 0;
     }
 
-
-
     .el-input__inner:active,
     .el-input__inner:focus {
       box-shadow: none;
@@ -253,6 +101,10 @@
       padding: 0 10px;
     }
 
+    .el-date-editor .el-range-separator {
+      padding: 0;
+    }
+
     .n20-num-w {
       // padding-left: 5px;
 
@@ -320,6 +172,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;
@@ -303,7 +303,7 @@ $--header-color: #3d4a57;
   align-items: center;
 
   &_drawer_box {
-    width: 992px;
+    width: 1024px;
   }
 
   &_drawer_layout {
@@ -318,6 +318,7 @@ $--header-color: #3d4a57;
     &_title {
 
       display: inline-block;
+      font-weight: 700;
       padding: 4px;
 
       &:hover {
@@ -334,7 +335,6 @@ $--header-color: #3d4a57;
 
   &-first-item {
     flex: 0 0 33.33%;
-    margin-bottom: 8px;
 
     &_title {
 
@@ -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

@@ -35,7 +35,9 @@
         <el-popover ref="advanced_popover" placement="bottom-start" trigger="click">
           <el-input v-model="keyword" clearable class="input-w m-b-s" :placeholder="$lc('搜索筛选条件')" />
           <div class="flex-box flex-lr">
-            <el-button type="text" @click="allCheck">全选</el-button>
+            <el-button type="text" @click="allCheck">{{
+              checkList.length === filterListS.length ? '取消全选' : '全选'
+            }}</el-button>
             <el-button type="text" @click="defaultCheck"> 恢复默认</el-button>
           </div>
           <filterItem
@@ -125,6 +127,7 @@ export default {
       GroupData: [],
       checkList: [],
       defineCheckList: [],
+      cancelCheck: [],
       userNo: sessionStorage.getItem('userNo')
     }
   },
@@ -152,8 +155,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)
     },
@@ -280,18 +294,21 @@ export default {
       }
     },
     allCheck() {
-      if (this.maxLength) {
-        this.checkList = this.filterListS.slice(0, this.maxLength)?.map((res) => res[this.onlyKey])
-        console.log(this.checkList, this.filterListS)
+      if (this.checkList.length === this.filterListS.length) {
+        this.checkList = []
       } else {
-        this.checkList = this.filterListS?.map((res) => res[this.onlyKey])
+        if (this.maxLength) {
+          this.checkList = this.filterListS.slice(0, this.maxLength)?.map((res) => res[this.onlyKey])
+        } else {
+          this.checkList = this.filterListS?.map((res) => res[this.onlyKey])
+        }
       }
     },
     defaultCheck() {
       this.checkList = this.defineCheckList
     },
     cancel() {
-      this.checkList = this.defineCheckList
+      this.checkList = this.cancelCheck
       this.$refs.advanced_popover.showPopper = false
     },
     savaCheck() {
@@ -379,7 +396,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/DatePicker/por.vue

@@ -52,6 +52,23 @@ let disabledDate_2 = (t) => {
 }
 
 let shortcuts_1 = [
+  {
+    text: $lc('今天'),
+    onClick(picker) {
+      const start = new Date()
+      const end = new Date()
+      picker.$emit('pick', [start, end])
+    }
+  },
+  {
+    text: $lc('最近一周'),
+    onClick(picker) {
+      const end = new Date()
+      const start = new Date()
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+      picker.$emit('pick', [start, end])
+    }
+  },
   {
     text: $lc('最近一月'),
     onClick(picker) {

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 truncate"
             @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>
@@ -53,6 +53,7 @@ export default {
     async clickSystem(item) {
       await this.getTreeList(item)
       window.localStorage.setItem('pageInSystemNo', item.NO)
+      window.sessionStorage.setItem('navFlog', true)
       // 切换系统的时候清除缓存的页签
       window.sessionStorage.removeItem('tab-list')
       let { base = '/' } = this.$router.options
@@ -60,6 +61,8 @@ export default {
       window.location.href = window.location.origin + base + 'dashboard/workplace'
     },
     async clickMenu(row, MenuTre) {
+      console.log(row)
+      window.sessionStorage.setItem('navFlog', true)
       let pageInSystemNo = window.localStorage.getItem('pageInSystemNo')
       window.localStorage.setItem('pageInType', 'toFront')
       if (pageInSystemNo === row.systemNo) {

package/src/components/LoginTemporary/indexN.vue

@@ -435,11 +435,11 @@ export default {
     async init() {
       const { _layoutData = {}, loginSetting, screenInspect } = await getJsonc('/server-config.jsonc')
       let _loginSetting = loginSetting || _layoutData.loginSetting
+      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')

package/src/i18n.json

@@ -11,6 +11,9 @@
   "初始化后将全局生效！": {
     "en": "After initialization, it will be global!"
   },
+  "请上传附件": {
+    "en": "Please upload the attachment"
+  },
   "数据请求": {
     "en": "Data request"
   },