From 02d028fc2cf43f264bd9559b09f14602eda48a92 Mon Sep 17 00:00:00 2001 From: likunming Date: Thu, 30 May 2024 10:36:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7=E8=AF=84?= =?UTF-8?q?=E7=BA=A7=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.irbs/build.gradle | 8 +- build.gradle | 52 +- gradle.properties | 9 +- irbs.cust.rating/build.gradle | 2 +- irbs.defaultManager/build.gradle | 2 +- irbs.frontend/.npmrc | 4 +- irbs.frontend/package.json | 209 +++-- irbs.frontend/src/views/IrbsHome.vue | 1130 +++++--------------------- 8 files changed, 372 insertions(+), 1044 deletions(-) diff --git a/app.irbs/build.gradle b/app.irbs/build.gradle index c4844a6..1242c88 100644 --- a/app.irbs/build.gradle +++ b/app.irbs/build.gradle @@ -15,10 +15,10 @@ dependencies { "io.sc:io.sc.platform.app:${platform_version}", "io.sc:io.sc.platform.security.loginform:${platform_version}", - "io.sc:io.sc.platform.page.config:${platform_version}", - "io.sc:rwa.params:${platform_version}", - "io.sc:rwa.report:${platform_version}", - "io.sc:app.rwa.frontend:${platform_version}", + "io.sc:io.sc.platform.page.config:${rwa_version}", + "io.sc:rwa.params:${rwa_version}", + "io.sc:rwa.report:${rwa_version}", + "io.sc:app.rwa.frontend:${rwa_version}", project(":irbs.frontend"), project(":irbs.cust.rating"), diff --git a/build.gradle b/build.gradle index a77b9c7..16f0ad3 100644 --- a/build.gradle +++ b/build.gradle @@ -52,7 +52,6 @@ subprojects { exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" exclude group: "org.slf4j", module: "slf4j-jdk14" exclude group: "org.slf4j", module: "slf4j-nop" - //exclude group: "com.oracle.database.jdbc", module: "ojdbc8" } dependencyManagement { @@ -100,15 +99,14 @@ subprojects { compileTestJava.options.encoding ="${java_encoding}" tasks.withType(JavaCompile) { - //options.compilerArgs += ["-Xdoclint:none", "-Xlint:none", "-nowarn"] options.compilerArgs += ["-Xlint:deprecation","-Xlint:unchecked"] } /*----------------------------------------------------------------- * 配置项目基本信息 *----------------------------------------------------------------*/ - group ="${platform_group}" - version ="${platform_version}" + group ="${application_group}" + version ="${application_version}" if(file('package.json').exists()){ mkdir 'java-src/main/java'; @@ -184,7 +182,6 @@ subprojects { sources { include '*.adoc' } - //outputDir = file("$buildDir/resources/main/help/" + project.name) outputDir = file("dist/help/" + project.name) resources { from(sourceDir) { @@ -235,8 +232,6 @@ subprojects { doLast{ //打包时移除 jrebel 相关的文件 delete "$buildDir/resources/main/rebel.xml" - // - } } @@ -269,18 +264,35 @@ subprojects { *----------------------------------------------------------------*/ task jrebelIdea() {} tasks.jrebelIdea.doLast { - File resourcesFile =file('src/main/resources') - if(resourcesFile!=null && resourcesFile.exists()){ - File rebelFile = file('src/main/resources/rebel.xml') - rebelFile.withWriter('UTF-8') { writer -> - writer.write('\n'); - writer.write('\n'); - writer.write('\t\n'); - if(file(project.name + '/src/main').exists()){ - writer.write('\t\t\n'); + if(isFrontendProject(file('.'))) { + File resourcesFile = file('java-src/main/resources') + if (resourcesFile != null && resourcesFile.exists()) { + File rebelFile = file('java-src/main/resources/rebel.xml') + rebelFile.withWriter('UTF-8') { writer -> + writer.write('\n'); + writer.write('\n'); + writer.write('\t\n'); + if (file(project.name + '/java-src/main').exists()) { + writer.write('\t\t\n'); + } + writer.write('\t\n'); + writer.write(''); + } + } + }else { + File resourcesFile = file('src/main/resources') + if (resourcesFile != null && resourcesFile.exists()) { + File rebelFile = file('src/main/resources/rebel.xml') + rebelFile.withWriter('UTF-8') { writer -> + writer.write('\n'); + writer.write('\n'); + writer.write('\t\n'); + if (file(project.name + '/src/main').exists()) { + writer.write('\t\t\n'); + } + writer.write('\t\n'); + writer.write(''); } - writer.write('\t\n'); - writer.write(''); } } } @@ -636,13 +648,13 @@ subprojects { frontendNpmInstall.dependsOn(frontendUpdatePackageJson) frontendNpmSync.dependsOn(frontendNpmInstall) frontendNpmBuild.dependsOn(frontendNpmSync) - frontendNpmProd.dependsOn(frontendNpmInstall) + frontendNpmProd.dependsOn(frontendNpmSync) // 资源处理前进行前端模块的构建 // 设置方式: 通过命令行 -D 传入目标环境参数 // gradle bootwar -Dfrontend=dev # 采用 pnpm build 构建前端 // gradle bootwar -Dfrontend=prod # 采用 pnpm prod 构建前端 - // gradle bootwar -Dfrontend # 不构建前端, 仅生成后端需要的文件 + // gradle bootwar -Dfrontend=none # 不构建前端, 仅生成后端需要的文件 def isFrontend =System.getProperty("frontend")?:"prod"; if(isFrontend=="dev"){ frontendGenerateThymeleafTemplate.dependsOn(frontendNpmBuild); diff --git a/gradle.properties b/gradle.properties index e440c03..ce79ff6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -36,10 +36,15 @@ application_version=1.0.1 # platform ########################################################### platform_group=io.sc -platform_version=8.1.37 +platform_version=8.1.41 platform_plugin_version=8.1.13 -platform_core_frontend_version=8.1.188 +platform_core_frontend_version=8.1.217 + +########################################################### +# product dependencies version +########################################################### rule_engine_version=3.10.2 +rwa_version=1.0.2 ########################################################### # dependencies version diff --git a/irbs.cust.rating/build.gradle b/irbs.cust.rating/build.gradle index e335c0b..8a4bf97 100644 --- a/irbs.cust.rating/build.gradle +++ b/irbs.cust.rating/build.gradle @@ -3,7 +3,7 @@ dependencies { "io.sc:io.sc.platform.mvc:${platform_version}", "org.wsp:org.wsp.engine.rule.client:${rule_engine_version}", "io.sc:io.sc.platform.flowable:${platform_version}", - "io.sc:io.sc.platform.page.config:${platform_version}", + "io.sc:io.sc.platform.page.config:${rwa_version}", project(":irbs.defaultManager"), ) diff --git a/irbs.defaultManager/build.gradle b/irbs.defaultManager/build.gradle index 6378675..47a6b96 100644 --- a/irbs.defaultManager/build.gradle +++ b/irbs.defaultManager/build.gradle @@ -2,6 +2,6 @@ dependencies { api( "io.sc:io.sc.platform.mvc:${platform_version}", "io.sc:io.sc.platform.flowable:${platform_version}", - "io.sc:io.sc.platform.page.config:${platform_version}", + "io.sc:io.sc.platform.page.config:${rwa_version}", ) } diff --git a/irbs.frontend/.npmrc b/irbs.frontend/.npmrc index febd503..c1c0b29 100644 --- a/irbs.frontend/.npmrc +++ b/irbs.frontend/.npmrc @@ -1,5 +1,5 @@ # npm 仓库地址, 在 npm install 时使用 -registry=http://124.222.99.204:8000/repository/npm-public/ +registry=http://nexus.sc.io:8000/repository/npm-public/ # 用户邮箱 email= @@ -8,4 +8,4 @@ email= # 登录 npm 仓库的用户认证信息, 在 npm publish 时使用, publish 的 npm registry 在 package.json 文件中 publishConfig 部分配置 # _authToken 可通过以下命令获取 # curl -X PUT -H "Content-Type:application/json" -d '{"_id":"org.couchdb.user:admin","name":"admin","password":"admin"}' http://nexus.sc.io:8000/repository/npm-releases/-/user/org.couchdb.user:admin -//124.222.99.204:8000/repository/npm-releases/:_authToken=NpmToken.193db44c-7ca5-3cb6-a990-d24b93fb0d10 \ No newline at end of file +//nexus.sc.io:8000/repository/npm-releases/:_authToken=NpmToken.193db44c-7ca5-3cb6-a990-d24b93fb0d10 \ No newline at end of file diff --git a/irbs.frontend/package.json b/irbs.frontend/package.json index f794adb..3939e30 100644 --- a/irbs.frontend/package.json +++ b/irbs.frontend/package.json @@ -1,106 +1,105 @@ { - "name": "irbs.frontend", - "version": "8.1.27", - "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": { - "@quasar/extras": "1.16.9", - "@vueuse/core": "10.7.1", - "axios": "1.6.3", - "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.2", - "tailwindcss": "3.4.0", - "vue": "3.4.3", - "vue-dompurify-html": "5.0.1", - "vue-i18n": "9.8.0", - "vue-router": "4.2.5", - "lodash": "4.17.21", - "@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", - "codemirror": "6.0.1", - "vue-codemirror6": "1.2.0" - } -} + "name": "irbs.frontend", + "version": "1.0.1", + "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.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.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.19", + "babel-loader": "9.1.3", + "clean-webpack-plugin": "4.0.0", + "copy-webpack-plugin": "12.0.2", + "cross-env": "7.0.3", + "css-loader": "7.1.1", + "eslint": "8.56.0", + "eslint-config-prettier": "9.1.0", + "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.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.91.0", + "webpack-bundle-analyzer": "4.10.2", + "webpack-cli": "5.1.4", + "webpack-dev-server": "5.0.4", + "webpack-merge": "5.10.0", + "@vue/babel-plugin-jsx": "1.2.2" + }, + "dependencies": { + "@quasar/extras": "1.16.11", + "@vueuse/core": "10.9.0", + "axios": "1.6.8", + "dayjs": "1.11.10", + "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.217", + "quasar": "2.15.3", + "tailwindcss": "3.4.3", + "vue": "3.4.24", + "vue-dompurify-html": "5.0.1", + "vue-i18n": "9.13.1", + "vue-router": "4.3.2", + "lodash": "4.17.21", + "@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.2", + "@codemirror/lang-json": "6.0.1", + "@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", + "codemirror": "6.0.1", + "vue-codemirror6": "1.2.0", + "@maxgraph/core": "0.10.0" + } +} \ No newline at end of file diff --git a/irbs.frontend/src/views/IrbsHome.vue b/irbs.frontend/src/views/IrbsHome.vue index f207a7a..52bb012 100644 --- a/irbs.frontend/src/views/IrbsHome.vue +++ b/irbs.frontend/src/views/IrbsHome.vue @@ -1,43 +1,38 @@ -