From c3eca346701ef1d8173858722e0f8ed8714a3dd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=9F=E8=BE=B0=E7=BC=96=E7=A8=8B=E7=90=86=E8=B4=A2?= <304133787@qq.com> Date: Tue, 5 Mar 2024 17:25:41 +0800 Subject: [PATCH 01/19] =?UTF-8?q?docs:=20=E6=9B=B4=E6=96=B0=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E5=AF=BC=E8=88=AA=E8=8F=9C=E5=8D=95=E4=B8=AD=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=97=A5=E5=BF=97=E7=9A=84=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/.vitepress/config/theme-nav.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/.vitepress/config/theme-nav.ts b/docs/.vitepress/config/theme-nav.ts index eaa52a4..fbc1a64 100644 --- a/docs/.vitepress/config/theme-nav.ts +++ b/docs/.vitepress/config/theme-nav.ts @@ -36,7 +36,7 @@ export default [ { text: '更多', items: [ - { text: '更新日志', link: 'https://gitee.com/xcbclc/istock-shell', target: '_blank' }, + { text: '更新日志', link: 'https://gitee.com/xcbclc/istock-shell/releases', target: '_blank' }, /*{ text: '沟通交流', link: 'https://share.istock.red/' },*/ { text: '博客', -- Gitee From e4b53d708547beacf41e9a105ee240c807420379 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=9F=E8=BE=B0=E7=BC=96=E7=A8=8B=E7=90=86=E8=B4=A2?= <304133787@qq.com> Date: Fri, 8 Mar 2024 22:37:00 +0800 Subject: [PATCH 02/19] =?UTF-8?q?fix(view):=20=E4=BC=98=E5=8C=96=E5=91=BD?= =?UTF-8?q?=E4=BB=A4=E8=BE=93=E5=87=BA=E5=9D=97=E9=BC=A0=E6=A0=87=E7=A7=BB?= =?UTF-8?q?=E4=B8=8A=E5=8E=BB=E7=9A=84=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/view/components/main/CmdMain.svelte | 4 ++-- src/view/components/main/block-contextmenu.ts | 12 +++--------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/view/components/main/CmdMain.svelte b/src/view/components/main/CmdMain.svelte index b6bcb16..acdc886 100644 --- a/src/view/components/main/CmdMain.svelte +++ b/src/view/components/main/CmdMain.svelte @@ -127,8 +127,8 @@ on:contextmenu={(ev) => { handleBlockContextmenu.handleOpenBlockContextmenu(ev); }} - on:mouseover={(ev) => { - handleBlockContextmenu.handleBlockMouseOver(ev, index); + on:mouseenter={(ev) => { + handleBlockContextmenu.handleBlockMouseEnter(ev, index); }} on:click={(ev) => { handleBlockContextmenu.handleOnClick(ev); diff --git a/src/view/components/main/block-contextmenu.ts b/src/view/components/main/block-contextmenu.ts index 0ea733f..30cdc93 100644 --- a/src/view/components/main/block-contextmenu.ts +++ b/src/view/components/main/block-contextmenu.ts @@ -70,17 +70,11 @@ export const handleBlockContextmenuFactory = ( offset: { x, y }, }); }; - const handleBlockMouseOver = (ev: MouseEvent, index: number) => { + const handleBlockMouseEnter = (ev: MouseEvent, index: number) => { const element = ev.target as HTMLElement; if (isViewContextmenu) return; - if (index === hoverBlockIndex) { - if (element && document.activeElement !== element) { - element.focus(); - } - return; - } hoverBlockIndex = index; - if (element && document.activeElement !== element) { + if (element) { element.focus(); } updatePosition({ offset: { x: -1, y: -1 } }); @@ -95,7 +89,7 @@ export const handleBlockContextmenuFactory = ( handleMenuClick, handleMenuShortcutKey, handleOpenBlockContextmenu, - handleBlockMouseOver, + handleBlockMouseEnter, handleOnClick, }; }; -- Gitee From 6e40595105d19ff809e03a5995f93be430ac89ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=9F=E8=BE=B0=E7=BC=96=E7=A8=8B=E7=90=86=E8=B4=A2?= <304133787@qq.com> Date: Sat, 9 Mar 2024 22:20:41 +0800 Subject: [PATCH 03/19] =?UTF-8?q?feat(ui):=20=E6=96=B0=E5=A2=9Ebutton?= =?UTF-8?q?=E3=80=81modal=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shell-ui/src/button/Button.svelte | 88 +++++++++ src/packages/shell-ui/src/button/index.ts | 3 + src/packages/shell-ui/src/index.ts | 2 + src/packages/shell-ui/src/modal/Modal.svelte | 174 ++++++++++++++++++ src/packages/shell-ui/src/modal/index.ts | 3 + 5 files changed, 270 insertions(+) create mode 100644 src/packages/shell-ui/src/button/Button.svelte create mode 100644 src/packages/shell-ui/src/button/index.ts create mode 100644 src/packages/shell-ui/src/modal/Modal.svelte create mode 100644 src/packages/shell-ui/src/modal/index.ts diff --git a/src/packages/shell-ui/src/button/Button.svelte b/src/packages/shell-ui/src/button/Button.svelte new file mode 100644 index 0000000..c395918 --- /dev/null +++ b/src/packages/shell-ui/src/button/Button.svelte @@ -0,0 +1,88 @@ + + + + + + diff --git a/src/packages/shell-ui/src/button/index.ts b/src/packages/shell-ui/src/button/index.ts new file mode 100644 index 0000000..e34d1bb --- /dev/null +++ b/src/packages/shell-ui/src/button/index.ts @@ -0,0 +1,3 @@ +import Button from './Button.svelte'; +export const ShButton = Button; +export default ShButton; diff --git a/src/packages/shell-ui/src/index.ts b/src/packages/shell-ui/src/index.ts index 4b18798..599f652 100644 --- a/src/packages/shell-ui/src/index.ts +++ b/src/packages/shell-ui/src/index.ts @@ -14,3 +14,5 @@ export * from './select/index'; export * from './table/index'; export * from './text/index'; export * from './textarea/index'; +export * from './modal/index'; +export * from './button/index'; diff --git a/src/packages/shell-ui/src/modal/Modal.svelte b/src/packages/shell-ui/src/modal/Modal.svelte new file mode 100644 index 0000000..124e583 --- /dev/null +++ b/src/packages/shell-ui/src/modal/Modal.svelte @@ -0,0 +1,174 @@ + + + +{#if isOpen} + +{/if} + + diff --git a/src/packages/shell-ui/src/modal/index.ts b/src/packages/shell-ui/src/modal/index.ts new file mode 100644 index 0000000..76877b4 --- /dev/null +++ b/src/packages/shell-ui/src/modal/index.ts @@ -0,0 +1,3 @@ +import Modal from './Modal.svelte'; +export const ShModal = Modal; +export default ShModal; -- Gitee From 2a76b2434833b977d4eb80739fd601731336ab03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=9F=E8=BE=B0=E7=BC=96=E7=A8=8B=E7=90=86=E8=B4=A2?= <304133787@qq.com> Date: Sat, 9 Mar 2024 22:23:21 +0800 Subject: [PATCH 04/19] =?UTF-8?q?feat:=20css=E5=8F=98=E9=87=8F=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=8F=8A=E4=BF=AE=E6=94=B9=EF=BC=8Cui=E5=BA=93?= =?UTF-8?q?=E5=8F=8A=E4=B8=9A=E5=8A=A1=E7=BB=84=E4=BB=B6=E9=85=8D=E5=90=88?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shell-ui/src/formitem/FormItem.svelte | 8 +++++- src/packages/shell-ui/src/input/Input.svelte | 26 +++++++++++++++++-- src/style/variable.scss | 13 +++++++--- src/view/CmdInfo.svelte | 2 +- src/view/components/form/CmdForm.svelte | 2 +- .../components/main/CmdContextmenu.svelte | 2 +- .../recommend/{list.svelte => List.svelte} | 2 +- 7 files changed, 45 insertions(+), 10 deletions(-) rename src/view/components/recommend/{list.svelte => List.svelte} (98%) diff --git a/src/packages/shell-ui/src/formitem/FormItem.svelte b/src/packages/shell-ui/src/formitem/FormItem.svelte index f4c0c44..a0d7409 100644 --- a/src/packages/shell-ui/src/formitem/FormItem.svelte +++ b/src/packages/shell-ui/src/formitem/FormItem.svelte @@ -1,3 +1,9 @@ -
+
+ + diff --git a/src/packages/shell-ui/src/input/Input.svelte b/src/packages/shell-ui/src/input/Input.svelte index da52004..ab6c6ab 100644 --- a/src/packages/shell-ui/src/input/Input.svelte +++ b/src/packages/shell-ui/src/input/Input.svelte @@ -4,7 +4,29 @@ export let attribute: Record = {}; -