From bad0b936b5edc26117e5f953c3c4605e8193be78 Mon Sep 17 00:00:00 2001 From: wangshaoping Date: Wed, 28 Feb 2024 16:00:29 +0800 Subject: [PATCH] update --- io.sc.platform.core.frontend/package.json | 3 +- .../src/components/index.ts | 12 +- .../src/i18n/messages.json | 6 +- .../src/i18n/messages_tw_CN.json | 6 +- .../src/i18n/messages_zh_CN.json | 6 +- .../src/menus/menus.json | 51 +--- .../src/platform/components/form/WForm.vue | 5 + .../components/form/elements/WCodeMirror.vue | 170 +++++++++++++ .../color => form/elements}/WColorInput.vue | 4 +- .../elements}/WColorInputPalette.vue | 4 +- .../{widget/cron => form/elements}/WCron.vue | 18 +- .../position => form/elements}/WPosition.vue | 6 +- .../elements/w-cron-segment}/DaySegment.vue | 0 .../elements/w-cron-segment}/HourSegment.vue | 0 .../w-cron-segment}/MinuteSegment.vue | 0 .../elements/w-cron-segment}/MonthSegment.vue | 0 .../w-cron-segment}/SecondSegment.vue | 0 .../elements/w-cron-segment}/WeekSegment.vue | 0 .../elements/w-cron-segment}/YearSegment.vue | 0 .../src/platform/components/index.ts | 12 +- .../components/widget/codemirror/Util.ts | 72 ------ .../widget/codemirror/WCodemirror.vue | 38 --- .../widget/codemirror/WCodemirror2.vue | 31 --- .../components/widget/select/WSelect.vue | 7 - .../src/platform/utils/Tools.ts | 25 ++ .../src/routes/routes.json | 58 +---- .../src/views/Codemirror.vue | 50 ---- .../src/views/Component.vue | 29 --- .../src/views/Dialog.vue | 37 --- .../src/views/Form1.vue | 30 --- .../src/views/FormElements.vue | 44 ++++ .../src/views/Grid1.vue | 4 - .../src/views/Select.vue | 22 -- .../src/views/Table.vue | 64 ----- .../src/views/TableTitle.vue | 118 --------- .../src/views/TreeGrid.vue | 236 ------------------ 36 files changed, 281 insertions(+), 887 deletions(-) create mode 100644 io.sc.platform.core.frontend/src/platform/components/form/elements/WCodeMirror.vue rename io.sc.platform.core.frontend/src/platform/components/{widget/color => form/elements}/WColorInput.vue (95%) rename io.sc.platform.core.frontend/src/platform/components/{widget/color => form/elements}/WColorInputPalette.vue (98%) rename io.sc.platform.core.frontend/src/platform/components/{widget/cron => form/elements}/WCron.vue (86%) rename io.sc.platform.core.frontend/src/platform/components/{widget/position => form/elements}/WPosition.vue (94%) rename io.sc.platform.core.frontend/src/platform/components/{widget/cron => form/elements/w-cron-segment}/DaySegment.vue (100%) rename io.sc.platform.core.frontend/src/platform/components/{widget/cron => form/elements/w-cron-segment}/HourSegment.vue (100%) rename io.sc.platform.core.frontend/src/platform/components/{widget/cron => form/elements/w-cron-segment}/MinuteSegment.vue (100%) rename io.sc.platform.core.frontend/src/platform/components/{widget/cron => form/elements/w-cron-segment}/MonthSegment.vue (100%) rename io.sc.platform.core.frontend/src/platform/components/{widget/cron => form/elements/w-cron-segment}/SecondSegment.vue (100%) rename io.sc.platform.core.frontend/src/platform/components/{widget/cron => form/elements/w-cron-segment}/WeekSegment.vue (100%) rename io.sc.platform.core.frontend/src/platform/components/{widget/cron => form/elements/w-cron-segment}/YearSegment.vue (100%) delete mode 100644 io.sc.platform.core.frontend/src/platform/components/widget/codemirror/Util.ts delete mode 100644 io.sc.platform.core.frontend/src/platform/components/widget/codemirror/WCodemirror.vue delete mode 100644 io.sc.platform.core.frontend/src/platform/components/widget/codemirror/WCodemirror2.vue delete mode 100644 io.sc.platform.core.frontend/src/platform/components/widget/select/WSelect.vue delete mode 100644 io.sc.platform.core.frontend/src/views/Codemirror.vue delete mode 100644 io.sc.platform.core.frontend/src/views/Component.vue delete mode 100644 io.sc.platform.core.frontend/src/views/Dialog.vue delete mode 100644 io.sc.platform.core.frontend/src/views/Form1.vue create mode 100644 io.sc.platform.core.frontend/src/views/FormElements.vue delete mode 100644 io.sc.platform.core.frontend/src/views/Grid1.vue delete mode 100644 io.sc.platform.core.frontend/src/views/Select.vue delete mode 100644 io.sc.platform.core.frontend/src/views/Table.vue delete mode 100644 io.sc.platform.core.frontend/src/views/TableTitle.vue delete mode 100644 io.sc.platform.core.frontend/src/views/TreeGrid.vue diff --git a/io.sc.platform.core.frontend/package.json b/io.sc.platform.core.frontend/package.json index 58bb5556..f8a23963 100644 --- a/io.sc.platform.core.frontend/package.json +++ b/io.sc.platform.core.frontend/package.json @@ -99,7 +99,6 @@ "dependencies": { "@codemirror/autocomplete": "6.11.1", "@codemirror/commands": "6.3.3", - "@codemirror/lint": "6.5.0", "@codemirror/lang-html": "6.4.7", "@codemirror/lang-java": "6.0.1", "@codemirror/lang-javascript": "6.2.1", @@ -121,7 +120,7 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "quasar": "2.14.2", + "quasar": "2.14.5", "tailwindcss": "3.4.0", "vue": "3.4.3", "vue-codemirror6": "1.2.0", diff --git a/io.sc.platform.core.frontend/src/components/index.ts b/io.sc.platform.core.frontend/src/components/index.ts index 0821f0e6..7f05c927 100644 --- a/io.sc.platform.core.frontend/src/components/index.ts +++ b/io.sc.platform.core.frontend/src/components/index.ts @@ -2,11 +2,7 @@ * 此文件为自动生成文件,请勿修改 */ -import component from '@/views/Component.vue'; -import dialog from '@/views/Dialog.vue'; -import codemirror from '@/views/Codemirror.vue'; -import select from '@/views/Select.vue'; -import treeGrid from '@/views/TreeGrid.vue'; +import formElements from '@/views/FormElements.vue'; import likmDialog from '@/views/likm/Dialog.vue'; import likmDrawer from '@/views/likm/Drawer.vue'; import likmForm from '@/views/likm/Form.vue'; @@ -18,11 +14,7 @@ import gridLayout from '@/views/likm/GridLayout.vue'; import likmTreeGrid from '@/views/likm/TreeGrid.vue'; const localComponents = { - 'component.testcase.component': component, - 'component.testcase.dialog': dialog, - 'component.testcase.codemirror': codemirror, - 'component.testcase.select': select, - 'component.testcase.treeGrid': treeGrid, + 'component.testcase.formElements': formElements, 'component.testcase.likmDialog': likmDialog, 'component.testcase.likmDrawer': likmDrawer, 'component.testcase.likmForm': likmForm, diff --git a/io.sc.platform.core.frontend/src/i18n/messages.json b/io.sc.platform.core.frontend/src/i18n/messages.json index 318af431..5dd6a83a 100644 --- a/io.sc.platform.core.frontend/src/i18n/messages.json +++ b/io.sc.platform.core.frontend/src/i18n/messages.json @@ -1,8 +1,4 @@ { "menu.testcase": "Test Case", - "menu.testcase.component": "Component", - "menu.testcase.dialog": "Dialog", - "menu.testcase.select": "Select", - "menu.testcase.treeGrid": "Tree Grid", - "menu.testcase.table": "Table" + "menu.testcase.formElements": "Form Elements" } diff --git a/io.sc.platform.core.frontend/src/i18n/messages_tw_CN.json b/io.sc.platform.core.frontend/src/i18n/messages_tw_CN.json index 3fcb71be..8ef29361 100644 --- a/io.sc.platform.core.frontend/src/i18n/messages_tw_CN.json +++ b/io.sc.platform.core.frontend/src/i18n/messages_tw_CN.json @@ -1,8 +1,4 @@ { "menu.testcase": "測試用例", - "menu.testcase.component": "組件", - "menu.testcase.dialog": "Dialog", - "menu.testcase.select": "Select", - "menu.testcase.treeGrid": "Tree Grid", - "menu.testcase.table": "Table" + "menu.testcase.formElements": "表單控件" } diff --git a/io.sc.platform.core.frontend/src/i18n/messages_zh_CN.json b/io.sc.platform.core.frontend/src/i18n/messages_zh_CN.json index 2e559551..d90ce270 100644 --- a/io.sc.platform.core.frontend/src/i18n/messages_zh_CN.json +++ b/io.sc.platform.core.frontend/src/i18n/messages_zh_CN.json @@ -1,8 +1,4 @@ { "menu.testcase": "测试用例", - "menu.testcase.component": "组件", - "menu.testcase.dialog": "Dialog", - "menu.testcase.select": "Select", - "menu.testcase.treeGrid": "Tree Grid", - "menu.testcase.table": "Table" + "menu.testcase.formElements": "表单控件" } diff --git a/io.sc.platform.core.frontend/src/menus/menus.json b/io.sc.platform.core.frontend/src/menus/menus.json index ea2194d4..6f0b4f75 100644 --- a/io.sc.platform.core.frontend/src/menus/menus.json +++ b/io.sc.platform.core.frontend/src/menus/menus.json @@ -22,55 +22,10 @@ "type": "ROUTE", "order": 100, "parentId": "menu.testcase", - "id": "menu.testcase.component", - "titleI18nKey": "menu.testcase.component", + "id": "menu.testcase.formElements", + "titleI18nKey": "menu.testcase.formElements", "icon": "bi-palette", - "routeName": "route.testcase.component" - }, - { - "type": "ROUTE", - "order": 200, - "parentId": "menu.testcase", - "id": "menu.testcase.dialog", - "titleI18nKey": "menu.testcase.dialog", - "icon": "bi-palette", - "routeName": "route.testcase.dialog" - }, - { - "type": "ROUTE", - "order": 300, - "parentId": "menu.testcase", - "id": "menu.testcase.codemirror", - "titleI18nKey": "menu.testcase.codemirror", - "icon": "bi-palette", - "routeName": "route.testcase.codemirror" - }, - { - "type": "ROUTE", - "order": 400, - "parentId": "menu.testcase", - "id": "menu.testcase.select", - "titleI18nKey": "menu.testcase.select", - "icon": "bi-palette", - "routeName": "route.testcase.select" - }, - { - "type": "ROUTE", - "order": 400, - "parentId": "menu.testcase", - "id": "menu.testcase.treeGrid", - "titleI18nKey": "menu.testcase.treeGrid", - "icon": "bi-palette", - "routeName": "route.testcase.treeGrid" - }, - { - "type": "ROUTE", - "order": 400, - "parentId": "menu.testcase", - "id": "menu.testcase.table", - "titleI18nKey": "menu.testcase.table", - "icon": "bi-palette", - "routeName": "route.testcase.table" + "routeName": "route.testcase.formElements" }, { "type": "GROUP", "order": 30000, "id": "menu.testcase.likm", "titleI18nKey": "测试用例-likm", "icon": "home" }, { diff --git a/io.sc.platform.core.frontend/src/platform/components/form/WForm.vue b/io.sc.platform.core.frontend/src/platform/components/form/WForm.vue index 3a964453..6c980284 100644 --- a/io.sc.platform.core.frontend/src/platform/components/form/WForm.vue +++ b/io.sc.platform.core.frontend/src/platform/components/form/WForm.vue @@ -72,6 +72,11 @@ let fields_ = ref([...props.fields]); const screenCols = { xs: 1, sm: 2, md: 3, lg: 4, xl: 6 }; const fiedType = { checkbox: 'w-checkbox', + cron: 'w-cron', + 'color-input': 'w-color-input', + 'color-input-palette': 'w-color-input-palette', + 'code-mirror': 'w-code-mirror', + position: 'w-position', date: 'w-date', number: 'w-number', select: 'w-select', diff --git a/io.sc.platform.core.frontend/src/platform/components/form/elements/WCodeMirror.vue b/io.sc.platform.core.frontend/src/platform/components/form/elements/WCodeMirror.vue new file mode 100644 index 00000000..bd37bc5e --- /dev/null +++ b/io.sc.platform.core.frontend/src/platform/components/form/elements/WCodeMirror.vue @@ -0,0 +1,170 @@ + + diff --git a/io.sc.platform.core.frontend/src/platform/components/widget/color/WColorInput.vue b/io.sc.platform.core.frontend/src/platform/components/form/elements/WColorInput.vue similarity index 95% rename from io.sc.platform.core.frontend/src/platform/components/widget/color/WColorInput.vue rename to io.sc.platform.core.frontend/src/platform/components/form/elements/WColorInput.vue index 589e8efd..6b2a674d 100644 --- a/io.sc.platform.core.frontend/src/platform/components/widget/color/WColorInput.vue +++ b/io.sc.platform.core.frontend/src/platform/components/form/elements/WColorInput.vue @@ -49,8 +49,8 @@ const props = defineProps({ const emit = defineEmits(['update:modelValue']); const isShow = ref(false); -const colorValueRef = ref(props.modelValue); -const restoreValue = toRaw(props.modelValue); +const colorValueRef = ref(props.modelValue || '#000000'); +const restoreValue = toRaw(props.modelValue || '#000000'); const computedColorValue = computed(() => { return colorValueRef.value; diff --git a/io.sc.platform.core.frontend/src/platform/components/widget/color/WColorInputPalette.vue b/io.sc.platform.core.frontend/src/platform/components/form/elements/WColorInputPalette.vue similarity index 98% rename from io.sc.platform.core.frontend/src/platform/components/widget/color/WColorInputPalette.vue rename to io.sc.platform.core.frontend/src/platform/components/form/elements/WColorInputPalette.vue index c0737160..23422684 100644 --- a/io.sc.platform.core.frontend/src/platform/components/widget/color/WColorInputPalette.vue +++ b/io.sc.platform.core.frontend/src/platform/components/form/elements/WColorInputPalette.vue @@ -271,8 +271,8 @@ const quasarColors = [ ]; const isShow = ref(false); -const colorValueRef = ref(props.modelValue); -const restoreValue = toRaw(props.modelValue); +const colorValueRef = ref(props.modelValue || 'black'); +const restoreValue = toRaw(props.modelValue || 'black'); const computedColorValue = computed(() => { return colorValueRef.value; diff --git a/io.sc.platform.core.frontend/src/platform/components/widget/cron/WCron.vue b/io.sc.platform.core.frontend/src/platform/components/form/elements/WCron.vue similarity index 86% rename from io.sc.platform.core.frontend/src/platform/components/widget/cron/WCron.vue rename to io.sc.platform.core.frontend/src/platform/components/form/elements/WCron.vue index 4d161f04..c538fcec 100644 --- a/io.sc.platform.core.frontend/src/platform/components/widget/cron/WCron.vue +++ b/io.sc.platform.core.frontend/src/platform/components/form/elements/WCron.vue @@ -45,13 +45,13 @@ - diff --git a/io.sc.platform.core.frontend/src/platform/components/widget/codemirror/WCodemirror2.vue b/io.sc.platform.core.frontend/src/platform/components/widget/codemirror/WCodemirror2.vue deleted file mode 100644 index bfcd294f..00000000 --- a/io.sc.platform.core.frontend/src/platform/components/widget/codemirror/WCodemirror2.vue +++ /dev/null @@ -1,31 +0,0 @@ - - diff --git a/io.sc.platform.core.frontend/src/platform/components/widget/select/WSelect.vue b/io.sc.platform.core.frontend/src/platform/components/widget/select/WSelect.vue deleted file mode 100644 index 225e192e..00000000 --- a/io.sc.platform.core.frontend/src/platform/components/widget/select/WSelect.vue +++ /dev/null @@ -1,7 +0,0 @@ - - diff --git a/io.sc.platform.core.frontend/src/platform/utils/Tools.ts b/io.sc.platform.core.frontend/src/platform/utils/Tools.ts index 904f0c34..145c6a7d 100644 --- a/io.sc.platform.core.frontend/src/platform/utils/Tools.ts +++ b/io.sc.platform.core.frontend/src/platform/utils/Tools.ts @@ -46,6 +46,15 @@ class Tools { return !Tools.isUndefinedOrNull(obj) && typeof obj === 'string'; } + /** + * 判断一个对象是否是数字 + * @param obj 对象 + * @returns 对象是否是数字 + */ + public static isNumber(obj: any): boolean { + return !isNaN(parseFloat(obj)) && isFinite(obj); + } + /** * 判断一个对象是否是对象类型 * @param obj 对象 @@ -806,6 +815,22 @@ class Tools { return (c === 'x' ? random : (random & 0x3) | 0x8).toString(16); }); } + + /** + * 计算像素 + * @param value 值 + * @returns 像素值 + */ + public static px(value: any) { + if (Tools.isUndefinedOrNull(value)) { + return null; + } + if (Tools.isNumber(value)) { + return value + 'px'; + } else { + return value; + } + } } export { Tools }; diff --git a/io.sc.platform.core.frontend/src/routes/routes.json b/io.sc.platform.core.frontend/src/routes/routes.json index da489078..e15d3bc2 100644 --- a/io.sc.platform.core.frontend/src/routes/routes.json +++ b/io.sc.platform.core.frontend/src/routes/routes.json @@ -1,62 +1,14 @@ [ { - "name": "route.testcase.component", - "path": "testcase/component", + "name": "route.testcase.formElements", + "path": "testcase/formElements", "parent": "/", "priority": 0, - "component": "component.testcase.component", - "componentPath": "@/views/Component.vue", + "component": "component.testcase.formElements", + "componentPath": "@/views/FormElements.vue", "redirect": null, "meta": { - "permissions": ["/testcase/component/**/*"] - } - }, - { - "name": "route.testcase.dialog", - "path": "testcase/dialog", - "parent": "/", - "priority": 0, - "component": "component.testcase.dialog", - "componentPath": "@/views/Dialog.vue", - "redirect": null, - "meta": { - "permissions": ["/testcase/dialog/**/*"] - } - }, - { - "name": "route.testcase.codemirror", - "path": "testcase/codemirror", - "parent": "/", - "priority": 0, - "component": "component.testcase.codemirror", - "componentPath": "@/views/Codemirror.vue", - "redirect": null, - "meta": { - "permissions": ["/testcase/codemirror/**/*"] - } - }, - { - "name": "route.testcase.select", - "path": "testcase/select", - "parent": "/", - "priority": 0, - "component": "component.testcase.select", - "componentPath": "@/views/Select.vue", - "redirect": null, - "meta": { - "permissions": ["/testcase/select/**/*"] - } - }, - { - "name": "route.testcase.treeGrid", - "path": "testcase/treeGrid", - "parent": "/", - "priority": 0, - "component": "component.testcase.treeGrid", - "componentPath": "@/views/TreeGrid.vue", - "redirect": null, - "meta": { - "permissions": ["/testcase/treeGrid/**/*"] + "permissions": ["/testcase/formElements/**/*"] } }, { diff --git a/io.sc.platform.core.frontend/src/views/Codemirror.vue b/io.sc.platform.core.frontend/src/views/Codemirror.vue deleted file mode 100644 index bc65913a..00000000 --- a/io.sc.platform.core.frontend/src/views/Codemirror.vue +++ /dev/null @@ -1,50 +0,0 @@ - - - diff --git a/io.sc.platform.core.frontend/src/views/Component.vue b/io.sc.platform.core.frontend/src/views/Component.vue deleted file mode 100644 index fc083220..00000000 --- a/io.sc.platform.core.frontend/src/views/Component.vue +++ /dev/null @@ -1,29 +0,0 @@ - - diff --git a/io.sc.platform.core.frontend/src/views/Dialog.vue b/io.sc.platform.core.frontend/src/views/Dialog.vue deleted file mode 100644 index 22c37731..00000000 --- a/io.sc.platform.core.frontend/src/views/Dialog.vue +++ /dev/null @@ -1,37 +0,0 @@ - - diff --git a/io.sc.platform.core.frontend/src/views/Form1.vue b/io.sc.platform.core.frontend/src/views/Form1.vue deleted file mode 100644 index 444f06df..00000000 --- a/io.sc.platform.core.frontend/src/views/Form1.vue +++ /dev/null @@ -1,30 +0,0 @@ - - diff --git a/io.sc.platform.core.frontend/src/views/FormElements.vue b/io.sc.platform.core.frontend/src/views/FormElements.vue new file mode 100644 index 00000000..0379af5a --- /dev/null +++ b/io.sc.platform.core.frontend/src/views/FormElements.vue @@ -0,0 +1,44 @@ + + diff --git a/io.sc.platform.core.frontend/src/views/Grid1.vue b/io.sc.platform.core.frontend/src/views/Grid1.vue deleted file mode 100644 index d7e5272c..00000000 --- a/io.sc.platform.core.frontend/src/views/Grid1.vue +++ /dev/null @@ -1,4 +0,0 @@ - - diff --git a/io.sc.platform.core.frontend/src/views/Select.vue b/io.sc.platform.core.frontend/src/views/Select.vue deleted file mode 100644 index 69fb1bba..00000000 --- a/io.sc.platform.core.frontend/src/views/Select.vue +++ /dev/null @@ -1,22 +0,0 @@ - - diff --git a/io.sc.platform.core.frontend/src/views/Table.vue b/io.sc.platform.core.frontend/src/views/Table.vue deleted file mode 100644 index 72a4bc62..00000000 --- a/io.sc.platform.core.frontend/src/views/Table.vue +++ /dev/null @@ -1,64 +0,0 @@ - - - diff --git a/io.sc.platform.core.frontend/src/views/TableTitle.vue b/io.sc.platform.core.frontend/src/views/TableTitle.vue deleted file mode 100644 index 17ee9b13..00000000 --- a/io.sc.platform.core.frontend/src/views/TableTitle.vue +++ /dev/null @@ -1,118 +0,0 @@ - - diff --git a/io.sc.platform.core.frontend/src/views/TreeGrid.vue b/io.sc.platform.core.frontend/src/views/TreeGrid.vue deleted file mode 100644 index 55ef6444..00000000 --- a/io.sc.platform.core.frontend/src/views/TreeGrid.vue +++ /dev/null @@ -1,236 +0,0 @@ - -