diff --git a/.github/ISSUE_TEMPLATE/bug-report_cn.yaml b/.github/ISSUE_TEMPLATE/bug-report_cn.yaml deleted file mode 100644 index b1de7e61..00000000 --- a/.github/ISSUE_TEMPLATE/bug-report_cn.yaml +++ /dev/null @@ -1,90 +0,0 @@ -name: 🐞 Bug提交 -description: 在使用软件或功能的过程中遇到了错误 -title: '[Bug]: ' -labels: [ "bug?" ] - -body: - - type: markdown - attributes: - value: | - ## 请按照以下要求进行提交 - ### 1. 提交后需要指定标签和截止时间。 - --- - - - type: markdown - attributes: - value: | - ## 环境信息 - 请根据实际使用环境修改以下信息。 - - - type: input - id: env-program-ver - attributes: - label: 软件版本 - validations: - required: true - - - type: dropdown - id: env-vm-ver - attributes: - label: 运行环境 - description: 选择运行软件的系统版本 - options: - - Windows (64) - - Windows (32/x84) - - MacOS - - Linux - - Ubuntu - - CentOS - - ArchLinux - - UNIX (Android) - - 其它（请在下方说明） - validations: - required: true - - - type: dropdown - id: env-vm-arch - attributes: - label: 运行架构 - description: (可选) 选择运行软件的系统架构 - options: - - AMD64 - - x86 - - ARM [32] (别名：AArch32 / ARMv7） - - ARM [64] (别名：AArch64 / ARMv8） - - 其它 - - - type: textarea - id: reproduce-steps - attributes: - label: 重现步骤 - description: | - 我们需要执行哪些操作才能让 bug 出现？ - 简洁清晰的重现步骤能够帮助我们更迅速地定位问题所在。 - validations: - required: true - - - type: textarea - id: expected - attributes: - label: 期望的结果是什么？ - validations: - required: true - - - type: textarea - id: actual - attributes: - label: 实际的结果是什么？ - validations: - required: true - - - type: textarea - id: logging - attributes: - label: 日志记录（可选） - render: golang - - - type: textarea - id: extra-desc - attributes: - label: 补充说明（可选） diff --git a/.github/ISSUE_TEMPLATE/bug-report_en.yaml b/.github/ISSUE_TEMPLATE/bug-report_en.yaml deleted file mode 100644 index a3a2f124..00000000 --- a/.github/ISSUE_TEMPLATE/bug-report_en.yaml +++ /dev/null @@ -1,90 +0,0 @@ -name: 🐞 Bug Report -description: Encountered an error while using the software or feature -title: '[Bug]: ' -labels: [ "bug?" ] - -body: - - type: markdown - attributes: - value: | - ## Please submit according to the following requirements - ### 1. After submission, you need to specify the label and deadline. - --- - - - type: markdown - attributes: - value: | - ## Environment Information - Please modify the following information according to the actual usage environment. - - - type: input - id: env-program-ver - attributes: - label: Software Version - validations: - required: true - - - type: dropdown - id: env-vm-ver - attributes: - label: Operating Environment - description: Select the system version on which the software is running - options: - - Windows (64) - - Windows (32/x84) - - MacOS - - Linux - - Ubuntu - - CentOS - - ArchLinux - - UNIX (Android) - - Other (please specify below) - validations: - required: true - - - type: dropdown - id: env-vm-arch - attributes: - label: Operating Architecture - description: (Optional) Select the system architecture on which the software is running - options: - - AMD64 - - x86 - - ARM [32] (Alias：AArch32 / ARMv7） - - ARM [64] (Alias：AArch64 / ARMv8） - - Other - - - type: textarea - id: reproduce-steps - attributes: - label: Reproduce Steps - description: | - What operations do we need to perform to make the bug appear? - The concise and clear reproduction steps can help us locate the problem more quickly. - validations: - required: true - - - type: textarea - id: expected - attributes: - label: What is the expected result? - validations: - required: true - - - type: textarea - id: actual - attributes: - label: What is the actual result? - validations: - required: true - - - type: textarea - id: logging - attributes: - label: Logging (Optional) - render: golang - - - type: textarea - id: extra-desc - attributes: - label: Additional Description (Optional) diff --git a/.github/ISSUE_TEMPLATE/feature_request_cn.yaml b/.github/ISSUE_TEMPLATE/feature_request_cn.yaml deleted file mode 100644 index c98162f5..00000000 --- a/.github/ISSUE_TEMPLATE/feature_request_cn.yaml +++ /dev/null @@ -1,48 +0,0 @@ ---- -name: 🚀 功能请求 -description: 提出一个想法以帮助我们改进W&B -title: "[功能]: " -labels: - - "功能请求" - -body: - - type: markdown - attributes: - value: | - **感谢 :heart: 您花时间填写此功能请求报告！** - 我们恳请您搜索看看您的功能是否[已经存在](https://github.com/soybeanjs/soybean-admin/issues?q=is%3Aissue+sort%3Acreated-desc+)。 - - 我们也很乐意接受用户的贡献。有关更多详细信息，请参阅[此处](https://github.com/soybeanjs/soybean-admin/blob/main/README.zh_CN.md#%E5%A6%82%E4%BD%95%E8%B4%A1%E7%8C%AE)。 - - - type: textarea - attributes: - label: 描述 - description: | - 对您感兴趣的功能的清晰简洁的描述。 - validations: - required: true - - - type: textarea - attributes: - label: 建议的解决方案 - description: | - 描述您想要的解决方案。对您希望发生的事情的清晰简洁的描述。 - validations: - required: true - - - type: textarea - attributes: - label: 替代方案 - description: | - 描述您考虑过的替代方案。 - 对您考虑过的任何替代解决方案或功能的清晰简洁的描述。 - validations: - required: false - - - type: textarea - attributes: - label: 额外的上下文 - description: | - 在此处添加有关问题的其他上下文。 - validations: - required: false diff --git a/.github/ISSUE_TEMPLATE/feature_request_en.yaml b/.github/ISSUE_TEMPLATE/feature_request_en.yaml deleted file mode 100644 index 07fc41c0..00000000 --- a/.github/ISSUE_TEMPLATE/feature_request_en.yaml +++ /dev/null @@ -1,48 +0,0 @@ ---- -name: 🚀 Feature Request -description: Suggest an idea to help us improve W&B -title: "[Feature]: " -labels: - - "feature_request" - -body: - - type: markdown - attributes: - value: | - **Thanks :heart: for taking the time to fill out this feature request report!** - We kindly ask that you search to see if an issue [already exists](https://github.com/soybeanjs/soybean-admin/issues?q=is%3Aissue+sort%3Acreated-desc+) for your feature. - - We are also happy to accept contributions from our users. For more details see [here](https://github.com/soybeanjs/soybean-admin/blob/main/README.md#how-to-contribute). - - - type: textarea - attributes: - label: Description - description: | - A clear and concise description of the feature you're interested in. - validations: - required: true - - - type: textarea - attributes: - label: Suggested Solution - description: | - Describe the solution you'd like. A clear and concise description of what you want to happen. - validations: - required: true - - - type: textarea - attributes: - label: Alternatives - description: | - Describe alternatives you've considered. - A clear and concise description of any alternative solutions or features you've considered. - validations: - required: false - - - type: textarea - attributes: - label: Additional Context - description: | - Add any other context about the problem here. - validations: - required: false diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml deleted file mode 100644 index 450ec865..00000000 --- a/.github/workflows/linter.yml +++ /dev/null @@ -1,30 +0,0 @@ ---- -name: Lint Code - -permissions: - contents: write - -on: - pull_request: - branches: [main] - -jobs: - lint: - name: Lint All Code - runs-on: ubuntu-latest - - steps: - - name: Checkout Code - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - - name: Lint Code Base - uses: github/super-linter@v4 - env: - VALIDATE_ALL_CODEBASE: false - DEFAULT_BRANCH: main - # To change branch master or main - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - FILTER_REGEX_EXCLUDE: (docs|.github) - VALIDATE_MARKDOWN: false diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index 0bf7c92d..00000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: Release - -permissions: - contents: write - -on: - push: - tags: - - "v*" - -jobs: - release: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - - uses: actions/setup-node@v3 - with: - node-version: 18.x - - - run: npx githublogen - env: - GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} diff --git a/package.json b/package.json index 55b4b28d..af008d8f 100644 --- a/package.json +++ b/package.json @@ -56,12 +56,12 @@ "@sa/hooks": "workspace:*", "@sa/materials": "workspace:*", "@sa/utils": "workspace:*", - "@tinymce/tinymce-vue": "^6.1.0", "@vueuse/core": "13.0.0", "clipboard": "2.0.11", "dayjs": "1.11.13", "defu": "6.1.4", "echarts": "5.6.0", + "highlight.js": "^11.11.1", "jsencrypt": "^3.3.2", "json5": "2.2.3", "monaco-editor": "^0.52.0", @@ -69,11 +69,9 @@ "nprogress": "0.2.0", "pinia": "3.0.1", "tailwind-merge": "3.0.2", - "tinymce": "^7", "vue": "3.5.13", "vue-draggable-plus": "0.6.0", "vue-i18n": "11.1.2", - "vue-json-pretty": "^2.4.0", "vue-router": "4.5.0" }, "devDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 57b57f60..54fa0c6e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -29,9 +29,6 @@ importers: '@sa/utils': specifier: workspace:* version: link:packages/utils - '@tinymce/tinymce-vue': - specifier: ^6.1.0 - version: 6.1.0(tinymce@7.8.0)(vue@3.5.13(typescript@5.8.2)) '@vueuse/core': specifier: 13.0.0 version: 13.0.0(vue@3.5.13(typescript@5.8.2)) @@ -47,6 +44,9 @@ importers: echarts: specifier: 5.6.0 version: 5.6.0 + highlight.js: + specifier: ^11.11.1 + version: 11.11.1 jsencrypt: specifier: ^3.3.2 version: 3.3.2 @@ -68,9 +68,6 @@ importers: tailwind-merge: specifier: 3.0.2 version: 3.0.2 - tinymce: - specifier: ^7 - version: 7.8.0 vue: specifier: 3.5.13 version: 3.5.13(typescript@5.8.2) @@ -80,9 +77,6 @@ importers: vue-i18n: specifier: 11.1.2 version: 11.1.2(vue@3.5.13(typescript@5.8.2)) - vue-json-pretty: - specifier: ^2.4.0 - version: 2.4.0(vue@3.5.13(typescript@5.8.2)) vue-router: specifier: 4.5.0 version: 4.5.0(vue@3.5.13(typescript@5.8.2)) @@ -1053,15 +1047,6 @@ packages: vue-eslint-parser: optional: true - '@tinymce/tinymce-vue@6.1.0': - resolution: {integrity: sha512-7JdaKMOaohuFWpjKwRmaZJbT/eNVUUYHG93R7+lUf7SUN+hSqd2spbuqZcki+tG9kaSAGd2ZmvJIsmzWDNAzpw==} - peerDependencies: - tinymce: ^7.0.0 || ^6.0.0 || ^5.5.1 - vue: ^3.0.0 - peerDependenciesMeta: - tinymce: - optional: true - '@trysound/sax@0.2.0': resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==} engines: {node: '>=10.13.0'} @@ -3788,9 +3773,6 @@ packages: resolution: {integrity: sha512-qkf4trmKSIiMTs/E63cxH+ojC2unam7rJ0WrauAzpT3ECNTxGRMlaXxVbfxMUC/w0LaYk6jQ4y/nGR9uBO3tww==} engines: {node: '>=12.0.0'} - tinymce@7.8.0: - resolution: {integrity: sha512-MUER5MWV9mkOB4expgbWknh/C5ZJvOXQlMVSx4tJxTuYtcUCDB6bMZ34fWNOIc8LvrnXmGHGj0eGQuxjQyRgrA==} - to-object-path@0.3.0: resolution: {integrity: sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==} engines: {node: '>=0.10.0'} @@ -4116,12 +4098,6 @@ packages: peerDependencies: vue: ^3.0.0 - vue-json-pretty@2.4.0: - resolution: {integrity: sha512-e9bP41DYYIc2tWaB6KuwqFJq5odZ8/GkE6vHQuGcbPn37kGk4a3n1RNw3ZYeDrl66NWXgTlOfS+M6NKkowmkWw==} - engines: {node: '>= 10.0.0', npm: '>= 5.0.0'} - peerDependencies: - vue: '>=3.0.0' - vue-router@4.5.0: resolution: {integrity: sha512-HDuk+PuH5monfNuY+ct49mNmkCRK4xJAV9Ts4z9UFc4rzdDnxQLyCMGGc8pKhZhHTVzfanpNwB/lwqevcBwI4w==} peerDependencies: @@ -4884,12 +4860,6 @@ snapshots: - '@types/eslint' - supports-color - '@tinymce/tinymce-vue@6.1.0(tinymce@7.8.0)(vue@3.5.13(typescript@5.8.2))': - dependencies: - vue: 3.5.13(typescript@5.8.2) - optionalDependencies: - tinymce: 7.8.0 - '@trysound/sax@0.2.0': {} '@types/crypto-js@4.2.2': {} @@ -8050,8 +8020,6 @@ snapshots: fdir: 6.4.3(picomatch@4.0.2) picomatch: 4.0.2 - tinymce@7.8.0: {} - to-object-path@0.3.0: dependencies: kind-of: 3.2.2 @@ -8405,10 +8373,6 @@ snapshots: '@vue/devtools-api': 6.6.4 vue: 3.5.13(typescript@5.8.2) - vue-json-pretty@2.4.0(vue@3.5.13(typescript@5.8.2)): - dependencies: - vue: 3.5.13(typescript@5.8.2) - vue-router@4.5.0(vue@3.5.13(typescript@5.8.2)): dependencies: '@vue/devtools-api': 6.6.4 diff --git a/src/components/custom/json-preview.vue b/src/components/custom/json-preview.vue index 5320abb5..8b28a58b 100644 --- a/src/components/custom/json-preview.vue +++ b/src/components/custom/json-preview.vue @@ -1,71 +1,40 @@ diff --git a/src/plugins/loading.ts b/src/plugins/loading.ts index 6d4f4e9d..82591041 100644 --- a/src/plugins/loading.ts +++ b/src/plugins/loading.ts @@ -17,30 +17,14 @@ export function setupLoading() { toggleHtmlClass(DARK_CLASS).add(); } - const loadingClasses = [ - 'left-0 top-0', - 'left-0 bottom-0 animate-delay-500', - 'right-0 top-0 animate-delay-1000', - 'right-0 bottom-0 animate-delay-1500' - ]; - - const logoWithClass = systemLogo.replace(' { - return `
`; - }) - .join('\n'); - const loading = `
- ${logoWithClass} -
+
- ${dot} +
-

