diff --git a/src/plugins/icon.ts b/src/plugins/icon.ts index adc92501..768aa439 100644 --- a/src/plugins/icon.ts +++ b/src/plugins/icon.ts @@ -22,6 +22,7 @@ import { PersonOutline as PersonOutlineIcon, LogOutOutline as LogOutOutlineIcon, ChatboxEllipses as ChatboxEllipsesIcon, + LockOpenOutline as LockOpenOutlineIcon, LockClosedOutline as LockClosedOutlineIcon, HelpCircleOutline as HelpOutlineIcon, CodeSlash as CodeSlashIcon, @@ -46,7 +47,8 @@ import { GraphicalDataFlow as GraphicalDataFlowIcon, Store as StoreIcon, Devices as DevicesIcon, - ObjectStorage as ObjectStorageIcon + ObjectStorage as ObjectStorageIcon, + DicomOverlay as DicomOverlayIcon } from '@vicons/carbon' const ionicons5 = { @@ -61,6 +63,7 @@ const ionicons5 = { // 退出 LogOutOutlineIcon, // 锁 + LockOpenOutlineIcon, LockClosedOutlineIcon, // 人 PersonIcon, @@ -142,7 +145,9 @@ const carbon = { // 模板市场 StoreIcon, // 我的模板 - ObjectStorageIcon + ObjectStorageIcon, + // 键盘 + DicomOverlayIcon } // https://www.xicons.org/#/ 还有很多 diff --git a/src/plugins/naive.ts b/src/plugins/naive.ts index 31a17036..12b2a54a 100644 --- a/src/plugins/naive.ts +++ b/src/plugins/naive.ts @@ -59,6 +59,7 @@ import { NPopover, NPagination, NSelect, + NSlider, NRadioGroup, NRadio, NSteps, @@ -79,6 +80,7 @@ import { NSkeleton, NCarousel, NScrollbar, + NPopselect, NCollapseTransition } from 'naive-ui'; @@ -141,6 +143,7 @@ const naive = create({ NDataTable, NPopover, NPagination, + NSlider, NSelect, NRadioGroup, NRadio, @@ -162,6 +165,7 @@ const naive = create({ NSkeleton, NCarousel, NScrollbar, + NPopselect, NCollapseTransition ], }); diff --git a/src/store/modules/chartEditStore/chartEditStore.ts b/src/store/modules/chartEditStore/chartEditStore.ts index 084b9ad4..354ab670 100644 --- a/src/store/modules/chartEditStore/chartEditStore.ts +++ b/src/store/modules/chartEditStore/chartEditStore.ts @@ -53,7 +53,6 @@ export const useChartEditStoreStore = defineStore({ value: any ): void { const dom = this.getEditCanvas.editContentDom - console.log(dom); if (dom) { // @ts-ignore dom.style[key] = value @@ -120,11 +119,12 @@ export const useChartEditStoreStore = defineStore({ }, // * 设置缩放 setScale(scale: number, sys = true): void { - console.log(scale); - this.setPageAttribute('transform', `scale(${scale})`) - this.getEditCanvas.userScale = scale - if (sys) { - this.getEditCanvas.scale = scale + if(!this.getEditCanvas.lockScale) { + this.setPageAttribute('transform', `scale(${scale})`) + this.getEditCanvas.userScale = scale + if (sys) { + this.getEditCanvas.scale = scale + } } } } diff --git a/src/views/chart/components/ContentBox/index.vue b/src/views/chart/components/ContentBox/index.vue index d517a33f..d50b13fa 100644 --- a/src/views/chart/components/ContentBox/index.vue +++ b/src/views/chart/components/ContentBox/index.vue @@ -23,7 +23,7 @@ -