diff --git a/src/lang/modules/enUS.ts b/src/lang/modules/enUS.ts index c41620f..89a59ae 100644 --- a/src/lang/modules/enUS.ts +++ b/src/lang/modules/enUS.ts @@ -107,7 +107,7 @@ export default { ["audio"]: "audio", ["recorder"]: "recorder", ["virtual-list"]: "virtual-list", - ["tools"]: "tools", + ["common-tools"]: "common tools", ["test"]: "test" } }; diff --git a/src/lang/modules/zhCN.ts b/src/lang/modules/zhCN.ts index 041253f..02114f6 100644 --- a/src/lang/modules/zhCN.ts +++ b/src/lang/modules/zhCN.ts @@ -107,7 +107,7 @@ export default { ["audio"]: "音频", ["recorder"]: "录音", ["virtual-list"]: "虚拟列表", - ["tools"]: "工具类", + ["common-tools"]: "常用工具类", ["test"]: "测试" } }; diff --git a/src/mock/_data/system_menu.ts b/src/mock/_data/system_menu.ts index 7ad38de..9ac3014 100644 --- a/src/mock/_data/system_menu.ts +++ b/src/mock/_data/system_menu.ts @@ -845,11 +845,11 @@ export const systemMenu = [ { id: "0902", parentId: "09", - path: "/functions/tools", - name: "tools", - component: "functions/tools/tools", + path: "/functions/common-tools", + name: "common-tools", + component: "functions/common-tools/common-tools", meta: { - title: "tools", + title: "common-tools", hide: false, disable: false, keepAlive: true, diff --git a/src/utils/common-tools.ts b/src/utils/common-tools.ts index 1856f02..9f1154c 100644 --- a/src/utils/common-tools.ts +++ b/src/utils/common-tools.ts @@ -24,10 +24,10 @@ export const getColorHexColor = () => `#${Math.floor(Math.random() * 0xfffff).to /** * 判断变量数据类型 - * @param { any } obj 需要判断数据类型的变量 + * @param { any } val 需要判断数据类型的变量 * @return 数据类型 */ -export const getObjType = (obj: any) => { +export const getObjType = (val: any) => { const toString = Object.prototype.toString; const map: any = { "[object Boolean]": "boolean", @@ -39,19 +39,20 @@ export const getObjType = (obj: any) => { "[object RegExp]": "regExp", "[object Undefined]": "undefined", "[object Null]": "null", - "[object Object]": "object" + "[object Object]": "object", + "[object Symbol]": "symbol" }; // 如果是节点 - if (obj instanceof Element) { + if (val instanceof Element) { return "element"; } // 通过toString.call 判断是哪个类型 // 判断的值为类型[object Boolean], 通过对象取值返回 - return map[toString.call(obj)]; + return map[toString.call(val)]; }; /** - * 数组去重 + * 基本数据类型数组去重 * @param { array } v 需要去重的数组 * @return 去重后的数组 */ @@ -114,6 +115,8 @@ export const Difference = (newObj: any, oldObj: any) => { /*** * 删除数组中多个指定元素 + * 根据指定的key比对是否匹配,匹配则删除,最后返回删除后的数组 + * arrMoreDeletion(arr, [2,3,4], 'id') * @param {array} arr 原数组 * @param {array} keys 需要删除的key数组 * @param {string | number} key 根据指定key删除 @@ -241,7 +244,7 @@ export const closest = (arr: number[], num: number) => { }; /*** - * 根据上限值计算涨幅和减幅 + * 根据标准值计算当前值的涨幅和减幅 * @param {number} current 当前值 * @param {number} base 标准值 * @description 返回{ percent: 10, type: 1, text: '涨幅10.00%' }格式 diff --git a/src/views/functions/common-tools/common-tools.vue b/src/views/functions/common-tools/common-tools.vue new file mode 100644 index 0000000..f1d8667 --- /dev/null +++ b/src/views/functions/common-tools/common-tools.vue @@ -0,0 +1,239 @@ + diff --git a/src/views/functions/tools/tools.vue b/src/views/functions/tools/tools.vue deleted file mode 100644 index 568f51e..0000000 --- a/src/views/functions/tools/tools.vue +++ /dev/null @@ -1,114 +0,0 @@ - - - - -