n20-common-lib 1.2.4 → 1.2.7

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/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;}
 /* 格式化样式
 ---------------- */