diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md index f5de57a0a..fbf1c6b1e 100644 --- a/CHANGELOG.zh_CN.md +++ b/CHANGELOG.zh_CN.md @@ -292,7 +292,7 @@ - 添加 `@pureadmin/table` 行、列拖拽示例 - 添加 `@pureadmin/table` 右键菜单示例 - 添加 `@pureadmin/table` 导出 `Excel` 示例 -- 添加 `@pureadmin/table` 编辑单元格示例 +- 添加 `@pureadmin/table` 修改单元格示例 - 添加 `@pureadmin/table` 水印示例 - 添加 `@pureadmin/table` 打印示例 - 添加 `@pureadmin/table` 内嵌 `echarts` 图表示例 diff --git a/README.en-US.md b/README.en-US.md index 791cdd26e..35c2c685f 100644 --- a/README.en-US.md +++ b/README.en-US.md @@ -141,7 +141,7 @@ After operating the above two commands, open `http://localhost:8080` in the brow Of course, you can also operate the `docker` project through the [Docker Desktop](https://www.docker.com/products/docker-desktop/) visual interface, as shown below

- docker + docker-desktop

## Change Log diff --git a/README.md b/README.md index ef41363cb..a79f78bf2 100644 --- a/README.md +++ b/README.md @@ -141,7 +141,7 @@ docker run -dp 8080:80 --name pure-admin vue-pure-admin 当然也可以通过 [Docker Desktop](https://www.docker.com/products/docker-desktop/) 可视化界面去操作 `docker` 项目,如下图

- docker + docker-desktop

## 更新日志 diff --git a/locales/en.yaml b/locales/en.yaml index a3846101e..f6dbce51f 100644 --- a/locales/en.yaml +++ b/locales/en.yaml @@ -36,23 +36,23 @@ menus: hsfourZeroOne: "403" hsFive: "500" hscomponents: Components - hsdialog: Dialog Components - hsmessage: Message Tips Components - hsvideo: Video Components - hssegmented: Segmented Components - hswaterfall: Waterfall Components - hsmap: Map Components - hsdraggable: Draggable Components + hsdialog: Dialog + hsmessage: Message Tips + hsvideo: Video + hssegmented: Segmented + hswaterfall: Waterfall + hsmap: Map + hsdraggable: Draggable hssplitPane: Split Pane - hsbutton: Button Components + hsbutton: Button hscropping: Picture Cropping hsanimatecss: AnimateCss Selector hscountTo: Digital Animation - hsselector: Selector Components + hsselector: Scope Selector hsflowChart: Flow Chart hsseamless: Seamless Scroll hscontextmenu: Context Menu - hstypeit: Typeit Components + hstypeit: Typeit hsjsoneditor: JSON Editor hsmenus: MultiLevel Menu hsmenu1: Menu1 @@ -107,10 +107,9 @@ menus: hsInfiniteScroll: Table Infinite Scroll hsSensitive: Sensitive Filter hsPinyin: PinYin - hsdanmaku: Danmaku Components + hsdanmaku: Danmaku hsPureTableBase: Base Usage hsPureTableHigh: High Usage - hsTree: Big Data Tree hsboard: Paint Board hsMenuoverflow: Menu Overflow Show Tooltip Text hsChildMenuoverflow: Child Menu Overflow Show Tooltip Text diff --git a/locales/zh-CN.yaml b/locales/zh-CN.yaml index e0d5fb1c3..865680279 100644 --- a/locales/zh-CN.yaml +++ b/locales/zh-CN.yaml @@ -36,23 +36,23 @@ menus: hsfourZeroOne: "403" hsFive: "500" hscomponents: 组件 - hsdialog: 函数式弹框组件 - hsmessage: 消息提示组件 - hsvideo: 视频组件 - hssegmented: 分段控制器组件 - hswaterfall: 瀑布流无限滚动组件 - hsmap: 地图组件 - hsdraggable: 拖拽组件 + hsdialog: 函数式弹框 + hsmessage: 消息提示 + hsvideo: 视频 + hssegmented: 分段控制器 + hswaterfall: 瀑布流无限滚动 + hsmap: 地图 + hsdraggable: 拖拽 hssplitPane: 切割面板 - hsbutton: 按钮组件 + hsbutton: 按钮 hscropping: 图片裁剪 - hsanimatecss: AnimateCss选择器组件 + hsanimatecss: animate.css选择器 hscountTo: 数字动画 - hsselector: 选择器组件 + hsselector: 范围选择器 hsflowChart: 流程图 hsseamless: 无缝滚动 hscontextmenu: 右键菜单 - hstypeit: 打字机组件 + hstypeit: 打字机 hsjsoneditor: JSON编辑器 hsmenus: 多级菜单 hsmenu1: 菜单1 @@ -107,10 +107,9 @@ menus: hsInfiniteScroll: 表格无限滚动 hsSensitive: 敏感词过滤 hsPinyin: 汉语拼音 - hsdanmaku: 弹幕组件 + hsdanmaku: 弹幕 hsPureTableBase: 基础用法(23个示例) hsPureTableHigh: 高级用法(11个示例) - hsTree: 大数据树业务组件 hsboard: 艺术画板 hsMenuoverflow: 目录超出显示 Tooltip 文字提示 hsChildMenuoverflow: 菜单超出显示 Tooltip 文字提示 diff --git a/mock/asyncRoutes.ts b/mock/asyncRoutes.ts index f78376664..ca7514a52 100644 --- a/mock/asyncRoutes.ts +++ b/mock/asyncRoutes.ts @@ -18,7 +18,7 @@ const systemRouter = { children: [ { path: "/system/user/index", - name: "User", + name: "SystemUser", meta: { icon: "flUser", title: "menus.hsUser", @@ -27,7 +27,7 @@ const systemRouter = { }, { path: "/system/role/index", - name: "Role", + name: "SystemRole", meta: { icon: "role", title: "menus.hsRole", @@ -36,7 +36,7 @@ const systemRouter = { }, { path: "/system/dept/index", - name: "Dept", + name: "SystemDept", meta: { icon: "dept", title: "menus.hsDept", diff --git a/src/components/ReAnimateSelector/src/index.vue b/src/components/ReAnimateSelector/src/index.vue index 2ee66bb45..ed39fd2a1 100644 --- a/src/components/ReAnimateSelector/src/index.vue +++ b/src/components/ReAnimateSelector/src/index.vue @@ -72,11 +72,11 @@ function onMouseleave() { + + diff --git a/src/components/ReCropper/src/index.tsx b/src/components/ReCropper/src/index.tsx index ad4cfbf5e..385bc93dc 100644 --- a/src/components/ReCropper/src/index.tsx +++ b/src/components/ReCropper/src/index.tsx @@ -129,6 +129,11 @@ export default defineComponent({ onUnmounted(() => { cropper.value?.destroy(); + isReady.value = false; + cropper.value = null; + imgBase64.value = ""; + scaleX = 1; + scaleY = 1; }); useResizeObserver(tippyElRef, () => handCropper("reset")); diff --git a/src/components/ReIcon/src/Select.vue b/src/components/ReIcon/src/Select.vue index 7a0a84fac..d3c376367 100644 --- a/src/components/ReIcon/src/Select.vue +++ b/src/components/ReIcon/src/Select.vue @@ -121,7 +121,7 @@ watch( - + diff --git a/src/views/components/button/index.vue b/src/views/components/button.vue similarity index 85% rename from src/views/components/button/index.vue rename to src/views/components/button.vue index 7b05e5057..81be37118 100644 --- a/src/views/components/button/index.vue +++ b/src/views/components/button.vue @@ -14,7 +14,7 @@ const url = ref(`${VITE_PUBLIC_PATH}html/button.html`);