n20-common-lib 1.2.5 → 1.2.8

package/src/components/Layout/AsideNav/index.vue

@@ -8,91 +8,60 @@
     active-text-color="#ffffff"
   >
     <template v-for="omenus in menus">
-      <template v-for="item in omenus.menu">
+      <template v-for="itemA in omenus.menu">
         <!-- 一级菜单 -->
-        <el-menu-item
-          v-if="!item.children"
-          :key="item.title"
-          :index="item.uuid"
-          @click="linkFn(item)"
-        >
-          <i
-            v-if="item.iconUrl"
-            class="el-icon- icon-url"
-            :style="{ backgroundImage: `url(${item.iconUrl})` }"
-          ></i>
-          <i v-else :class="item.iconClass"></i>
-          <span v-if="!item.href" slot="title">{{ item | titleF }}</span>
-          <a
-            v-else
-            slot="title"
-            :href="item.href"
-            target="_blank"
-            :rel="/^\//.test(item.href) ? 'opener' : undefined"
-            >{{ item | titleF }}</a
-          >
-        </el-menu-item>
+        <MenuItem
+          v-if="!itemA.children"
+          :key="itemA.title"
+          :item="itemA"
+          @click="linkFn"
+        />
         <el-submenu
           v-else
-          :key="item.title"
-          :index="item.title"
+          :key="itemA.title"
+          :index="itemA.title"
           popper-class="nav-menu-pop"
         >
-          <template slot="title">
-            <i
-              v-if="item.iconUrl"
-              class="el-icon- icon-url"
-              :style="{ backgroundImage: `url(${item.iconUrl})` }"
-            ></i>
-            <i v-else :class="item.iconClass"></i>
-            <span>{{ item | titleF }}</span>
-          </template>
-          <template v-for="itemc in item.children">
+          <SubmenuTitle slot="title" :item="itemA" />
+          <template v-for="itemB in itemA.children">
             <!-- 二级菜单 -->
-            <el-menu-item
-              v-if="!itemc.children"
-              :key="itemc.title"
-              :index="itemc.uuid"
-              @click="linkFn(itemc)"
-            >
-              <i
-                v-if="itemc.iconUrl"
-                class="el-icon- icon-url"
-                :style="{ backgroundImage: `url(${itemc.iconUrl})` }"
-              ></i>
-              <i v-else :class="itemc.iconClass"></i>
-              <span slot="title">{{ itemc | titleF }}</span>
-            </el-menu-item>
+            <MenuItem
+              v-if="!itemB.children"
+              :key="itemB.title"
+              :item="itemB"
+              @click="linkFn"
+            />
             <el-submenu
               v-else
-              :key="itemc.title"
-              :index="itemc.title"
+              :key="itemB.title"
+              :index="itemB.title"
               popper-class="nav-menu-pop"
             >
-              <template slot="title">
-                <i
-                  v-if="itemc.iconUrl"
-                  class="el-icon- icon-url"
-                  :style="{ backgroundImage: `url(${itemc.iconUrl})` }"
-                ></i>
-                <i v-else :class="itemc.iconClass"></i>
-                <span>{{ itemc | titleF }}</span>
-              </template>
-              <template v-for="itemcc in itemc.children">
+              <SubmenuTitle slot="title" :item="itemB" />
+              <template v-for="itemC in itemB.children">
                 <!-- 三级菜单 -->
-                <el-menu-item
-                  :key="itemcc.title"
-                  :index="itemcc.uuid"
-                  @click="linkFn(itemcc)"
+                <MenuItem
+                  v-if="!itemC.children"
+                  :key="itemC.title"
+                  :item="itemC"
+                  @click="linkFn"
+                />
+                <el-submenu
+                  v-else
+                  :key="itemC.title"
+                  :index="itemC.title"
+                  popper-class="nav-menu-pop"
                 >
-                  <i
-                    v-if="itemcc.iconUrl"
-                    class="el-icon- icon-url"
-                    :style="{ backgroundImage: `url(${itemcc.iconUrl})` }"
-                  ></i>
-                  <i v-else :class="itemcc.iconClass"></i>
-                  <span slot="title">{{ itemcc | titleF }}</span>
-                </el-menu-item>
+                  <SubmenuTitle slot="title" :item="itemC" />
+                  <template v-for="itemD in itemC.children">
+                    <!-- 四级菜单 -->
+                    <MenuItem
+                      :key="itemD.title"
+                      :item="itemD"
+                      @click="linkFn"
+                    />
+                  </template>
+                </el-submenu>
               </template>
             </el-submenu>
           </template>
@@ -101,17 +70,23 @@
     </template>
     <span class="flex-item"></span>
     <div class="open-collapsed-btn">
