diff --git a/.env b/.env index 5460e49..a03235f 100644 --- a/.env +++ b/.env @@ -1 +1,2 @@ VITE_API_URL=http://127.0.0.1:4523 +VITE_TINYMCE_KEY=agmu6i1c6k7bcp36oenzyz7yi1yplptq7goyx88y1g6ofnqu diff --git a/package.json b/package.json index c09d037..0dba139 100644 --- a/package.json +++ b/package.json @@ -10,9 +10,11 @@ "commit": "git add . && git commit -m 'update' && git push" }, "dependencies": { + "@tinymce/tinymce-vue": "^6.1.0", "axios": "^1.8.2", "pinia": "^3.0.1", "pinia-plugin-persistedstate": "^4.2.0", + "tinymce": "^7.7.2", "uqrcodejs": "^4.0.7", "uuid": "^11.1.0", "vite-plugin-vue-devtools": "^7.7.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4501a26..d0be5f2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -8,6 +8,9 @@ importers: .: dependencies: + '@tinymce/tinymce-vue': + specifier: ^6.1.0 + version: 6.1.0(tinymce@7.7.2)(vue@3.5.13) axios: specifier: ^1.8.2 version: 1.8.2 @@ -17,6 +20,9 @@ importers: pinia-plugin-persistedstate: specifier: ^4.2.0 version: 4.2.0(pinia@3.0.1(vue@3.5.13)) + tinymce: + specifier: ^7.7.2 + version: 7.7.2 uqrcodejs: specifier: ^4.0.7 version: 4.0.7 @@ -630,6 +636,15 @@ packages: resolution: {integrity: sha512-tlqY9xq5ukxTUZBmoOp+m61cqwQD5pHJtFY3Mn8CA8ps6yghLH/Hw8UPdqg4OLmFW3IFlcXnQNmo/dh8HzXYIQ==} engines: {node: '>=18'} + '@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 + '@types/estree@1.0.6': resolution: {integrity: sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==} @@ -1620,6 +1635,9 @@ packages: resolution: {integrity: sha512-qkf4trmKSIiMTs/E63cxH+ojC2unam7rJ0WrauAzpT3ECNTxGRMlaXxVbfxMUC/w0LaYk6jQ4y/nGR9uBO3tww==} engines: {node: '>=12.0.0'} + tinymce@7.7.2: + resolution: {integrity: sha512-GX7Jd0ac9ph3QM2yei4uOoxytKX096CyG6VkkgQNikY39T6cDldoNgaqzHHlcm62WtdBMCd7Ch+PYaRnQo+NLA==} + to-regex-range@5.0.1: resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==} engines: {node: '>=8.0'} @@ -2317,6 +2335,12 @@ snapshots: '@sindresorhus/merge-streams@4.0.0': {} + '@tinymce/tinymce-vue@6.1.0(tinymce@7.7.2)(vue@3.5.13)': + dependencies: + vue: 3.5.13 + optionalDependencies: + tinymce: 7.7.2 + '@types/estree@1.0.6': {} '@types/node@16.18.126': {} @@ -3333,6 +3357,8 @@ snapshots: fdir: 6.4.3(picomatch@4.0.2) picomatch: 4.0.2 + tinymce@7.7.2: {} + to-regex-range@5.0.1: dependencies: is-number: 7.0.0 diff --git a/src/components/Filter/index.vue b/src/components/Filter/index.vue index a35796b..20166e6 100644 --- a/src/components/Filter/index.vue +++ b/src/components/Filter/index.vue @@ -10,7 +10,7 @@ const FROM_TYPE = { CUSTOM: 'custom', } const emits = defineEmits(['search']); -const {config, title} = defineProps({ +const {config, title, buttonCol, formBottom} = defineProps({ config: { type: Array, default: [], @@ -19,7 +19,11 @@ const {config, title} = defineProps({ title: { type: String, default: '查询任务' - } + }, + buttonCol: { + type: Boolean, + default: true, + }, }); const from = defineModel('from'); @@ -36,7 +40,7 @@ const reset = () => { {{ title }} -
+
{