From a0fca434823606c8c1bbf90a21f8c07323bb3630 Mon Sep 17 00:00:00 2001 From: XiaLangQing <413901125@qq.com> Date: Thu, 29 Aug 2024 08:55:12 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=87=AA=E8=A1=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-antd/src/views/hr/dept/index.vue | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 apps/web-antd/src/views/hr/dept/index.vue diff --git a/apps/web-antd/src/views/hr/dept/index.vue b/apps/web-antd/src/views/hr/dept/index.vue new file mode 100644 index 00000000..06372a15 --- /dev/null +++ b/apps/web-antd/src/views/hr/dept/index.vue @@ -0,0 +1,9 @@ + + + From aca7f2be2cb562332618b72522ea5ee2e0be57c3 Mon Sep 17 00:00:00 2001 From: XiaLangQing <413901125@qq.com> Date: Thu, 29 Aug 2024 08:56:10 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E6=9C=BA=E6=9E=84=E4=BB=A3=E7=A0=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-antd/src/views/hr/organize/index.vue | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 apps/web-antd/src/views/hr/organize/index.vue diff --git a/apps/web-antd/src/views/hr/organize/index.vue b/apps/web-antd/src/views/hr/organize/index.vue new file mode 100644 index 00000000..06372a15 --- /dev/null +++ b/apps/web-antd/src/views/hr/organize/index.vue @@ -0,0 +1,9 @@ + + + From 02aabfde8fe39fa01f5c407502276218aa378dca Mon Sep 17 00:00:00 2001 From: XiaLangQing <413901125@qq.com> Date: Tue, 10 Sep 2024 09:01:25 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-antd/src/components/dict/index.ts | 5 - .../web-antd/src/components/dict/src/data.tsx | 44 ------- apps/web-antd/src/components/tinymce/index.ts | 5 - .../src/components/tinymce/src/helper.ts | 85 ------------- .../src/components/tinymce/src/img-upload.vue | 115 ------------------ .../src/components/tinymce/src/tinymce.ts | 11 -- .../lint-configs/prettier-config/package.json | 1 + 7 files changed, 1 insertion(+), 265 deletions(-) delete mode 100644 apps/web-antd/src/components/dict/index.ts delete mode 100644 apps/web-antd/src/components/dict/src/data.tsx delete mode 100644 apps/web-antd/src/components/tinymce/index.ts delete mode 100644 apps/web-antd/src/components/tinymce/src/helper.ts delete mode 100644 apps/web-antd/src/components/tinymce/src/img-upload.vue delete mode 100644 apps/web-antd/src/components/tinymce/src/tinymce.ts diff --git a/apps/web-antd/src/components/dict/index.ts b/apps/web-antd/src/components/dict/index.ts deleted file mode 100644 index 9dd84d24..00000000 --- a/apps/web-antd/src/components/dict/index.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { withInstall } from '#/utils'; - -import dictTag from './src/index.vue'; - -export const DictTag = withInstall(dictTag); diff --git a/apps/web-antd/src/components/dict/src/data.tsx b/apps/web-antd/src/components/dict/src/data.tsx deleted file mode 100644 index 68395f8a..00000000 --- a/apps/web-antd/src/components/dict/src/data.tsx +++ /dev/null @@ -1,44 +0,0 @@ -import { type VNode } from 'vue'; - -import { Tag } from 'ant-design-vue'; - -interface TagType { - [key: string]: { color: string; label: string }; -} - -export const tagTypes: TagType = { - cyan: { color: 'cyan', label: 'cyan' }, - danger: { color: 'error', label: '危险(danger)' }, - /** 由于和elementUI不同 用于替换颜色 */ - default: { color: 'default', label: '默认(default)' }, - green: { color: 'green', label: 'green' }, - info: { color: 'default', label: '信息(info)' }, - orange: { color: 'orange', label: 'orange' }, - /** 自定义预设 color可以为16进制颜色 */ - pink: { color: 'pink', label: 'pink' }, - primary: { color: 'processing', label: '主要(primary)' }, - purple: { color: 'purple', label: 'purple' }, - red: { color: 'red', label: 'red' }, - success: { color: 'success', label: '成功(success)' }, - warning: { color: 'warning', label: '警告(warning)' }, -}; - -// 字典选择使用 { label: string; value: string }[] -interface Options { - label: string | VNode; - value: string; -} - -export function tagSelectOptions() { - const selectArray: Options[] = []; - Object.keys(tagTypes).forEach((key) => { - if (!tagTypes[key]) return; - const label = tagTypes[key].label; - const color = tagTypes[key].color; - selectArray.push({ - label: {label}, - value: key, - }); - }); - return selectArray; -} diff --git a/apps/web-antd/src/components/tinymce/index.ts b/apps/web-antd/src/components/tinymce/index.ts deleted file mode 100644 index bc00d6b2..00000000 --- a/apps/web-antd/src/components/tinymce/index.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { withInstall } from '#/utils'; - -import tinymce from './src/editor.vue'; - -export const Tinymce = withInstall(tinymce); diff --git a/apps/web-antd/src/components/tinymce/src/helper.ts b/apps/web-antd/src/components/tinymce/src/helper.ts deleted file mode 100644 index e169f501..00000000 --- a/apps/web-antd/src/components/tinymce/src/helper.ts +++ /dev/null @@ -1,85 +0,0 @@ -const validEvents = new Set([ - 'onActivate', - 'onAddUndo', - 'onBeforeAddUndo', - 'onBeforeExecCommand', - 'onBeforeGetContent', - 'onBeforeRenderUI', - 'onBeforeSetContent', - 'onBeforePaste', - 'onBlur', - 'onChange', - 'onClearUndos', - 'onClick', - 'onContextMenu', - 'onCopy', - 'onCut', - 'onDblclick', - 'onDeactivate', - 'onDirty', - 'onDrag', - 'onDragDrop', - 'onDragEnd', - 'onDragGesture', - 'onDragOver', - 'onDrop', - 'onExecCommand', - 'onFocus', - 'onFocusIn', - 'onFocusOut', - 'onGetContent', - 'onHide', - 'onInit', - 'onKeyDown', - 'onKeyPress', - 'onKeyUp', - 'onLoadContent', - 'onMouseDown', - 'onMouseEnter', - 'onMouseLeave', - 'onMouseMove', - 'onMouseOut', - 'onMouseOver', - 'onMouseUp', - 'onNodeChange', - 'onObjectResizeStart', - 'onObjectResized', - 'onObjectSelected', - 'onPaste', - 'onPostProcess', - 'onPostRender', - 'onPreProcess', - 'onProgressState', - 'onRedo', - 'onRemove', - 'onReset', - 'onSaveContent', - 'onSelectionChange', - 'onSetAttrib', - 'onSetContent', - 'onShow', - 'onSubmit', - 'onUndo', - 'onVisualAid', -]); - -const isValidKey = (key: string) => validEvents.has(key); - -export const bindHandlers = ( - initEvent: Event, - listeners: any, - editor: any, -): void => { - Object.keys(listeners) - .filter((element) => isValidKey(element)) - .forEach((key: string) => { - const handler = listeners[key]; - if (typeof handler === 'function') { - if (key === 'onInit') { - handler(initEvent, editor); - } else { - editor.on(key.slice(2), (e: any) => handler(e, editor)); - } - } - }); -}; diff --git a/apps/web-antd/src/components/tinymce/src/img-upload.vue b/apps/web-antd/src/components/tinymce/src/img-upload.vue deleted file mode 100644 index 441b9fee..00000000 --- a/apps/web-antd/src/components/tinymce/src/img-upload.vue +++ /dev/null @@ -1,115 +0,0 @@ - - - - diff --git a/apps/web-antd/src/components/tinymce/src/tinymce.ts b/apps/web-antd/src/components/tinymce/src/tinymce.ts deleted file mode 100644 index eb3964a6..00000000 --- a/apps/web-antd/src/components/tinymce/src/tinymce.ts +++ /dev/null @@ -1,11 +0,0 @@ -// Any plugins you want to setting has to be imported -// Detail plugins list see https://www.tinymce.com/docs/plugins/ -// Custom builds see https://www.tinymce.com/download/custom-builds/ -// colorpicker/contextmenu/textcolor plugin is now built in to the core editor, please remove it from your editor configuration - -// quickbars 快捷栏 -export const plugins = - 'preview importcss searchreplace autolink autosave save directionality code visualblocks visualchars fullscreen image link media codesample table charmap pagebreak nonbreaking anchor insertdatetime advlist lists wordcount help charmap emoticons accordion'; - -export const toolbar = - 'undo redo | accordion accordionremove | blocks fontfamily fontsize | bold italic underline strikethrough | align numlist bullist | link image | table media | lineheight outdent indent| forecolor backcolor removeformat | charmap emoticons | code fullscreen preview | save print | pagebreak anchor codesample | ltr rtl'; diff --git a/internal/lint-configs/prettier-config/package.json b/internal/lint-configs/prettier-config/package.json index 50693636..9efb3e95 100644 --- a/internal/lint-configs/prettier-config/package.json +++ b/internal/lint-configs/prettier-config/package.json @@ -22,6 +22,7 @@ } }, "dependencies": { + "@vben/prettier-config": "file:", "prettier": "^3.3.3", "prettier-plugin-tailwindcss": "^0.6.6" } From 59af57644be6114fadc3a28e030ce44c6f656c8f Mon Sep 17 00:00:00 2001 From: XiaLangQing <413901125@qq.com> Date: Fri, 13 Sep 2024 16:17:54 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A8=E5=B1=80?= =?UTF-8?q?=E5=9C=86=E8=A7=92=E6=A0=B7=E5=BC=8F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/styles/src/antd/index.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/styles/src/antd/index.css b/packages/styles/src/antd/index.css index 77df64fd..9564a0f8 100644 --- a/packages/styles/src/antd/index.css +++ b/packages/styles/src/antd/index.css @@ -11,3 +11,7 @@ .ant-notification-notice { @apply dark:border-border/60 dark:border; } + +:root { + --ad-border-radius: 5px; +} From 990c7c903838d0edd7679bf791bd630c7b693ed7 Mon Sep 17 00:00:00 2001 From: XiaLangQing <413901125@qq.com> Date: Wed, 18 Sep 2024 17:05:38 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A8=E5=B1=80?= =?UTF-8?q?=E5=9C=86=E8=A7=92=E6=A0=B7=E5=BC=8F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/styles/src/antd/index.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/styles/src/antd/index.css b/packages/styles/src/antd/index.css index b6246ea4..82f2d848 100644 --- a/packages/styles/src/antd/index.css +++ b/packages/styles/src/antd/index.css @@ -15,3 +15,7 @@ .ant-app .form-valid-error .ant-select-selector { border-color: hsl(var(--destructive)); } + +:root { + --ad-border-radius: 5px; +}