${$t('system.title')}

+

${$t('system.title')}

`; const app = document.getElementById('app'); diff --git a/src/theme/settings.ts b/src/theme/settings.ts index fe57ff4c..6b622b49 100644 --- a/src/theme/settings.ts +++ b/src/theme/settings.ts @@ -4,12 +4,12 @@ export const themeSettings: App.Theme.ThemeSetting = { grayscale: false, colourWeakness: false, recommendColor: false, - themeColor: '#646CFF', + themeColor: '#0E42D2', otherColor: { - info: '#646CFF', - success: '#52C41A', - warning: '#FAAD14', - error: '#F5222D' + info: '#0E42D2', + success: '#009A29', + warning: '#D25F00', + error: '#CB2634' }, isInfoFollowPrimary: true, resetCacheStrategy: 'close', diff --git a/src/typings/components.d.ts b/src/typings/components.d.ts index 2ed0c124..3bc98ca2 100644 --- a/src/typings/components.d.ts +++ b/src/typings/components.d.ts @@ -12,6 +12,7 @@ declare module 'vue' { BetterScroll: typeof import('./../components/custom/better-scroll.vue')['default'] BooleanTag: typeof import('./../components/custom/boolean-tag.vue')['default'] ButtonIcon: typeof import('./../components/custom/button-icon.vue')['default'] + CodeMirror: typeof import('./../components/custom/code-mirror.vue')['default'] copy: typeof import('./../components/custom/role-select copy.vue')['default'] CountTo: typeof import('./../components/custom/count-to.vue')['default'] DarkModeContainer: typeof import('./../components/common/dark-mode-container.vue')['default'] @@ -64,6 +65,7 @@ declare module 'vue' { NButton: typeof import('naive-ui')['NButton'] NCard: typeof import('naive-ui')['NCard'] NCheckbox: typeof import('naive-ui')['NCheckbox'] + NCode: typeof import('naive-ui')['NCode'] NCollapse: typeof import('naive-ui')['NCollapse'] NCollapseItem: typeof import('naive-ui')['NCollapseItem'] NColorPicker: typeof import('naive-ui')['NColorPicker'] diff --git a/src/typings/naive-ui.d.ts b/src/typings/naive-ui.d.ts index 171b49a0..515f1508 100644 --- a/src/typings/naive-ui.d.ts +++ b/src/typings/naive-ui.d.ts @@ -60,4 +60,6 @@ declare namespace NaiveUI { import('@sa/hooks').TableConfig, TableColumn>>>, 'apiFn' | 'apiParams' | 'columns' | 'immediate' >; + + type CodeMirrorLang = 'js' | 'json'; } diff --git a/src/views/monitor/login-infor/modules/login-infor-view-drawer.vue b/src/views/monitor/login-infor/modules/login-infor-view-drawer.vue index d0c13056..2c368bf2 100644 --- a/src/views/monitor/login-infor/modules/login-infor-view-drawer.vue +++ b/src/views/monitor/login-infor/modules/login-infor-view-drawer.vue @@ -2,6 +2,7 @@ import { useDict } from '@/hooks/business/dict'; import { getBrowserIcon, getOsIcon } from '@/utils/format'; import { $t } from '@/locales'; + defineOptions({ name: 'LoginInforViewDrawer' }); diff --git a/src/views/monitor/oper-log/modules/oper-log-view-drawer.vue b/src/views/monitor/oper-log/modules/oper-log-view-drawer.vue index 6d61f8fa..bed358e7 100644 --- a/src/views/monitor/oper-log/modules/oper-log-view-drawer.vue +++ b/src/views/monitor/oper-log/modules/oper-log-view-drawer.vue @@ -52,10 +52,10 @@ function closeDrawer() { {{ props.rowData?.operTime }} - + - + {{ `${props.rowData?.costTime} ms` }} diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue index 72b6e109..7be30e68 100644 --- a/src/views/tool/gen/index.vue +++ b/src/views/tool/gen/index.vue @@ -1,7 +1,7 @@