From 119a50f37034b5dc23e5db2bde368558e6bb7e80 Mon Sep 17 00:00:00 2001
From: aring <aring@aringdeMac-mini.local>
Date: Tue, 26 Jan 2021 16:14:42 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E5=AE=9E?=
 =?UTF-8?q?=E7=8E=B0=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fes-plugin-enums/src/runtime/core.tpl     | 78 +++++++++++--------
 packages/fes-template/.fes.js                 |  2 +-
 packages/fes-template/src/pages/index.vue     | 20 +++--
 3 files changed, 57 insertions(+), 43 deletions(-)

diff --git a/packages/fes-plugin-enums/src/runtime/core.tpl b/packages/fes-plugin-enums/src/runtime/core.tpl
index 2a01f30f..6977d31b 100644
--- a/packages/fes-plugin-enums/src/runtime/core.tpl
+++ b/packages/fes-plugin-enums/src/runtime/core.tpl
@@ -1,3 +1,5 @@
+import { readonly } from "vue"
+
 // [[key, value]]，默认配置格式
 const _ENUMS = {{{REPLACE_ENUMS}}}
 const ENUMS = {}
@@ -11,14 +13,14 @@ Object.keys(_ENUMS).forEach(key => {
  * @param {string} key 枚举键名称
  * @param {string} dir 枚举键值路径，默认value，格式如：value.propName、value.propName[0]
  */
-function get(name, key, dir='value') {
+function get(name, key, opt = { dir: 'value' }) {
     let list = ENUMS[name] || []
     if (key) {
-        let value = list.filter(item => item.key === key)[0]
-        if (!value) return key
-        return parseValueDir(value, dir)
+        let res = list.filter(item => item.key === key)[0]
+        if (!res) return key
+        return readonly(parseValueDir(res.value, opt.dir) || key)
     } else {
-        return list
+        return readonly(list)
     }
 }
 
@@ -34,17 +36,32 @@ function remove(name) {
  * 添加一个新的枚举，重复添加会覆盖
  * @param {string} name 枚举名称
  * @param {Array<Object|Array>} _enum 枚举数组，数组元素可以是数组或者对象
- * @param {string} keyName 指定枚举键名称取值属性
- * @param {string} valueName 指定枚举键值取值属性
+ * @param {object} opt {keyName: 'key', valueName: ''} keyName: 指定枚举键名称取值属性 valueName 指定枚举键值取值属性
  */
-function push(name, _enum, keyName='key', valueName='value') {
+function push(name, _enum, opt = { keyName: '', valueName: '' }) {
     if (ENUMS[name]) {
         console.warn(`enums warn: the ${name}'s enum already exists, cover!`)
     }
-    ENUMS[name] = convert(name, _enum, keyName, valueName)
+    ENUMS[name] = convert(name, _enum, opt)
     return get(name)
 }
 
+/**
+ * 基于现有的枚举，连接上新的枚举后返回新的枚举
+ * @param {string} name 枚举名称
+ * @param {Array<Object|Array>} _enum 枚举数组，数组元素可以是数组或者对象
+ * @param {object} opt {keyName: 'key', valueName: ''} keyName: 指定枚举键名称取值属性 valueName 指定枚举键值取值属性 before: 是否添加在现有的之前
+ */
+function concat(name, _enum, opt = { keyName: '', valueName: '', before: false }) {
+    let list = ENUMS[name] || []
+    let partList = convert(name, _enum, opt) || []
+    if (opt.before) {
+        return readonly(partList.concat(list))
+    } else {
+        return readonly(list.concat(partList))
+    }
+}
+
 /**
  * 根据dir解析value的属性值
  * @param value
@@ -73,10 +90,9 @@ function parseValueDir(value, dir='value') {
  * 转换传入的枚举数组
  * @param {string} name 枚举名称
  * @param {Array<Object|Array>} _enum 枚举数组，数组元素可以是数组或者对象
- * @param {string} keyName 指定枚举键名称取值属性
- * @param {string} valueName 指定枚举键值取值属性
+ * @param {object} opt {keyName: 'key', valueName: ''} keyName: 指定枚举键名称取值属性 valueName 指定枚举键值取值属性
  */
-function convert(name, _enum, keyName='key', valueName='value') {
+function convert(name, _enum, opt = { keyName: '', valueName: '' }) {
     if (!name) {
         throw new Error(`enums error: name must not be empty！`)
     }
@@ -85,35 +101,35 @@ function convert(name, _enum, keyName='key', valueName='value') {
     }
     let list = []
     _enum.forEach((item, index) => {
+        let _item;
         if (Array.isArray(item)) {
-            let _item = item[1]
-            if (Object.prototype.toString.call(_item) !== '[object Object]') {
-                _item = { value: _item }
-            }
-            _item.key = item[0]
-            list.push(_item)
+            _item = {key: item[0], value: item[1]}
         } else if(Object.prototype.toString.call(item) === '[object Object]') {
-            list.push({
-                key: item[keyName],
-                value: item[valueName],
-                ...item
-            })
+            if (!opt.keyName) opt.keyName = 'key'
+            // key可能为空，有场景需要使用，比如全选
+            _item = {
+                key: item[opt.keyName],
+                value: opt.valueName ? item[opt.valueName] : item
+            }
         } else {
-            console.log(`enums warn: the ${name}'s enum item[${index}] must be array or object！`)
+            console.warn(`enums warn: the key ${name} enum item[${index}] must be array or object！`)
+            return
+        }
+        let res = list.filter(item => item.key === _item.key)[0]
+        if (res) { // 重复key覆盖提示
+            console.warn(`enums warn: the key ${res.key} enum item already exists, cover!`)
+            res.value = _item.value
+        } else {
+            list.push(_item)
         }
     })
     return list
 }
 
-const $data = new Proxy(ENUMS, {
-    get: function(target, key) {
-        return get(key)
-    }
-})
-
 export const enums = {
     get,
     push,
     remove,
-    $data
+    concat,
+    convert
 }
\ No newline at end of file
diff --git a/packages/fes-template/.fes.js b/packages/fes-template/.fes.js
index b39567ce..d5cef583 100644
--- a/packages/fes-template/.fes.js
+++ b/packages/fes-template/.fes.js
@@ -29,6 +29,6 @@ export default {
         port: 8080
     },
     enums: {
-        status: [['1', '有效的'], ['0', '无效的']]
+        status: [['0', '无效的'], ['1', '有效的']]
     }
 };
diff --git a/packages/fes-template/src/pages/index.vue b/packages/fes-template/src/pages/index.vue
index 4e38bc52..a08cbeda 100644
--- a/packages/fes-template/src/pages/index.vue
+++ b/packages/fes-template/src/pages/index.vue
@@ -5,11 +5,9 @@
         <access :id="accessId"> accessOnepicess1 <input /> </access>
         <div v-access="accessId"> accessOnepicess2 <input /> </div>
         <input />
-        <div>
-            <div>数据字典：</div>
-            <div v-for="item in status" :key="item.key">{{item.value}}-{{item.key}}</div>
-            <div v-for="item in coustomStatus" :key="item.key">{{item.value}}-{{item.key}}</div>
-        </div>
+        <h4>数据字典</h4>
+        <div v-for="item in enumsGet('status')" :key="item.key">{{item.value}}：{{item.key}}</div>
+        <div v-for="item in enumsGet('constomStatus')" :key="item.key">{{item.value}}：{{item.key}}</div>
     </div>
 </template>
 <config>
@@ -19,7 +17,7 @@
 }
 </config>
 <script>
-import { ref, onMounted, reactive } from 'vue';
+import { ref, onMounted } from 'vue';
 import {
     access, useAccess, useRouter, useI18n, locale, enums
 } from '@webank/fes';
@@ -31,9 +29,10 @@ export default {
         const localI18n = useI18n();
         const router = useRouter();
         const accessId = ref('/onepiece1');
-        const status = reactive(enums.$data.status);
-        enums.push('coustomStatus', [{ id: 1, desc: '是' }, { id: 1, desc: '否' }], 'id', 'desc');
-        const coustomStatus = reactive(enums.$data.coustomStatus);
+        console.log(enums.get('status'));
+        const constomStatus = enums.push('constomStatus', [{ id: 1, desc: '是' }, { id: 0, desc: '否' }], { keyName: 'id', valueName: 'desc' });
+        console.log(constomStatus);
+        console.log(enums.concat('status', [['2', '未定义']]));
         onMounted(() => {
             console.log(router);
             setTimeout(() => {
@@ -52,8 +51,7 @@ export default {
             fes,
             accessOnepicess,
             t: localI18n.t,
-            status,
-            coustomStatus
+            enumsGet: enums.get
         };
     }
 };