-      <span :class="collapse ? 'n20-icon-caidanshouqi f-s-l rotate-icon':'n20-icon-caidanshouqi f-s-l' " @click="setCollapse"></span>
+      <span
+        :class="
+          collapse
+            ? 'n20-icon-caidanshouqi f-s-l rotate-icon'
+            : 'n20-icon-caidanshouqi f-s-l'
+        "
+        @click="setCollapse"
+      ></span>
     </div>
   </el-menu>
 </template>
 
 <script>
-import { labelF } from '../utils'
+import MenuItem from './menuItem.vue'
+import SubmenuTitle from './submenuTitle.vue'
 export default {
-  filters: {
-    titleF: labelF
-  },
+  components: { MenuItem, SubmenuTitle },
   props: {
     menus: {
       type: Array,

package/src/components/Layout/AsideNav/menuItem.vue

@@ -0,0 +1,34 @@
+<template>
+  <el-menu-item :index="item.uuid" @click="$emit('click', item)">
+    <i
+      v-if="item.iconUrl"
+      class="el-icon- icon-url"
+      :style="{ backgroundImage: `url(${item.iconUrl})` }"
+    ></i>
+    <i v-else :class="item.iconClass"></i>
+    <span v-if="!item.href" slot="title">{{ item | titleF }}</span>
+    <a
+      v-else
+      slot="title"
+      :href="item.href"
+      target="_blank"
+      :rel="/^\//.test(item.href) ? 'opener' : undefined"
+      >{{ item | titleF }}</a
+    >
+  </el-menu-item>
+</template>
+
+<script>
+import { labelF } from '../utils'
+export default {
+  filters: {
+    titleF: labelF
+  },
+  props: {
+    item: {
+      type: Object,
+      default: () => ({})
+    }
+  }
+}
+</script>

package/src/components/Layout/AsideNav/submenuTitle.vue

@@ -0,0 +1,26 @@
+<template>
+  <component :is="'slot'">
+    <i
+      v-if="item.iconUrl"
+      class="el-icon- icon-url"
+      :style="{ backgroundImage: `url(${item.iconUrl})` }"
+    ></i>
+    <i v-else :class="item.iconClass"></i>
+    <span>{{ item | titleF }}</span>
+  </component>
+</template>
+
+<script>
+import { labelF } from '../utils'
+export default {
+  filters: {
+    titleF: labelF
+  },
+  props: {
+    item: {
+      type: Object,
+      default: () => ({})
+    }
+  }
+}
+</script>

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

@@ -89,6 +89,23 @@
         <el-dropdown-item command="myDeal" divided>{{
           '我的交易' | $l(i18n)
         }}</el-dropdown-item>
+        <el-dropdown-item
+          v-if="customOpt.agency && customOpt.agency.show"
+          command="myAgency"
+          divided
+        >
+          <div class="flex-box flex-v">
+            <span>{{ '工作代理' | $l(i18n) }}</span>
+            <el-badge
+              v-if="customOpt.agency.underway"
+              class="m-l-auto font-size-small color-primary"
+              is-dot
+              type="primary"
+              style="line-height: initial"
+              >进行中</el-badge
+            >
+          </div>
+        </el-dropdown-item>
         <el-divider class="m-t-s m-b-s" />
         <div class="user-log-time p-l p-r p-b-s">
           <i
@@ -171,6 +188,9 @@ const i18n = {
   我的交易: {
     en: 'My deal'
   },
+  工作代理: {
+    en: 'My agency'
+  },
   登录时长: {
     en: 'Login duration'
   },
@@ -209,6 +229,12 @@ export default {
     changePwd,
     noticePop
   },
+  inject: {
+    customOpt: {
+      type: Object,
+      default: () => ({})
+    }
+  },
   data() {
     return {
       show: false,
@@ -271,18 +297,15 @@ export default {
         case 'dowApp':
           this.dowApp()
           break
-        case 'setStyle':
-          this.setStyle()
-          break
         case 'changePassword':
           this.changePassword()
           break
-        case 'myDeal':
-          this.myDeal()
-          break
         case 'logOut':
           this.logOut()
           break
+        default:
+          this.$emit('custom-event', { type: c })
+          break
       }
     },
     setLang() {
@@ -302,18 +325,10 @@ export default {
         aDom = undefined
       })
     },
-    setStyle() {
-      // alert('主题设置')
-      this.$emit('custom-event', { type: 'setStyle' })
-    },
     changePassword() {
       // alert('修改密码')
       this.cpwdV = true
     },
-    myDeal() {
-      // alert('我的交易')
-      this.$emit('custom-event', { type: 'myDeal' })
-    },
     logOut() {
       // alert('退出登录')
       this.$confirm(

package/src/components/Table/index.vue

@@ -21,6 +21,7 @@
         v-else
         :key="'cl-table-' + i"
         :formatter="item.formatter | colfF"
+        :filters="item.filters | colftF(filtersMap)"
         v-bind="item"
       />
     </template>
@@ -104,7 +105,7 @@ export default {
         let mc = colf.match(/{(\S+)\|rate}/)
         let key = mc && mc[1]
 
-        return (row) => numerify(row[key], '0.00[00]')
+        return (row) => numerify(row[key], '0.000000')
       } else {
         let mc = colf.match(/{[^}]+}/g) || []
         let mcv = mc.map((m) => m.replace(/{|}/g, ''))
@@ -117,6 +118,10 @@ export default {
           return str
         }
       }
+    },
+    colftF(colft, fMap) {
+      if (typeof colft !== 'string') return colft
+      return fMap[colft]
     }
   },
   props: {
@@ -133,6 +138,10 @@ export default {
       require: true,
       default: () => []
     },
+    filtersMap: {
+      type: Object,
+      default: () => ({})
+    },
     pageObj: {
       type: Object,
       default: undefined

package/src/directives/VTitle/index.js

@@ -1,5 +1,7 @@
 import Tooltip from './tooltip.vue'
 
+let timer = undefined
+
 function tipShow(el, tip) {
   if (el.$tooltipTitle) {
     if (!el.$tooltipTitleOverflow || el.clientWidth < el.scrollWidth) {
@@ -8,6 +10,12 @@ function tipShow(el, tip) {
       tip.$refs['title-pop'].doDestroy()
       tip.$nextTick(() => {
         tip.visible = true
+        timer = setInterval(() => {
+          if (tip.visible && !el.scrollWidth) {
+            tipHide(el, tip)
+            clearInterval(timer)
+          }
+        }, 1000)
       })
     }
   }

package/src/index.js

@@ -44,6 +44,7 @@ import Anchor from './components/Anchor/index.vue'
 import AnchorItem from './components/Anchor/AnchorItem.vue'
 import FlowStep from './components/FlowStep/index.vue'
 import CascaderArea from './components/CascaderArea/index.vue'
+import FileExportAsync from './components/FileExportAsync/index.vue'
 /* old */
 import TableO from './components/Table/indexO.vue'
 import FiltersO from './components/Filters/indexO.vue'
@@ -59,6 +60,8 @@ import VClickOutside from './directives/VClickOutside/index.js'
 import VHas from './directives/VHas/index.js'
 
 /** 注入方法 */
+import dayjs from 'dayjs'
+import numerify from 'numerify'
 import axios from './utils/axios.js'
 import auth from './utils/auth.js'
 import { msgPor, msgboxPor } from './utils/msgboxPor.js'
@@ -121,6 +124,7 @@ const components = [
   AnchorItem,
   FlowStep,
   CascaderArea,
+  FileExportAsync,
   /* old */
   TableO,
   FiltersO,
@@ -211,8 +215,11 @@ export {
   AnchorItem,
   FlowStep,
   CascaderArea,
+  FileExportAsync,
   repairEl,
   linkPush,
   linkGo,
-  isHas
+  isHas,
+  dayjs,
+  numerify
 }

package/src/plugins/SetMenuTree/setmenutree.vue

@@ -79,10 +79,10 @@
               { required: true, message: '请输入名称', trigger: 'blur' }
             ]"
           >
-            <el-input v-model="activeMenu.label" class="w-224" />
+            <el-input v-model="activeMenu.label" class="input-w" />
           </el-form-item>
           <el-form-item label="属性:">
-            <el-select v-model="activeMenu.resType" class="w-224">
+            <el-select v-model="activeMenu.resType" class="input-w">
               <el-option value="1" label="左边栏菜单" />
               <el-option value="2" label="隐藏菜单" />
               <el-option value="3" label="权限按钮" />
@@ -99,7 +99,7 @@
           >
             <el-input
               v-model="activeMenu.appNo"
-              class="w-224"
+              class="input-w"
               @change="(val) => setAppNo(val, activeMenu)"
             />
           </el-form-item>
@@ -112,7 +112,7 @@
                 { required: true, message: '请输入访问路径', trigger: 'blur' }
               ]"
             >
-              <el-input v-model="activeMenu.pageurl" class="w-224" />
+              <el-input v-model="activeMenu.pageurl" class="input-w" />
             </el-form-item>
             <el-form-item label="图标:">
               <div class="flex-box">
@@ -151,7 +151,7 @@
             </el-form-item>
           </template>
           <el-form-item v-if="activeMenu.treeno" label="权限编码:">
-            <div class="w-224 flex-box">
+            <div class="input-w flex-box">
               <el-input class="flex-item" :value="activeMenu.treeno" readonly />
             </div>
           </el-form-item>

package/style/css/normalize.scss

@@ -4,7 +4,7 @@ $--border-radius-base: 4px !default;
 $--input-width: 224px !default;
 
 // 项目中可以直接使用
-// .w-224 {width: $--input-width;}
+// .input-w {width: $--input-width;}
 // .button-4em{min-width: 72px;}
 /* 格式化样式
 ---------------- */