diff --git a/.vscode/settings.json b/.vscode/settings.json index 601696f5f..d8454fb56 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -33,5 +33,6 @@ "i18n-ally.enabledParsers": ["yaml", "js"], "i18n-ally.sourceLanguage": "en", "i18n-ally.displayLanguage": "zh-CN", - "i18n-ally.enabledFrameworks": ["vue"] + "i18n-ally.enabledFrameworks": ["vue"], + "iconify.excludes": ["el"] } diff --git a/src/views/able/ant-anchor.vue b/src/views/able/ant-anchor.vue index 1918fb45d..08134a052 100644 --- a/src/views/able/ant-anchor.vue +++ b/src/views/able/ant-anchor.vue @@ -12,19 +12,25 @@ function handleAnchorClick(e, link) {
diff --git a/src/views/able/ant-tabs.vue b/src/views/able/ant-tabs.vue index 0cb80a59f..20fb270a3 100644 --- a/src/views/able/ant-tabs.vue +++ b/src/views/able/ant-tabs.vue @@ -13,19 +13,25 @@ const callback = (val: string) => { diff --git a/src/views/able/ant-treeSelect.vue b/src/views/able/ant-treeSelect.vue index 6df2d2aba..e38b1c6c9 100644 --- a/src/views/able/ant-treeSelect.vue +++ b/src/views/able/ant-treeSelect.vue @@ -122,19 +122,25 @@ const onLoadData = treeNode => {
@@ -171,9 +177,9 @@ const onLoadData = treeNode => { :max-tag-count="10" > diff --git a/src/views/able/barcode.vue b/src/views/able/barcode.vue index 8a5b3ba49..421f8dabf 100644 --- a/src/views/able/barcode.vue +++ b/src/views/able/barcode.vue @@ -30,12 +30,15 @@ const barcodes = [ diff --git a/src/views/able/cascader.vue b/src/views/able/cascader.vue index 74748195c..fbe0a0c6c 100644 --- a/src/views/able/cascader.vue +++ b/src/views/able/cascader.vue @@ -36,12 +36,13 @@ const handleChange = value => {
绑定值:{{ selectedOptions1 }}
- 区域码转汉字:{{ CodeToText[selectedOptions1[0]] }},{{ - CodeToText[selectedOptions1[1]] - }} + 区域码转汉字: + {{ CodeToText[selectedOptions1[0]] }}, + {{ CodeToText[selectedOptions1[1]] }}
- 汉字转区域码:{{ + 汉字转区域码: + {{ convertTextToCode( CodeToText[selectedOptions1[0]], CodeToText[selectedOptions1[1]] @@ -64,12 +65,13 @@ const handleChange = value => {
绑定值:{{ selectedOptions3 }}
- 区域码转汉字:{{ CodeToText[selectedOptions3[0]] }},{{ - CodeToText[selectedOptions3[1]] - }} + 区域码转汉字: + {{ CodeToText[selectedOptions3[0]] }}, + {{ CodeToText[selectedOptions3[1]] }}
- 汉字转区域码:{{ + 汉字转区域码: + {{ convertTextToCode( CodeToText[selectedOptions3[0]], CodeToText[selectedOptions3[1]] @@ -92,12 +94,14 @@ const handleChange = value => {
绑定值:{{ selectedOptions2 }}
- 区域码转汉字:{{ CodeToText[selectedOptions2[0]] }},{{ - CodeToText[selectedOptions2[1]] - }},{{ CodeToText[selectedOptions2[2]] }} + 区域码转汉字: + {{ CodeToText[selectedOptions2[0]] }}, + {{ CodeToText[selectedOptions2[1]] }}, + {{ CodeToText[selectedOptions2[2]] }}
- 汉字转区域码:{{ + 汉字转区域码: + {{ convertTextToCode( CodeToText[selectedOptions2[0]], CodeToText[selectedOptions2[1]], @@ -121,12 +125,14 @@ const handleChange = value => {
绑定值:{{ selectedOptions4 }}
- 区域码转汉字:{{ CodeToText[selectedOptions4[0]] }},{{ - CodeToText[selectedOptions4[1]] - }},{{ CodeToText[selectedOptions4[2]] }} + 区域码转汉字: + {{ CodeToText[selectedOptions4[0]] }}, + {{ CodeToText[selectedOptions4[1]] }}, + {{ CodeToText[selectedOptions4[2]] }}
- 汉字转区域码:{{ + 汉字转区域码: + {{ convertTextToCode( CodeToText[selectedOptions4[0]], CodeToText[selectedOptions4[1]], diff --git a/src/views/able/debounce.vue b/src/views/able/debounce.vue index 25767d4a0..d6431eb7b 100644 --- a/src/views/able/debounce.vue +++ b/src/views/able/debounce.vue @@ -27,12 +27,12 @@ const throttleClick = useThrottleFn(handle, 1000, false); 所谓防抖,就是指触发事件后在 n 秒内函数只能执行一次,如果在 n 秒内又触发了事件,则会重新计算函数执行时间。
- 连续点击我,只会执行最后一次点击事件,立即执行 - 连续点击我,只会执行最后一次点击事件,延后执行 + + 连续点击我,只会执行最后一次点击事件,立即执行 + + + 连续点击我,只会执行最后一次点击事件,延后执行 + diff --git a/src/views/able/menu-tree.vue b/src/views/able/menu-tree.vue index 067d110dd..a0faabe7e 100644 --- a/src/views/able/menu-tree.vue +++ b/src/views/able/menu-tree.vue @@ -48,16 +48,18 @@ const filterMethod = (query: string, node: treeNode) => { { diff --git a/src/views/able/swiper.vue b/src/views/able/swiper.vue index d86227012..e255a3090 100644 --- a/src/views/able/swiper.vue +++ b/src/views/able/swiper.vue @@ -102,12 +102,15 @@ const swiperExample: SwiperExample[] = [ diff --git a/src/views/able/watermark.vue b/src/views/able/watermark.vue index 5f9d8e47a..a15c66164 100644 --- a/src/views/able/watermark.vue +++ b/src/views/able/watermark.vue @@ -14,19 +14,19 @@ const { setWatermark, clear } = useWatermark(); 页面水印功能
- 请输入要创建水印的值: 请输入要创建水印的值: + - 请选择要创建水印的颜色: + 请选择要创建水印的颜色: +
- 创建 + + 创建 + 清除 diff --git a/src/views/about/index.vue b/src/views/about/index.vue index dc84f334d..c15190386 100644 --- a/src/views/about/index.vue +++ b/src/views/about/index.vue @@ -70,11 +70,11 @@ Object.keys(devDependencies).forEach(key => { - 点击链接加入群聊【Pure Admin】 + + + 点击链接加入群聊【Pure Admin】 + + diff --git a/src/views/components/contextmenu/menuDynamic.vue b/src/views/components/contextmenu/menuDynamic.vue index b7d16b00c..d04180dfd 100644 --- a/src/views/components/contextmenu/menuDynamic.vue +++ b/src/views/components/contextmenu/menuDynamic.vue @@ -7,20 +7,21 @@ - 添加菜单 - 添加菜单组 + + 添加菜单 + + + 添加菜单组 + 添加子菜单 - 删除 + 添加子菜单 + + + 删除 + diff --git a/src/views/components/video/index.vue b/src/views/components/video/index.vue index 4504b8a48..932e88eec 100644 --- a/src/views/components/video/index.vue +++ b/src/views/components/video/index.vue @@ -29,14 +29,16 @@ onMounted(() => { diff --git a/src/views/editor/index.vue b/src/views/editor/index.vue index d70887888..39cf8db7d 100644 --- a/src/views/editor/index.vue +++ b/src/views/editor/index.vue @@ -24,7 +24,7 @@ onMounted(() => { }, 1500); }); -const toolbarConfig = { excludeKeys: "fullScreen" }; +const toolbarConfig: any = { excludeKeys: "fullScreen" }; const editorConfig = { placeholder: "请输入内容..." }; // 组件销毁时,也及时销毁编辑器 @@ -43,14 +43,16 @@ const handleCreated = editor => { diff --git a/src/views/error/403.vue b/src/views/error/403.vue index a0e8969ea..390663770 100644 --- a/src/views/error/403.vue +++ b/src/views/error/403.vue @@ -55,8 +55,9 @@ import noAccess from "/@/assets/status/403.svg?component"; delay: 500 } }" - >返回首页 + 返回首页 +
diff --git a/src/views/error/404.vue b/src/views/error/404.vue index c8d4b5239..f288b6313 100644 --- a/src/views/error/404.vue +++ b/src/views/error/404.vue @@ -55,8 +55,9 @@ import noExist from "/@/assets/status/404.svg?component"; delay: 500 } }" - >返回首页 + 返回首页 +
diff --git a/src/views/error/500.vue b/src/views/error/500.vue index 7f2349cc0..2501cef36 100644 --- a/src/views/error/500.vue +++ b/src/views/error/500.vue @@ -55,8 +55,9 @@ import noServer from "/@/assets/status/500.svg?component"; delay: 500 } }" - >返回首页 + 返回首页 +
diff --git a/src/views/flow-chart/index.vue b/src/views/flow-chart/index.vue index 522973609..56eb4de43 100644 --- a/src/views/flow-chart/index.vue +++ b/src/views/flow-chart/index.vue @@ -62,15 +62,17 @@ onMounted(() => {
diff --git a/src/views/guide/index.vue b/src/views/guide/index.vue index e8d4b3d9b..b9d6f0350 100644 --- a/src/views/guide/index.vue +++ b/src/views/guide/index.vue @@ -68,9 +68,9 @@ const guide = () => { [ diff --git a/src/views/list/card/components/DialogForm.vue b/src/views/list/card/components/DialogForm.vue index 8f1f925fb..f5aac5259 100644 --- a/src/views/list/card/components/DialogForm.vue +++ b/src/views/list/card/components/DialogForm.vue @@ -139,9 +139,9 @@ const rules = { diff --git a/src/views/list/card/index.vue b/src/views/list/card/index.vue index 616378e45..6205a72d8 100644 --- a/src/views/list/card/index.vue +++ b/src/views/list/card/index.vue @@ -97,9 +97,9 @@ const handleManageProduct = product => { 切换角色 + 切换角色 + diff --git a/src/views/result/fail.vue b/src/views/result/fail.vue index 31e9e5f64..491702b08 100644 --- a/src/views/result/fail.vue +++ b/src/views/result/fail.vue @@ -35,13 +35,15 @@ href="javascript:void(0);" class="flex items-center" style="color: var(--el-color-primary)" - >立即解冻 + > + 立即解冻 + /> + @@ -57,13 +59,15 @@ href="javascript:void(0);" class="flex items-center" style="color: var(--el-color-primary)" - >立即升级 + > + 立即升级 + /> + diff --git a/src/views/result/success.vue b/src/views/result/success.vue index 6198b8200..dcfdda6c4 100644 --- a/src/views/result/success.vue +++ b/src/views/result/success.vue @@ -47,7 +47,8 @@ const { lastBuildTime } = __APP_INFO__; aria-label="dingding" class="anticon anticon-dingding cursor-pointer flex items-center cursor-pointer" style="color: rgb(0, 160, 233); margin-left: 8px" - > + { type="text" icon="fa fa-pencil-square-o" @click="editConfig(row)" - >编辑 + 编辑 + 删除 + 删除 + @@ -140,9 +142,9 @@ const checkboxChangeEvent: VxeTableEvents.CheckboxChange = ({ records }) => { :indeterminate="configData.isIndeterminate" @change="changeAllEvent" /> - 已选中{{ configData.selectRecords.length }}条 + + 已选中{{ configData.selectRecords.length }}条 + {{ t("buttons.hsdelete") }} diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue index 9fdacc8ee..35205524d 100644 --- a/src/views/system/dict/index.vue +++ b/src/views/system/dict/index.vue @@ -217,24 +217,23 @@ function handleClose() { /> @@ -269,24 +268,27 @@ function handleClose() { type="text" icon="fa fa-pencil-square-o" @click="onEdit(row)" - >编辑 + 编辑 + 新增子类型 + 新增子类型 + 字典配置 - 删除 + 字典配置 + + + 删除 + diff --git a/src/views/welcome/index.vue b/src/views/welcome/index.vue index 5dc44222a..7e16ea54e 100644 --- a/src/views/welcome/index.vue +++ b/src/views/welcome/index.vue @@ -89,9 +89,9 @@ const openDepot = (): void => { >