diff --git a/app.platform/build.gradle b/app.platform/build.gradle index 6305bf8a..af883441 100644 --- a/app.platform/build.gradle +++ b/app.platform/build.gradle @@ -15,20 +15,20 @@ dependencies { project(":io.sc.platform.developer"), project(":io.sc.platform.security.loginform"), -// project(":io.sc.engine.mv"), -// project(":io.sc.engine.mv.frontend"), -// project(":io.sc.engine.mv.sample"), -// -// project(":io.sc.engine.rule.client"), -// project(":io.sc.engine.rule.client.spring"), -// project(":io.sc.engine.rule.core"), -// project(":io.sc.engine.rule.server"), -// project(":io.sc.engine.rule.sample"), -// -// project(":erm"), + project(":io.sc.engine.mv"), + project(":io.sc.engine.mv.frontend"), + project(":io.sc.engine.mv.sample"), -// project(":erm"), -// project(":erm.frontend"), + project(":io.sc.engine.rule.client"), + project(":io.sc.engine.rule.client.spring"), + project(":io.sc.engine.rule.core"), + project(":io.sc.engine.rule.server"), + project(":io.sc.engine.rule.sample"), + + project(":erm"), + + project(":erm"), + project(":erm.frontend"), // project(":io.sc.platform.scheduler.manager"), ) diff --git a/erm.frontend/package.json b/erm.frontend/package.json index fc2d3e8e..7f113a71 100644 --- a/erm.frontend/package.json +++ b/erm.frontend/package.json @@ -1,6 +1,6 @@ { "name": "erm.frontend", - "version": "8.1.37", + "version": "8.1.38", "description": "", "private": false, "keywords": [], @@ -23,81 +23,81 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.23.7", - "@babel/preset-env": "7.23.7", - "@babel/preset-typescript": "7.23.3", - "@babel/plugin-transform-class-properties": "7.23.3", - "@babel/plugin-transform-object-rest-spread": "7.23.4", - "@quasar/app-webpack": "3.12.1", - "@quasar/cli": "2.3.0", + "@babel/core": "7.24.4", + "@babel/preset-env": "7.24.4", + "@babel/preset-typescript": "7.24.1", + "@babel/plugin-transform-class-properties": "7.24.1", + "@babel/plugin-transform-object-rest-spread": "7.24.1", + "@quasar/app-webpack": "3.12.5", + "@quasar/cli": "2.4.0", "@types/mockjs": "1.0.10", - "@types/node": "20.10.6", - "@typescript-eslint/eslint-plugin": "6.17.0", - "@typescript-eslint/parser": "6.17.0", - "@vue/compiler-sfc": "3.4.3", + "@types/node": "20.12.7", + "@typescript-eslint/eslint-plugin": "7.7.1", + "@typescript-eslint/parser": "7.7.1", + "@vue/compiler-sfc": "3.4.24", "@webpack-cli/serve": "2.0.5", - "autoprefixer": "10.4.16", + "autoprefixer": "10.4.19", "babel-loader": "9.1.3", "clean-webpack-plugin": "4.0.0", - "copy-webpack-plugin": "11.0.0", + "copy-webpack-plugin": "12.0.2", "cross-env": "7.0.3", - "css-loader": "6.8.1", + "css-loader": "7.1.1", "eslint": "8.56.0", "eslint-config-prettier": "9.1.0", - "eslint-plugin-prettier": "5.1.2", - "eslint-plugin-vue": "9.19.2", - "eslint-webpack-plugin": "4.0.1", + "eslint-plugin-prettier": "5.1.3", + "eslint-plugin-vue": "9.25.0", + "eslint-webpack-plugin": "4.1.0", "html-webpack-plugin": "5.6.0", "json5": "2.2.3", - "mini-css-extract-plugin": "2.7.6", - "nodemon": "3.0.2", - "postcss": "8.4.32", - "postcss-import": "16.0.0", - "postcss-loader": "7.3.4", - "postcss-preset-env": "9.3.0", - "prettier": "3.1.1", - "sass": "1.69.7", - "sass-loader": "13.3.3", - "typescript": "5.3.3", + "mini-css-extract-plugin": "2.9.0", + "nodemon": "3.1.0", + "postcss": "8.4.38", + "postcss-import": "16.1.0", + "postcss-loader": "8.1.1", + "postcss-preset-env": "9.5.9", + "prettier": "3.2.5", + "sass": "1.75.0", + "sass-loader": "14.2.1", + "typescript": "5.4.5", "vue-loader": "17.4.2", - "webpack": "5.89.0", - "webpack-bundle-analyzer": "4.10.1", + "webpack": "5.91.0", + "webpack-bundle-analyzer": "4.10.2", "webpack-cli": "5.1.4", - "webpack-dev-server": "4.15.1", + "webpack-dev-server": "5.0.4", "webpack-merge": "5.10.0", - "@vue/babel-plugin-jsx": "1.1.5" + "@vue/babel-plugin-jsx": "1.2.2" }, "dependencies": { - "@codemirror/autocomplete": "6.11.1", - "@codemirror/commands": "6.3.3", - "@codemirror/lang-html": "6.4.7", + "@codemirror/autocomplete": "6.16.0", + "@codemirror/commands": "6.5.0", + "@codemirror/lang-html": "6.4.9", "@codemirror/lang-java": "6.0.1", - "@codemirror/lang-javascript": "6.2.1", + "@codemirror/lang-javascript": "6.2.2", "@codemirror/lang-json": "6.0.1", - "@codemirror/lang-sql": "6.5.4", - "@codemirror/lang-xml": "6.0.2", - "@codemirror/language": "6.10.0", - "@codemirror/search": "6.5.5", - "@codemirror/state": "6.4.0", - "@codemirror/view": "6.23.0", - "@maxgraph/core": "0.9.0", - "@quasar/extras": "1.16.9", - "@vueuse/core": "10.7.1", - "axios": "1.6.3", + "@codemirror/lang-sql": "6.6.3", + "@codemirror/lang-xml": "6.1.0", + "@codemirror/language": "6.10.1", + "@codemirror/search": "6.5.6", + "@codemirror/state": "6.4.1", + "@codemirror/view": "6.26.3", + "@maxgraph/core": "0.10.0", + "@quasar/extras": "1.16.11", + "@vueuse/core": "10.9.0", + "axios": "1.6.8", "codemirror": "6.0.1", "dayjs": "1.11.10", - "echarts": "5.4.3", + "echarts": "5.5.0", "exceljs": "4.4.0", "file-saver": "2.0.5", "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "platform-core": "8.1.182", - "quasar": "2.14.5", - "tailwindcss": "3.4.0", - "vue": "3.4.3", + "platform-core": "8.1.189", + "quasar": "2.15.3", + "tailwindcss": "3.4.3", + "vue": "3.4.24", "vue-dompurify-html": "5.0.1", - "vue-i18n": "9.8.0", - "vue-router": "4.2.5" + "vue-i18n": "9.13.1", + "vue-router": "4.3.2" } } \ No newline at end of file diff --git a/erm.frontend/src/views/appetite/cross-validate/CrossValidate.vue b/erm.frontend/src/views/appetite/cross-validate/CrossValidate.vue index 1ca19efd..abc2786e 100644 --- a/erm.frontend/src/views/appetite/cross-validate/CrossValidate.vue +++ b/erm.frontend/src/views/appetite/cross-validate/CrossValidate.vue @@ -1,12 +1,11 @@ diff --git a/io.sc.platform.core.frontend/src/views/FormElements.vue b/io.sc.platform.core.frontend/src/views/FormElements.vue index da8dd2d0..a788af33 100644 --- a/io.sc.platform.core.frontend/src/views/FormElements.vue +++ b/io.sc.platform.core.frontend/src/views/FormElements.vue @@ -1,25 +1,160 @@ - diff --git a/io.sc.platform.core.frontend/template-project/package.json b/io.sc.platform.core.frontend/template-project/package.json index d094d4d7..f2ac72bf 100644 --- a/io.sc.platform.core.frontend/template-project/package.json +++ b/io.sc.platform.core.frontend/template-project/package.json @@ -1,6 +1,6 @@ { "name": "platform-core", - "version": "8.1.187", + "version": "8.1.189", "description": "前端核心包,用于快速构建前端的脚手架", "private": false, "keywords": [], @@ -24,81 +24,81 @@ "no-git-checks": true }, "devDependencies": { - "@babel/core": "7.23.7", - "@babel/preset-env": "7.23.7", - "@babel/preset-typescript": "7.23.3", - "@babel/plugin-transform-class-properties": "7.23.3", - "@babel/plugin-transform-object-rest-spread": "7.23.4", - "@quasar/app-webpack": "3.12.1", - "@quasar/cli": "2.3.0", + "@babel/core": "7.24.4", + "@babel/preset-env": "7.24.4", + "@babel/preset-typescript": "7.24.1", + "@babel/plugin-transform-class-properties": "7.24.1", + "@babel/plugin-transform-object-rest-spread": "7.24.1", + "@quasar/app-webpack": "3.12.5", + "@quasar/cli": "2.4.0", "@types/mockjs": "1.0.10", - "@types/node": "20.10.6", - "@typescript-eslint/eslint-plugin": "6.17.0", - "@typescript-eslint/parser": "6.17.0", - "@vue/compiler-sfc": "3.4.3", - "@vue/babel-plugin-jsx": "1.1.5", + "@types/node": "20.12.7", + "@typescript-eslint/eslint-plugin": "7.7.1", + "@typescript-eslint/parser": "7.7.1", + "@vue/compiler-sfc": "3.4.24", "@webpack-cli/serve": "2.0.5", - "autoprefixer": "10.4.16", + "autoprefixer": "10.4.19", "babel-loader": "9.1.3", "clean-webpack-plugin": "4.0.0", - "copy-webpack-plugin": "11.0.0", + "copy-webpack-plugin": "12.0.2", "cross-env": "7.0.3", - "css-loader": "6.8.1", + "css-loader": "7.1.1", "eslint": "8.56.0", "eslint-config-prettier": "9.1.0", - "eslint-plugin-prettier": "5.1.2", - "eslint-plugin-vue": "9.19.2", - "eslint-webpack-plugin": "4.0.1", + "eslint-plugin-prettier": "5.1.3", + "eslint-plugin-vue": "9.25.0", + "eslint-webpack-plugin": "4.1.0", "html-webpack-plugin": "5.6.0", "json5": "2.2.3", - "mini-css-extract-plugin": "2.7.6", - "nodemon": "3.0.2", - "postcss": "8.4.32", - "postcss-import": "16.0.0", - "postcss-loader": "7.3.4", - "postcss-preset-env": "9.3.0", - "prettier": "3.1.1", - "sass": "1.69.7", - "sass-loader": "13.3.3", - "typescript": "5.3.3", + "mini-css-extract-plugin": "2.9.0", + "nodemon": "3.1.0", + "postcss": "8.4.38", + "postcss-import": "16.1.0", + "postcss-loader": "8.1.1", + "postcss-preset-env": "9.5.9", + "prettier": "3.2.5", + "sass": "1.75.0", + "sass-loader": "14.2.1", + "typescript": "5.4.5", "vue-loader": "17.4.2", - "webpack": "5.89.0", - "webpack-bundle-analyzer": "4.10.1", + "webpack": "5.91.0", + "webpack-bundle-analyzer": "4.10.2", "webpack-cli": "5.1.4", - "webpack-dev-server": "4.15.1", - "webpack-merge": "5.10.0" + "webpack-dev-server": "5.0.4", + "webpack-merge": "5.10.0", + "@vue/babel-plugin-jsx": "1.2.2" }, "dependencies": { - "@codemirror/autocomplete": "6.11.1", - "@codemirror/commands": "6.3.3", - "@codemirror/lang-html": "6.4.7", + "@codemirror/autocomplete": "6.16.0", + "@codemirror/commands": "6.5.0", + "@codemirror/lang-html": "6.4.9", "@codemirror/lang-java": "6.0.1", - "@codemirror/lang-javascript": "6.2.1", + "@codemirror/lang-javascript": "6.2.2", "@codemirror/lang-json": "6.0.1", - "@codemirror/lang-sql": "6.5.4", - "@codemirror/lang-xml": "6.0.2", - "@codemirror/language": "6.10.0", - "@codemirror/search": "6.5.5", - "@codemirror/state": "6.4.0", - "@codemirror/view": "6.23.0", - "@maxgraph/core": "0.9.0", - "@quasar/extras": "1.16.9", - "@vueuse/core": "10.7.1", - "axios": "1.6.3", + "@codemirror/lang-sql": "6.6.3", + "@codemirror/lang-xml": "6.1.0", + "@codemirror/language": "6.10.1", + "@codemirror/search": "6.5.6", + "@codemirror/state": "6.4.1", + "@codemirror/view": "6.26.3", + "@maxgraph/core": "0.10.0", + "@quasar/extras": "1.16.11", + "@vueuse/core": "10.9.0", + "axios": "1.6.8", "codemirror": "6.0.1", "dayjs": "1.11.10", - "echarts": "5.4.3", + "echarts": "5.5.0", "exceljs": "4.4.0", "file-saver": "2.0.5", "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "platform-core": "8.1.187", - "quasar": "2.14.5", - "tailwindcss": "3.4.0", - "vue": "3.4.3", + "platform-core": "8.1.189", + "quasar": "2.15.3", + "tailwindcss": "3.4.3", + "vue": "3.4.24", "vue-dompurify-html": "5.0.1", - "vue-i18n": "9.8.0", - "vue-router": "4.2.5" + "vue-i18n": "9.13.1", + "vue-router": "4.3.2" } } \ No newline at end of file diff --git a/io.sc.platform.core.frontend/template-project/src/components/index.ts b/io.sc.platform.core.frontend/template-project/src/components/index.ts index a1d3e7cb..940d5b83 100644 --- a/io.sc.platform.core.frontend/template-project/src/components/index.ts +++ b/io.sc.platform.core.frontend/template-project/src/components/index.ts @@ -2,7 +2,7 @@ * 此文件为自动生成文件,请勿修改 */ -import component_testcase_formElements from '@/views/exportdata.vue'; +import component_testcase_formElements from '@/views/FormElements.vue'; import component_testcase_likmDialog from '@/views/likm/Dialog.vue'; import component_testcase_likmDrawer from '@/views/likm/Drawer.vue'; import component_testcase_likmForm from '@/views/likm/Form.vue'; diff --git a/io.sc.platform.core.frontend/template-project/src/routes/routes.json b/io.sc.platform.core.frontend/template-project/src/routes/routes.json index e4ce54d2..6d5af58e 100644 --- a/io.sc.platform.core.frontend/template-project/src/routes/routes.json +++ b/io.sc.platform.core.frontend/template-project/src/routes/routes.json @@ -5,7 +5,7 @@ "parent": "/", "priority": 0, "component": "component.testcase.formElements", - "componentPath": "@/views/exportdata.vue", + "componentPath": "@/views/FormElements.vue", "redirect": null, "meta": { "permissions": ["/testcase/formElements/**/*"] diff --git a/io.sc.platform.core.frontend/template-project/src/views/FormElements copy.vue b/io.sc.platform.core.frontend/template-project/src/views/FormElements copy.vue new file mode 100644 index 00000000..119cf2d6 --- /dev/null +++ b/io.sc.platform.core.frontend/template-project/src/views/FormElements copy.vue @@ -0,0 +1,157 @@ + + diff --git a/io.sc.platform.core.frontend/template-project/src/views/FormElements.vue b/io.sc.platform.core.frontend/template-project/src/views/FormElements.vue index da8dd2d0..a788af33 100644 --- a/io.sc.platform.core.frontend/template-project/src/views/FormElements.vue +++ b/io.sc.platform.core.frontend/template-project/src/views/FormElements.vue @@ -1,25 +1,160 @@ - diff --git a/io.sc.platform.core.frontend/template-project/src/views/exportdata.vue b/io.sc.platform.core.frontend/template-project/src/views/exportdata.vue deleted file mode 100644 index 6073fde4..00000000 --- a/io.sc.platform.core.frontend/template-project/src/views/exportdata.vue +++ /dev/null @@ -1,203 +0,0 @@ - - diff --git a/io.sc.platform.developer.frontend/package.json b/io.sc.platform.developer.frontend/package.json index 05d51272..0ce2b945 100644 --- a/io.sc.platform.developer.frontend/package.json +++ b/io.sc.platform.developer.frontend/package.json @@ -1,6 +1,6 @@ { "name": "io.sc.platform.developer.frontend", - "version": "8.1.37", + "version": "8.1.38", "description": "", "private": false, "keywords": [], @@ -23,81 +23,81 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.23.7", - "@babel/preset-env": "7.23.7", - "@babel/preset-typescript": "7.23.3", - "@babel/plugin-transform-class-properties": "7.23.3", - "@babel/plugin-transform-object-rest-spread": "7.23.4", - "@quasar/app-webpack": "3.12.1", - "@quasar/cli": "2.3.0", + "@babel/core": "7.24.4", + "@babel/preset-env": "7.24.4", + "@babel/preset-typescript": "7.24.1", + "@babel/plugin-transform-class-properties": "7.24.1", + "@babel/plugin-transform-object-rest-spread": "7.24.1", + "@quasar/app-webpack": "3.12.5", + "@quasar/cli": "2.4.0", "@types/mockjs": "1.0.10", - "@types/node": "20.10.6", - "@typescript-eslint/eslint-plugin": "6.17.0", - "@typescript-eslint/parser": "6.17.0", - "@vue/compiler-sfc": "3.4.3", + "@types/node": "20.12.7", + "@typescript-eslint/eslint-plugin": "7.7.1", + "@typescript-eslint/parser": "7.7.1", + "@vue/compiler-sfc": "3.4.24", "@webpack-cli/serve": "2.0.5", - "autoprefixer": "10.4.16", + "autoprefixer": "10.4.19", "babel-loader": "9.1.3", "clean-webpack-plugin": "4.0.0", - "copy-webpack-plugin": "11.0.0", + "copy-webpack-plugin": "12.0.2", "cross-env": "7.0.3", - "css-loader": "6.8.1", + "css-loader": "7.1.1", "eslint": "8.56.0", "eslint-config-prettier": "9.1.0", - "eslint-plugin-prettier": "5.1.2", - "eslint-plugin-vue": "9.19.2", - "eslint-webpack-plugin": "4.0.1", + "eslint-plugin-prettier": "5.1.3", + "eslint-plugin-vue": "9.25.0", + "eslint-webpack-plugin": "4.1.0", "html-webpack-plugin": "5.6.0", "json5": "2.2.3", - "mini-css-extract-plugin": "2.7.6", - "nodemon": "3.0.2", - "postcss": "8.4.32", - "postcss-import": "16.0.0", - "postcss-loader": "7.3.4", - "postcss-preset-env": "9.3.0", - "prettier": "3.1.1", - "sass": "1.69.7", - "sass-loader": "13.3.3", - "typescript": "5.3.3", + "mini-css-extract-plugin": "2.9.0", + "nodemon": "3.1.0", + "postcss": "8.4.38", + "postcss-import": "16.1.0", + "postcss-loader": "8.1.1", + "postcss-preset-env": "9.5.9", + "prettier": "3.2.5", + "sass": "1.75.0", + "sass-loader": "14.2.1", + "typescript": "5.4.5", "vue-loader": "17.4.2", - "webpack": "5.89.0", - "webpack-bundle-analyzer": "4.10.1", + "webpack": "5.91.0", + "webpack-bundle-analyzer": "4.10.2", "webpack-cli": "5.1.4", - "webpack-dev-server": "4.15.1", + "webpack-dev-server": "5.0.4", "webpack-merge": "5.10.0", - "@vue/babel-plugin-jsx": "1.1.5" + "@vue/babel-plugin-jsx": "1.2.2" }, "dependencies": { - "@codemirror/autocomplete": "6.11.1", - "@codemirror/commands": "6.3.3", - "@codemirror/lang-html": "6.4.7", + "@codemirror/autocomplete": "6.16.0", + "@codemirror/commands": "6.5.0", + "@codemirror/lang-html": "6.4.9", "@codemirror/lang-java": "6.0.1", - "@codemirror/lang-javascript": "6.2.1", + "@codemirror/lang-javascript": "6.2.2", "@codemirror/lang-json": "6.0.1", - "@codemirror/lang-sql": "6.5.4", - "@codemirror/lang-xml": "6.0.2", - "@codemirror/language": "6.10.0", - "@codemirror/search": "6.5.5", - "@codemirror/state": "6.4.0", - "@codemirror/view": "6.23.0", - "@maxgraph/core": "0.9.0", - "@quasar/extras": "1.16.9", - "@vueuse/core": "10.7.1", - "axios": "1.6.3", + "@codemirror/lang-sql": "6.6.3", + "@codemirror/lang-xml": "6.1.0", + "@codemirror/language": "6.10.1", + "@codemirror/search": "6.5.6", + "@codemirror/state": "6.4.1", + "@codemirror/view": "6.26.3", + "@maxgraph/core": "0.10.0", + "@quasar/extras": "1.16.11", + "@vueuse/core": "10.9.0", + "axios": "1.6.8", "codemirror": "6.0.1", "dayjs": "1.11.10", - "echarts": "5.4.3", + "echarts": "5.5.0", "exceljs": "4.4.0", "file-saver": "2.0.5", "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "platform-core": "8.1.187", - "quasar": "2.14.5", - "tailwindcss": "3.4.0", - "vue": "3.4.3", + "platform-core": "8.1.189", + "quasar": "2.15.3", + "tailwindcss": "3.4.3", + "vue": "3.4.24", "vue-dompurify-html": "5.0.1", - "vue-i18n": "9.8.0", - "vue-router": "4.2.5" + "vue-i18n": "9.13.1", + "vue-router": "4.3.2" } } \ No newline at end of file diff --git a/io.sc.platform.developer.frontend/src/views/backend/ExportLiquibase.vue b/io.sc.platform.developer.frontend/src/views/backend/ExportLiquibase.vue index 5a23508a..1ce5d2fb 100644 --- a/io.sc.platform.developer.frontend/src/views/backend/ExportLiquibase.vue +++ b/io.sc.platform.developer.frontend/src/views/backend/ExportLiquibase.vue @@ -93,7 +93,7 @@
- +
@@ -134,12 +134,13 @@ const valueReactive = reactive({ const loadDatasource = () => { axios.get(Environment.apiContextPath('/api/system/datasource?pageable=false&sortBy=name')).then((response) => { const data = response?.data.content; + const datasourceOptions = []; if (data && data.length > 0) { - datasourceOptionsRef.value.splice(0, datasourceOptionsRef.value.length); for (let item of data) { - datasourceOptionsRef.value.push({ label: item.name, value: item.name }); + datasourceOptions.push({ label: item.name, value: item.name }); } } + datasourceOptionsRef.value = datasourceOptions; }); }; @@ -147,13 +148,14 @@ const datasourceChanged = (datasource: string) => { datasource = datasource || ''; axios.get(Environment.apiContextPath('/api/jdbc/metadata/getSchemas?datasource=' + datasource)).then((response) => { const data = response?.data; + const schemaOptions = []; if (data && data.length > 0) { - schemaOptionsRef.value.splice(0, schemaOptionsRef.value.length); - tablesOptionsRef.value.splice(0, tablesOptionsRef.value.length); for (let item of data) { - schemaOptionsRef.value.push({ label: item.name, value: item.name }); + schemaOptions.push({ label: item.name, value: item.name }); } } + schemaOptionsRef.value = schemaOptions; + tablesOptionsRef.value = []; }); }; @@ -162,12 +164,13 @@ const schemaChanged = (datasource: string, schema: string) => { schema = schema || ''; axios.get(Environment.apiContextPath('/api/jdbc/metadata/getTables?datasource=' + datasource + '&schema=' + schema)).then((response) => { const data = response?.data; + const tablesOptions = []; if (data && data.length > 0) { - tablesOptionsRef.value.splice(0, tablesOptionsRef.value.length); for (let item of data) { - tablesOptionsRef.value.push({ label: item.name, value: item.name }); + tablesOptions.push({ label: item.name, value: item.name }); } } + tablesOptionsRef.value = tablesOptions; }); }; @@ -191,11 +194,8 @@ const exportData = (e) => { }; onMounted(() => { + console.log('onMounted'); loadDatasource(); datasourceChanged(''); }); - -onUpdated(() => { - loadDatasource(); -}); diff --git a/io.sc.platform.developer.frontend/src/views/backend/ImportLiquibase.vue b/io.sc.platform.developer.frontend/src/views/backend/ImportLiquibase.vue index 5cf1e741..c862d097 100644 --- a/io.sc.platform.developer.frontend/src/views/backend/ImportLiquibase.vue +++ b/io.sc.platform.developer.frontend/src/views/backend/ImportLiquibase.vue @@ -86,20 +86,17 @@ const importData = () => { const loadDatasource = () => { axios.get(Environment.apiContextPath('/api/system/datasource?pageable=false&sortBy=name')).then((response) => { const data = response?.data.content; + const datasourceOptions = []; if (data && data.length > 0) { - datasourceOptionsRef.value.splice(0, datasourceOptionsRef.value.length); for (let item of data) { - datasourceOptionsRef.value.push({ label: item.name, value: item.name }); + datasourceOptions.push({ label: item.name, value: item.name }); } } + datasourceOptionsRef.value = datasourceOptions; }); }; onMounted(() => { loadDatasource(); }); - -onUpdated(() => { - loadDatasource(); -}); diff --git a/io.sc.platform.gradle/templates/pgp/app/build.gradle b/io.sc.platform.gradle/templates/pgp/app/build.gradle index 70233485..af883441 100644 --- a/io.sc.platform.gradle/templates/pgp/app/build.gradle +++ b/io.sc.platform.gradle/templates/pgp/app/build.gradle @@ -27,8 +27,8 @@ dependencies { project(":erm"), -// project(":erm"), -// project(":erm.frontend"), + project(":erm"), + project(":erm.frontend"), // project(":io.sc.platform.scheduler.manager"), ) diff --git a/io.sc.platform.gradle/templates/pgp/setup/gradle.properties b/io.sc.platform.gradle/templates/pgp/setup/gradle.properties index 40952aca..d52c8272 100644 --- a/io.sc.platform.gradle/templates/pgp/setup/gradle.properties +++ b/io.sc.platform.gradle/templates/pgp/setup/gradle.properties @@ -36,9 +36,9 @@ application_version=1.0.0 # platform ########################################################### platform_group=io.sc -platform_version=8.1.37 +platform_version=8.1.38 platform_plugin_version=8.1.13 -platform_core_frontend_version=8.1.182 +platform_core_frontend_version=8.1.188 ########################################################### # dependencies version diff --git a/io.sc.platform.lcdp.frontend/package copy.json b/io.sc.platform.lcdp.frontend/package copy.json new file mode 100644 index 00000000..ae2879d0 --- /dev/null +++ b/io.sc.platform.lcdp.frontend/package copy.json @@ -0,0 +1,103 @@ +{ + "name": "io.sc.platform.lcdp.frontend", + "version": "8.1.38", + "description": "", + "private": false, + "keywords": [], + "author": "", + "license": "ISC", + "scripts": { + "clean": "rm -rf ./node_modules && rm -rf pnpm-lock.yaml", + "dev": "nodemon", + "serve": "node ./util-components-generator.cjs && cross-env NODE_ENV=development webpack serve --config webpack.env.serve.cjs", + "build": "node ./util-components-generator.cjs && cross-env NODE_ENV=development webpack --config webpack.env.build.cjs", + "prod": "node ./util-components-generator.cjs && cross-env NODE_ENV=production webpack --config webpack.env.prod.cjs", + "sync": "platform sync" + }, + "engines": { + "node": ">=18", + "pnpm": ">=7" + }, + "publishConfig": { + "registry": "http://nexus.sc.io:8000/repository/npm-releases/", + "access": "public" + }, + "devDependencies": { + "@babel/core": "7.23.7", + "@babel/preset-env": "7.23.7", + "@babel/preset-typescript": "7.23.3", + "@babel/plugin-transform-class-properties": "7.23.3", + "@babel/plugin-transform-object-rest-spread": "7.23.4", + "@quasar/app-webpack": "3.12.1", + "@quasar/cli": "2.3.0", + "@types/mockjs": "1.0.10", + "@types/node": "20.10.6", + "@typescript-eslint/eslint-plugin": "6.17.0", + "@typescript-eslint/parser": "6.17.0", + "@vue/compiler-sfc": "3.4.3", + "@webpack-cli/serve": "2.0.5", + "autoprefixer": "10.4.16", + "babel-loader": "9.1.3", + "clean-webpack-plugin": "4.0.0", + "copy-webpack-plugin": "11.0.0", + "cross-env": "7.0.3", + "css-loader": "6.8.1", + "eslint": "8.56.0", + "eslint-config-prettier": "9.1.0", + "eslint-plugin-prettier": "5.1.2", + "eslint-plugin-vue": "9.19.2", + "eslint-webpack-plugin": "4.0.1", + "html-webpack-plugin": "5.6.0", + "json5": "2.2.3", + "mini-css-extract-plugin": "2.7.6", + "nodemon": "3.0.2", + "postcss": "8.4.32", + "postcss-import": "16.0.0", + "postcss-loader": "7.3.4", + "postcss-preset-env": "9.3.0", + "prettier": "3.1.1", + "sass": "1.69.7", + "sass-loader": "13.3.3", + "typescript": "5.3.3", + "vue-loader": "17.4.2", + "webpack": "5.89.0", + "webpack-bundle-analyzer": "4.10.1", + "webpack-cli": "5.1.4", + "webpack-dev-server": "4.15.1", + "webpack-merge": "5.10.0", + "@vue/babel-plugin-jsx": "1.1.5" + }, + "dependencies": { + "@codemirror/autocomplete": "6.11.1", + "@codemirror/commands": "6.3.3", + "@codemirror/lang-html": "6.4.7", + "@codemirror/lang-java": "6.0.1", + "@codemirror/lang-javascript": "6.2.1", + "@codemirror/lang-json": "6.0.1", + "@codemirror/lang-sql": "6.5.4", + "@codemirror/lang-xml": "6.0.2", + "@codemirror/language": "6.10.0", + "@codemirror/search": "6.5.5", + "@codemirror/state": "6.4.0", + "@codemirror/view": "6.23.0", + "@maxgraph/core": "0.9.0", + "@quasar/extras": "1.16.9", + "@vueuse/core": "10.7.1", + "axios": "1.6.3", + "codemirror": "6.0.1", + "dayjs": "1.11.10", + "echarts": "5.4.3", + "exceljs": "4.4.0", + "file-saver": "2.0.5", + "luckyexcel": "1.0.1", + "mockjs": "1.1.0", + "pinia": "2.1.7", + "platform-core": "8.1.188", + "quasar": "2.14.5", + "tailwindcss": "3.4.0", + "vue": "3.4.3", + "vue-dompurify-html": "5.0.1", + "vue-i18n": "9.8.0", + "vue-router": "4.2.5" + } +} \ No newline at end of file diff --git a/io.sc.platform.lcdp.frontend/package.json b/io.sc.platform.lcdp.frontend/package.json index b4d48c57..7178bb65 100644 --- a/io.sc.platform.lcdp.frontend/package.json +++ b/io.sc.platform.lcdp.frontend/package.json @@ -1,6 +1,6 @@ { "name": "io.sc.platform.lcdp.frontend", - "version": "8.1.37", + "version": "8.1.38", "description": "", "private": false, "keywords": [], @@ -23,81 +23,81 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.23.7", - "@babel/preset-env": "7.23.7", - "@babel/preset-typescript": "7.23.3", - "@babel/plugin-transform-class-properties": "7.23.3", - "@babel/plugin-transform-object-rest-spread": "7.23.4", - "@quasar/app-webpack": "3.12.1", - "@quasar/cli": "2.3.0", + "@babel/core": "7.24.4", + "@babel/preset-env": "7.24.4", + "@babel/preset-typescript": "7.24.1", + "@babel/plugin-transform-class-properties": "7.24.1", + "@babel/plugin-transform-object-rest-spread": "7.24.1", + "@quasar/app-webpack": "3.12.5", + "@quasar/cli": "2.4.0", "@types/mockjs": "1.0.10", - "@types/node": "20.10.6", - "@typescript-eslint/eslint-plugin": "6.17.0", - "@typescript-eslint/parser": "6.17.0", - "@vue/compiler-sfc": "3.4.3", + "@types/node": "20.12.7", + "@typescript-eslint/eslint-plugin": "7.7.1", + "@typescript-eslint/parser": "7.7.1", + "@vue/compiler-sfc": "3.4.24", "@webpack-cli/serve": "2.0.5", - "autoprefixer": "10.4.16", + "autoprefixer": "10.4.19", "babel-loader": "9.1.3", "clean-webpack-plugin": "4.0.0", - "copy-webpack-plugin": "11.0.0", + "copy-webpack-plugin": "12.0.2", "cross-env": "7.0.3", - "css-loader": "6.8.1", + "css-loader": "7.1.1", "eslint": "8.56.0", "eslint-config-prettier": "9.1.0", - "eslint-plugin-prettier": "5.1.2", - "eslint-plugin-vue": "9.19.2", - "eslint-webpack-plugin": "4.0.1", + "eslint-plugin-prettier": "5.1.3", + "eslint-plugin-vue": "9.25.0", + "eslint-webpack-plugin": "4.1.0", "html-webpack-plugin": "5.6.0", "json5": "2.2.3", - "mini-css-extract-plugin": "2.7.6", - "nodemon": "3.0.2", - "postcss": "8.4.32", - "postcss-import": "16.0.0", - "postcss-loader": "7.3.4", - "postcss-preset-env": "9.3.0", - "prettier": "3.1.1", - "sass": "1.69.7", - "sass-loader": "13.3.3", - "typescript": "5.3.3", + "mini-css-extract-plugin": "2.9.0", + "nodemon": "3.1.0", + "postcss": "8.4.38", + "postcss-import": "16.1.0", + "postcss-loader": "8.1.1", + "postcss-preset-env": "9.5.9", + "prettier": "3.2.5", + "sass": "1.75.0", + "sass-loader": "14.2.1", + "typescript": "5.4.5", "vue-loader": "17.4.2", - "webpack": "5.89.0", - "webpack-bundle-analyzer": "4.10.1", + "webpack": "5.91.0", + "webpack-bundle-analyzer": "4.10.2", "webpack-cli": "5.1.4", - "webpack-dev-server": "4.15.1", + "webpack-dev-server": "5.0.4", "webpack-merge": "5.10.0", - "@vue/babel-plugin-jsx": "1.1.5" + "@vue/babel-plugin-jsx": "1.2.2" }, "dependencies": { - "@codemirror/autocomplete": "6.11.1", - "@codemirror/commands": "6.3.3", - "@codemirror/lang-html": "6.4.7", + "@codemirror/autocomplete": "6.16.0", + "@codemirror/commands": "6.5.0", + "@codemirror/lang-html": "6.4.9", "@codemirror/lang-java": "6.0.1", - "@codemirror/lang-javascript": "6.2.1", + "@codemirror/lang-javascript": "6.2.2", "@codemirror/lang-json": "6.0.1", - "@codemirror/lang-sql": "6.5.4", - "@codemirror/lang-xml": "6.0.2", - "@codemirror/language": "6.10.0", - "@codemirror/search": "6.5.5", - "@codemirror/state": "6.4.0", - "@codemirror/view": "6.23.0", - "@maxgraph/core": "0.9.0", - "@quasar/extras": "1.16.9", - "@vueuse/core": "10.7.1", - "axios": "1.6.3", + "@codemirror/lang-sql": "6.6.3", + "@codemirror/lang-xml": "6.1.0", + "@codemirror/language": "6.10.1", + "@codemirror/search": "6.5.6", + "@codemirror/state": "6.4.1", + "@codemirror/view": "6.26.3", + "@maxgraph/core": "0.10.0", + "@quasar/extras": "1.16.11", + "@vueuse/core": "10.9.0", + "axios": "1.6.8", "codemirror": "6.0.1", "dayjs": "1.11.10", - "echarts": "5.4.3", + "echarts": "5.5.0", "exceljs": "4.4.0", "file-saver": "2.0.5", "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "platform-core": "8.1.182", - "quasar": "2.14.5", - "tailwindcss": "3.4.0", - "vue": "3.4.3", + "platform-core": "8.1.189", + "quasar": "2.15.3", + "tailwindcss": "3.4.3", + "vue": "3.4.24", "vue-dompurify-html": "5.0.1", - "vue-i18n": "9.8.0", - "vue-router": "4.2.5" + "vue-i18n": "9.13.1", + "vue-router": "4.3.2" } } \ No newline at end of file diff --git a/io.sc.platform.lcdp.frontend/src/views/Theme.vue b/io.sc.platform.lcdp.frontend/src/views/Theme.vue index a021a78d..49df31f2 100644 --- a/io.sc.platform.lcdp.frontend/src/views/Theme.vue +++ b/io.sc.platform.lcdp.frontend/src/views/Theme.vue @@ -28,10 +28,10 @@ - - - - + + + +
@@ -92,7 +92,7 @@ - + @@ -104,7 +104,7 @@