diff --git a/gradle.properties b/gradle.properties index bd7efd95..c288a026 100644 --- a/gradle.properties +++ b/gradle.properties @@ -36,9 +36,9 @@ application_version=1.0.0 # platform ########################################################### platform_group=io.sc -platform_version=8.1.22 +platform_version=8.1.23 platform_plugin_version=8.1.13 -platform_core_frontend_version=8.1.114 +platform_core_frontend_version=8.1.119 ########################################################### # dependencies version diff --git a/io.sc.engine.mv.frontend/package.json b/io.sc.engine.mv.frontend/package.json index 54305b6f..4d904357 100644 --- a/io.sc.engine.mv.frontend/package.json +++ b/io.sc.engine.mv.frontend/package.json @@ -1,6 +1,6 @@ { "name": "io.sc.engine.mv.frontend", - "version": "8.1.22", + "version": "8.1.23", "description": "", "private": false, "keywords": [ @@ -80,7 +80,7 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "platform-core": "8.1.118", + "platform-core": "8.1.119", "quasar": "2.14.2", "tailwindcss": "3.4.0", "vue": "3.4.3", diff --git a/io.sc.platform.core.frontend/package.json b/io.sc.platform.core.frontend/package.json index 7125187a..3a432a11 100644 --- a/io.sc.platform.core.frontend/package.json +++ b/io.sc.platform.core.frontend/package.json @@ -1,6 +1,6 @@ { "name": "platform-core", - "version": "8.1.118", + "version": "8.1.119", "description": "前端核心包,用于快速构建前端的脚手架", "//main": "库的主文件", "main": "dist/platform-core.js", diff --git a/io.sc.platform.core.frontend/src/platform/components-ext/options/BooleanOptions.ts b/io.sc.platform.core.frontend/src/platform/components-ext/options/BooleanOptions.ts index 46fedf49..09c2ea6b 100644 --- a/io.sc.platform.core.frontend/src/platform/components-ext/options/BooleanOptions.ts +++ b/io.sc.platform.core.frontend/src/platform/components-ext/options/BooleanOptions.ts @@ -1,48 +1,24 @@ import { i18n } from '@/platform/plugin'; -const yesNo = (includeEmpty: boolean = true) => { - if (includeEmpty) { - return [ - { value: null, label: '' }, - { value: true, label: i18n.global.t('yes') }, - { value: false, label: i18n.global.t('no') }, - ]; - } else { - return [ - { value: true, label: i18n.global.t('yes') }, - { value: false, label: i18n.global.t('no') }, - ]; - } +const yesNo = () => { + return [ + { value: true, label: i18n.global.t('yes') }, + { value: false, label: i18n.global.t('no') }, + ]; }; -const trueFalse = (includeEmpty: boolean = true) => { - if (includeEmpty) { - return [ - { value: null, label: '' }, - { value: true, label: i18n.global.t('true') }, - { value: false, label: i18n.global.t('false') }, - ]; - } else { - return [ - { value: true, label: i18n.global.t('true') }, - { value: false, label: i18n.global.t('false') }, - ]; - } +const trueFalse = () => { + return [ + { value: true, label: i18n.global.t('true') }, + { value: false, label: i18n.global.t('false') }, + ]; }; -const successFailed = (includeEmpty: boolean = true) => { - if (includeEmpty) { - return [ - { value: null, label: '' }, - { value: 'success', label: i18n.global.t('success') }, - { value: 'failed', label: i18n.global.t('failed') }, - ]; - } else { - return [ - { value: 'success', label: i18n.global.t('success') }, - { value: 'failed', label: i18n.global.t('failed') }, - ]; - } +const successFailed = () => { + return [ + { value: 'success', label: i18n.global.t('success') }, + { value: 'failed', label: i18n.global.t('failed') }, + ]; }; export { yesNo, trueFalse, successFailed }; diff --git a/io.sc.platform.core.frontend/src/platform/components-ext/options/EnumOptions.ts b/io.sc.platform.core.frontend/src/platform/components-ext/options/EnumOptions.ts index fd98f62a..7943423f 100644 --- a/io.sc.platform.core.frontend/src/platform/components-ext/options/EnumOptions.ts +++ b/io.sc.platform.core.frontend/src/platform/components-ext/options/EnumOptions.ts @@ -8,12 +8,9 @@ class EnumOptions { this.#options = options; } - public options(includeEmpty: boolean = true) { + public options() { if (this.#options) { const result = []; - if (includeEmpty) { - result.push({ value: null, label: '' }); - } for (const option of this.#options) { result.push({ value: option.value, diff --git a/io.sc.platform.core.frontend/template-project/package.json b/io.sc.platform.core.frontend/template-project/package.json index e6874592..99b26c87 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.118", + "version": "8.1.119", "description": "前端核心包,用于快速构建前端的脚手架", "private": false, "keywords": [], @@ -92,7 +92,7 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "platform-core": "8.1.118", + "platform-core": "8.1.119", "quasar": "2.14.2", "tailwindcss": "3.4.0", "vue": "3.4.3", diff --git a/io.sc.platform.core/src/main/resources/io/sc/platform/core/i18n/words.properties b/io.sc.platform.core/src/main/resources/io/sc/platform/core/i18n/words.properties index df257caa..353645c8 100644 --- a/io.sc.platform.core/src/main/resources/io/sc/platform/core/i18n/words.properties +++ b/io.sc.platform.core/src/main/resources/io/sc/platform/core/i18n/words.properties @@ -99,6 +99,7 @@ nextPage=Next Page no=No normal=Normal oldValue=Old Value +operation=Operation operationSuccess=Operation Sucess order=Order org=Organization diff --git a/io.sc.platform.core/src/main/resources/io/sc/platform/core/i18n/words_tw_CN.properties b/io.sc.platform.core/src/main/resources/io/sc/platform/core/i18n/words_tw_CN.properties index 05538dc4..8077aef7 100644 --- a/io.sc.platform.core/src/main/resources/io/sc/platform/core/i18n/words_tw_CN.properties +++ b/io.sc.platform.core/src/main/resources/io/sc/platform/core/i18n/words_tw_CN.properties @@ -99,6 +99,7 @@ nextPage=\u4E0B\u4E00\u9801 no=\u5426 normal=\u6B63\u5E38 oldValue=\u539F\u503C +operation=\u64CD\u4F5C operationSuccess=\u64CD\u4F5C\u6210\u529F order=\u9806\u5E8F org=\u6A5F\u69CB diff --git a/io.sc.platform.core/src/main/resources/io/sc/platform/core/i18n/words_zh_CN.properties b/io.sc.platform.core/src/main/resources/io/sc/platform/core/i18n/words_zh_CN.properties index e35ee769..18c149a5 100644 --- a/io.sc.platform.core/src/main/resources/io/sc/platform/core/i18n/words_zh_CN.properties +++ b/io.sc.platform.core/src/main/resources/io/sc/platform/core/i18n/words_zh_CN.properties @@ -99,6 +99,7 @@ nextPage=\u4E0B\u4E00\u9875 no=\u5426 normal=\u6B63\u5E38 oldValue=\u539F\u503C +operation=\u64CD\u4F5C operationSuccess=\u64CD\u4F5C\u6210\u529F order=\u987A\u5E8F org=\u673A\u6784 diff --git a/io.sc.platform.developer.frontend/package.json b/io.sc.platform.developer.frontend/package.json index b56ca9b4..f87f70e8 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.22", + "version": "8.1.23", "description": "", "private": false, "keywords": [ @@ -80,7 +80,7 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "platform-core": "8.1.114", + "platform-core": "8.1.119", "quasar": "2.14.2", "tailwindcss": "3.4.0", "vue": "3.4.3", diff --git a/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/controller/ProcessOperationWebController.java b/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/controller/ProcessOperationWebController.java index 35cbdeea..6652a232 100644 --- a/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/controller/ProcessOperationWebController.java +++ b/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/controller/ProcessOperationWebController.java @@ -15,9 +15,8 @@ import java.util.Map; @RequestMapping("/api/flowable/process/operation") public class ProcessOperationWebController { @Autowired private ProcessOperationService processOperationService; - - @RequestMapping(value="start/{processDefinitionKey}",method=RequestMethod.POST) - @ResponseBody + + @PostMapping("start/{processDefinitionKey}") public CompleteTaskResponse start( @PathVariable(name="processDefinitionKey") String processDefinitionKey, @RequestBody(required=false) ProcessProperties properties @@ -35,9 +34,8 @@ public class ProcessOperationWebController { throw e; } } - - @RequestMapping(value="complete/{taskId}",method=RequestMethod.POST) - @ResponseBody + + @PostMapping("complete/{taskId}") public CompleteTaskResponse completeTask(@PathVariable("taskId") String taskId,@RequestBody(required=false) ProcessProperties properties) throws Exception{ try{ if(properties!=null){ @@ -52,45 +50,33 @@ public class ProcessOperationWebController { throw e; } } - - @RequestMapping(value="claim/{taskId}",method=RequestMethod.POST) - @ResponseBody + + @PostMapping("claim/{taskId}") public void claimTask(@PathVariable("taskId") String taskId) throws Exception{ processOperationService.claimTask(taskId); } - - @RequestMapping(value="unClaim/{taskId}",method=RequestMethod.POST) - @ResponseBody + + @PostMapping("unClaim/{taskId}") public void unClaimTask(@PathVariable("taskId") String taskId) throws Exception{ processOperationService.unClaimTask(taskId); } - - @RequestMapping(value="terminateProcessInstance/{taskId}",method=RequestMethod.POST) - @ResponseBody + + @PostMapping("terminateProcessInstance/{taskId}") public void terminateProcessInstance(@PathVariable("taskId") String taskId) throws Exception{ processOperationService.terminateProcessInstance(taskId,null); } - - @RequestMapping(value="terminate/{taskId}",method=RequestMethod.POST) - @ResponseBody - public void terminateTask(@PathVariable("taskId") String taskId) throws Exception{ - processOperationService.terminateTask(taskId); - } - - @RequestMapping(value="getGobacks/{taskId}",method=RequestMethod.GET) - @ResponseBody + + @GetMapping("getGobacks/{taskId}") public List getGobacks(@PathVariable("taskId") String taskId) throws Exception{ return processOperationService.getGobacks(taskId); } - - @RequestMapping(value="goback/{taskId}",method=RequestMethod.POST) - @ResponseBody + + @PostMapping("goback/{taskId}") public CompleteTaskResponse goback(@PathVariable("taskId") String taskId,@RequestBody(required=false) ProcessProperties properties) throws Exception{ return completeTask(taskId,properties); } - - @RequestMapping(value="jump",method=RequestMethod.POST) - @ResponseBody + + @PostMapping("jump") public void terminateTask(@RequestBody Map parameters) throws Exception{ String taskId =parameters.get("taskId"); String targetActivityId =parameters.get("targetActivityId"); diff --git a/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/controller/ProcessQueryWebController.java b/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/controller/ProcessQueryWebController.java index 1a60ea74..f29a7e1e 100644 --- a/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/controller/ProcessQueryWebController.java +++ b/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/controller/ProcessQueryWebController.java @@ -4,6 +4,9 @@ import io.sc.platform.flowable.service.ProcessQueryService; import io.sc.platform.flowable.support.*; import io.sc.platform.mvc.support.FileDownloader; import io.sc.platform.orm.service.support.QueryParameter; +import io.sc.platform.orm.service.support.QueryResult; +import io.sc.platform.orm.service.support.criteria.Criteria; +import io.sc.platform.orm.service.support.criteria.impl.Equals; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.web.bind.annotation.*; @@ -11,14 +14,15 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.InputStream; +import java.util.Collections; import java.util.List; @RestController @RequestMapping("/api/flowable/process/query") public class ProcessQueryWebController { @Autowired private ProcessQueryService service; - - @RequestMapping(value="showProcessDiagramByInstanceId/{processInstanceId}",method=RequestMethod.GET) + + @GetMapping("showProcessDiagramByInstanceId/{processInstanceId}") public void showProcessDiagramByInstanceId(@PathVariable("processInstanceId") String processInstanceId,HttpServletRequest request,HttpServletResponse response) throws Exception{ InputStream inputStream =service.showProcessDiagramByInstanceId(processInstanceId); if(inputStream!=null){ @@ -28,7 +32,7 @@ public class ProcessQueryWebController { } } - @RequestMapping(value="showProcessDiagramByTaskId/{taskId}",method=RequestMethod.GET) + @GetMapping("showProcessDiagramByTaskId/{taskId}") public void showProcessDiagramByTaskId(@PathVariable("taskId") String taskId,HttpServletRequest request,HttpServletResponse response) throws Exception{ InputStream inputStream =service.showProcessDiagramByTaskId(taskId); if(inputStream!=null){ @@ -38,32 +42,32 @@ public class ProcessQueryWebController { } } - @RequestMapping(value="instance/isc/fetch", method=RequestMethod.GET) - @ResponseBody - public Page processInstanceQuery(@RequestParam(name="businessKey",required=false)String businessKey, QueryParameter queryParameter) throws Exception{ - return service.queryProcessInstances(businessKey,queryParameter); + @GetMapping("instance") + public Page processInstanceQuery(QueryParameter queryParameter) throws Exception{ + return service.queryProcessInstances(queryParameter); } - @RequestMapping(value="task/isc/fetch", method=RequestMethod.GET) - @ResponseBody - public List taskQuery(@RequestParam(name="processInstanceId",required=false) String processInstanceId, QueryParameter queryParameter) throws Exception{ - return service.queryProcessTasks(processInstanceId,queryParameter); + @GetMapping("task") + public List taskQuery(QueryParameter queryParameter) throws Exception{ + Criteria criteria =queryParameter.getCriteriaByFieldName("processInstanceId"); + if(criteria!=null && criteria instanceof Equals){ + Equals equals =(Equals)criteria; + return service.queryProcessTasks(equals.getValue(),queryParameter); + } + return Collections.emptyList(); } - @RequestMapping(value="variable/isc/fetch", method=RequestMethod.GET) - @ResponseBody + @GetMapping("variable") public List variableQuery(@RequestParam(name="procInstId",required=false) String procInstId) throws Exception{ return service.queryVariables(procInstId); } - @RequestMapping(value="activity/isc/fetch", method=RequestMethod.GET) - @ResponseBody - public List activityQuery(@RequestParam(name="taskId",required=false) String taskId) throws Exception{ + @GetMapping("activity/{taskId}") + public List activityQuery(@PathVariable(name="taskId",required=false) String taskId) throws Exception{ return service.queryUserTaskDefinition(taskId); } - @RequestMapping(value="candidate/isc/fetch", method=RequestMethod.GET) - @ResponseBody + @GetMapping("candidate") public List candidateQuery( @RequestParam(name="taskId",required=false) String taskId, @RequestParam(name="activityId",required=false) String activityId diff --git a/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/service/ProcessOperationService.java b/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/service/ProcessOperationService.java index 745c5ea8..22753b1c 100644 --- a/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/service/ProcessOperationService.java +++ b/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/service/ProcessOperationService.java @@ -99,13 +99,6 @@ public interface ProcessOperationService { */ public void terminateProcessInstance(String taskId,String deleteReason) throws Exception; - /** - * 终止任务 - * @param taskId 任务ID - * @throws Exception 违例 - */ - public void terminateTask(String taskId) throws Exception; - /** * 获取某个任务定义节点的所有回退操作列表 * @param taskId 任务ID diff --git a/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/service/ProcessQueryService.java b/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/service/ProcessQueryService.java index 11e518db..d7b8a9d3 100644 --- a/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/service/ProcessQueryService.java +++ b/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/service/ProcessQueryService.java @@ -35,12 +35,11 @@ public interface ProcessQueryService { /** * 查询流程实例 - * @param businessKey 业务主键 * @param queryParameter 查询参数 * @return 流程实例 * @throws Exception 违例 */ - public Page queryProcessInstances(String businessKey, QueryParameter queryParameter) throws Exception; + public Page queryProcessInstances(QueryParameter queryParameter) throws Exception; /** * 查询任务 diff --git a/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/service/impl/ProcessOperationServiceImpl.java b/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/service/impl/ProcessOperationServiceImpl.java index 0a3cfccd..8f468b4e 100644 --- a/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/service/impl/ProcessOperationServiceImpl.java +++ b/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/service/impl/ProcessOperationServiceImpl.java @@ -327,6 +327,7 @@ public class ProcessOperationServiceImpl implements ProcessOperationService { } @Override + @Transactional public void terminateProcessInstance(String taskId,String deleteReason) throws Exception { Task task =taskService.createTaskQuery().taskId(taskId).singleResult(); if(task!=null) { @@ -336,11 +337,6 @@ public class ProcessOperationServiceImpl implements ProcessOperationService { @Override @Transactional - public void terminateTask(String taskId) throws Exception { - managementService.executeCommand(new JumpTaskCommand(taskId)); - } - - @Override public List getGobacks(String taskId) throws Exception { if(!StringUtils.hasText(taskId)){ return null; diff --git a/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/service/impl/ProcessQueryServiceImpl.java b/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/service/impl/ProcessQueryServiceImpl.java index 07762ca3..a519f1ee 100644 --- a/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/service/impl/ProcessQueryServiceImpl.java +++ b/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/service/impl/ProcessQueryServiceImpl.java @@ -8,6 +8,7 @@ import io.sc.platform.flowable.service.ProcessQueryService; import io.sc.platform.flowable.support.*; import io.sc.platform.jdbc.sql.dialect.Dialect; import io.sc.platform.orm.service.support.QueryParameter; +import io.sc.platform.orm.service.support.QueryResult; import org.flowable.bpmn.model.BpmnModel; import org.flowable.bpmn.model.EndEvent; import org.flowable.bpmn.model.FlowElement; @@ -114,7 +115,8 @@ public class ProcessQueryServiceImpl implements ProcessQueryService { } @Override - public Page queryProcessInstances(String businessKey, QueryParameter queryParameter) throws Exception { + public Page queryProcessInstances(QueryParameter queryParameter) throws Exception { + String businessKey =""; List entities =processEntityService.list(queryParameter); if(entities!=null && entities.size()>0){ Set deployedIds =new HashSet(); @@ -194,7 +196,7 @@ public class ProcessQueryServiceImpl implements ProcessQueryService { } return new PageImpl(wrappers,pageable,totalCount); } - return null; + return QueryResult.emptyPage(); } private String getOrderSql(Pageable pageable){ diff --git a/io.sc.platform.gradle/templates/pgp/app/build-jetty.gradle b/io.sc.platform.gradle/templates/pgp/app/build-jetty.gradle index 337e18ac..6cf02057 100644 --- a/io.sc.platform.gradle/templates/pgp/app/build-jetty.gradle +++ b/io.sc.platform.gradle/templates/pgp/app/build-jetty.gradle @@ -2,7 +2,7 @@ println "[Jetty] 环境 ......" configurations { all*.exclude group: "org.springframework.boot", module: "spring-boot-starter-tomcat" - all*.exclude group: "org.apache.tomcat.embed", module: "tomcat-embed-coe" + all*.exclude group: "org.apache.tomcat.embed", module: "tomcat-embed-core" all*.exclude group: "org.apache.tomcat.embed", module: "tomcat-embed-websocket" } diff --git a/io.sc.platform.gradle/templates/pgp/app/build-undertow.gradle b/io.sc.platform.gradle/templates/pgp/app/build-undertow.gradle index 2ef429e7..00d3b492 100644 --- a/io.sc.platform.gradle/templates/pgp/app/build-undertow.gradle +++ b/io.sc.platform.gradle/templates/pgp/app/build-undertow.gradle @@ -2,7 +2,7 @@ println "[Undertow] 环境 ......" configurations { all*.exclude group: "org.springframework.boot", module: "spring-boot-starter-tomcat" - all*.exclude group: "org.apache.tomcat.embed", module: "tomcat-embed-coe" + all*.exclude group: "org.apache.tomcat.embed", module: "tomcat-embed-core" all*.exclude group: "org.apache.tomcat.embed", module: "tomcat-embed-websocket" } diff --git a/io.sc.platform.gradle/templates/pgp/app/build.gradle b/io.sc.platform.gradle/templates/pgp/app/build.gradle index d7abaf71..22d89384 100644 --- a/io.sc.platform.gradle/templates/pgp/app/build.gradle +++ b/io.sc.platform.gradle/templates/pgp/app/build.gradle @@ -4,21 +4,21 @@ apply plugin: 'com.google.cloud.tools.jib' apply from: "build-common.gradle" dependencies { - implementation("org.springframework.boot:spring-boot-starter-web"){ - exclude group: "org.springframework.boot", module: "spring-boot-starter-tomcat" - } + implementation("org.springframework.boot:spring-boot-starter-web"){ + exclude group: "org.springframework.boot", module: "spring-boot-starter-tomcat" + } } dependencies { - implementation ( - project(":io.sc.platform.app"), + implementation ( + project(":io.sc.platform.app"), project(":io.sc.platform.developer"), + project(":io.sc.platform.security.loginform"), - //project(":io.sc.platform.job.coe"), - //project(":io.sc.platform.job.executor"), - //project(":io.sc.platform.job.manager"), - - ) + project(":io.sc.engine.mv"), + project(":io.sc.engine.mv.frontend"), + project(":io.sc.engine.mv.sample"), + ) } /** @@ -45,7 +45,7 @@ bootWar{ //launchScript() manifest { attributes 'Implementation-Version': archiveVersion, - 'Implementation-Title': project.name + 'Implementation-Title': project.name } } @@ -54,7 +54,7 @@ bootJar{ //launchScript() manifest { attributes 'Implementation-Version': archiveVersion, - 'Implementation-Title': project.name + 'Implementation-Title': project.name } } diff --git a/io.sc.platform.gradle/templates/pgp/setup/build-version.gradle b/io.sc.platform.gradle/templates/pgp/setup/build-version.gradle index 8e4acc1a..dfb853de 100755 --- a/io.sc.platform.gradle/templates/pgp/setup/build-version.gradle +++ b/io.sc.platform.gradle/templates/pgp/setup/build-version.gradle @@ -194,7 +194,7 @@ subprojects { // ext['undertow.version'] = // ext['versions-maven-plugin.version'] = // ext['webjars-hal-browser.version'] = - // ext['webjars-locator-coe.version'] = + // ext['webjars-locator-core.version'] = // ext['wsdl4j.version'] = // ext['xml-maven-plugin.version'] = // ext['xmlunit2.version'] = diff --git a/io.sc.platform.gradle/templates/pgp/setup/build.gradle.txt b/io.sc.platform.gradle/templates/pgp/setup/build.gradle.txt index 04bd9898..d6d86dd2 100644 --- a/io.sc.platform.gradle/templates/pgp/setup/build.gradle.txt +++ b/io.sc.platform.gradle/templates/pgp/setup/build.gradle.txt @@ -643,7 +643,7 @@ subprojects { // gradle bootwar -Dfrontend=dev # 采用 pnpm build 构建前端 // gradle bootwar -Dfrontend=prod # 采用 pnpm prod 构建前端 // gradle bootwar -Dfrontend # 不构建前端, 仅生成后端需要的文件 - def isFrontend =System.getProperty("frontend")?:"dev"; + def isFrontend =System.getProperty("frontend")?:"prod"; if(isFrontend=="dev"){ frontendGenerateThymeleafTemplate.dependsOn(frontendNpmBuild); }else if(isFrontend=="prod"){ diff --git a/io.sc.platform.gradle/templates/pgp/setup/gradle.properties b/io.sc.platform.gradle/templates/pgp/setup/gradle.properties index 9bab43b1..c288a026 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.22 +platform_version=8.1.23 platform_plugin_version=8.1.13 -platform_core_frontend_version=8.1.88 +platform_core_frontend_version=8.1.119 ########################################################### # dependencies version diff --git a/io.sc.platform.lcdp.frontend/package.json b/io.sc.platform.lcdp.frontend/package.json index f7f012ee..3b71d11f 100644 --- a/io.sc.platform.lcdp.frontend/package.json +++ b/io.sc.platform.lcdp.frontend/package.json @@ -1,10 +1,10 @@ { "name": "io.sc.platform.lcdp.frontend", - "version": "8.1.22", + "version": "8.1.23", "description": "", "private": false, "keywords": [ - + ], "author": "", "license": "ISC", @@ -93,7 +93,7 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "platform-core": "8.1.118", + "platform-core": "8.1.119", "quasar": "2.14.2", "tailwindcss": "3.4.0", "vue": "3.4.3", @@ -102,4 +102,4 @@ "vue-router": "4.2.5", "vue-codemirror6": "1.2.0" } -} +} \ No newline at end of file diff --git a/io.sc.platform.lcdp.frontend/src/i18n/messages.json b/io.sc.platform.lcdp.frontend/src/i18n/messages.json index d7e39dd5..c4def770 100644 --- a/io.sc.platform.lcdp.frontend/src/i18n/messages.json +++ b/io.sc.platform.lcdp.frontend/src/i18n/messages.json @@ -140,12 +140,75 @@ "theme.grid.stickyBgColor":"Sticky Column's Background Color", "theme.grid.borderColor":"Border Color", - "lcdp.bpm.deployId":"Deploy ID ", - "lcdp.bpm.canClaimTask":"Claim Task", - "lcdp.frontend.export":"Export Frontend Package", "lcdp.frontend.export.frontendWebContextPath":"Frontend Web Context Path", - "lcdp.frontend.export.backendApiWebContextPath":"Backend API Web Context Path" + "lcdp.frontend.export.backendApiWebContextPath":"Backend API Web Context Path", + + "lcdp.bpm.tabs.processDefine": "Process Define", + "lcdp.bpm.tabs.processInstance": "Process Instance", + "lcdp.bpm.tabs.task": "Process Task", + + "lcdp.bpm.processDefine.grid.title": "Process Define List", + "lcdp.bpm.processDefine.grid.toolbar.design": "Design", + "lcdp.bpm.processDefine.grid.toolbar.deployment": "Deployment", + "lcdp.bpm.processDefine.grid.toolbar.deployment.tip": "Are you sure to deploy the process?", + "lcdp.bpm.processDefine.grid.toolbar.createProcessInstance": "Create Process Instance", + "lcdp.bpm.processDefine.grid.toolbar.queryProcessInstance": "Query Process Instance", + "lcdp.bpm.processDefine.grid.entity.deployId": "Deploy ID", + "lcdp.bpm.processDefine.grid.entity.canClaimTask": "Claim Task", + + "lcdp.bpm.designer.dialog.title.prefix": "Process Designer", + + "lcdp.bpm.createProcessInstance.dialog.title": "Create Process Instance", + + "lcdp.bpm.processInstance.grid.title": "Process Instance List", + "lcdp.bpm.processInstance.grid.toolbar.queryTask": "Query Task", + "lcdp.bpm.processInstance.grid.entity.bussinessKey": "Bussiness Key", + "lcdp.bpm.processInstance.grid.entity.startTime": "Start Date", + "lcdp.bpm.processInstance.grid.entity.startUserId": "Start User", + "lcdp.bpm.processInstance.grid.entity.suspended": "Suspended", + "lcdp.bpm.processInstance.grid.entity.processDefinitionKey": "Process Define Code", + "lcdp.bpm.processInstance.grid.entity.processDefinitionName": "Process Define Name", + "lcdp.bpm.processInstance.grid.entity.processDefinitionId": "Process Define Deploy ID", + "lcdp.bpm.processInstance.grid.entity.variables": "Variables(persistent)", + "lcdp.bpm.processInstance.grid.entity.transientVariables": "Variables(transient)", + "lcdp.bpm.processInstance.grid.entity.autoCompleteFirstTask": "Auto Complete First Task", + + "lcdp.bpm.task.grid.title": "Task List", + "lcdp.bpm.task.grid.toolbar.complete": "Complete", + "lcdp.bpm.task.grid.toolbar.complete.tip": "Are you sure to complete the Task?", + "lcdp.bpm.task.grid.toolbar.claim": "Claim", + "lcdp.bpm.task.grid.toolbar.claim.tip": "Are you sure to claim the Task?", + "lcdp.bpm.task.grid.toolbar.unclaim": "Unclaim", + "lcdp.bpm.task.grid.toolbar.unclaim.tip": "Are you sure to unclaim the Task?", + "lcdp.bpm.task.grid.toolbar.jump": "Jump", + "lcdp.bpm.task.grid.toolbar.terminate": "Terminate", + "lcdp.bpm.task.grid.toolbar.terminate.tip": "Are you sure to terminate the Task?", + "lcdp.bpm.task.grid.toolbar.variables": "Variables", + "lcdp.bpm.task.grid.entity.owner": "owner", + "lcdp.bpm.task.grid.entity.assignee": "assignee", + "lcdp.bpm.task.grid.entity.createTime": "Create Date", + "lcdp.bpm.task.grid.entity.claimTime": "Claim Date", + "lcdp.bpm.task.grid.entity.processInstanceId": "Process Instance ID", + + "lcdp.bpm.variables.grid.title": "Variable List", + "lcdp.bpm.variables.grid.entity.doubleValue":"Double Value", + "lcdp.bpm.variables.grid.entity.longValue":"Long Value", + "lcdp.bpm.variables.grid.entity.rev":"Rev.", + "lcdp.bpm.variables.grid.entity.executionId":"Execution ID", + "lcdp.bpm.variables.grid.entity.procInstId":"Process Instance ID", + "lcdp.bpm.variables.grid.entity.taskId":"Task ID", + "lcdp.bpm.variables.grid.entity.scopeId":"Scope ID", + "lcdp.bpm.variables.grid.entity.subScopeId":"Sub Scope ID", + "lcdp.bpm.variables.grid.entity.scopeType":"Scope Type", + "lcdp.bpm.variables.grid.entity.byteArrayId":"Byte Array ID", + "lcdp.bpm.variables.grid.entity.text":"Text", + "lcdp.bpm.variables.grid.entity.text2":"Text2", + + "lcdp.bpm.jumpTask.dialog.title": "Task Jump", + "lcdp.bpm.jumpTask.form.entity.taskId": "Task ID", + "lcdp.bpm.jumpTask.form.entity.targetActivityId": "Target Activity Node", + "lcdp.bpm.jumpTask.form.entity.targetAssignee": "Assignee" } diff --git a/io.sc.platform.lcdp.frontend/src/i18n/messages_tw_CN.json b/io.sc.platform.lcdp.frontend/src/i18n/messages_tw_CN.json index 9d3777a7..3cc73ffc 100644 --- a/io.sc.platform.lcdp.frontend/src/i18n/messages_tw_CN.json +++ b/io.sc.platform.lcdp.frontend/src/i18n/messages_tw_CN.json @@ -140,10 +140,73 @@ "theme.grid.stickyBgColor":"鎖定列背景顏色", "theme.grid.borderColor":"表格邊框顏色", - "lcdp.bpm.deployId":"發佈ID", - "lcdp.bpm.canClaimTask":"領取任務", - "lcdp.frontend.export":"一鍵導出前端包", "lcdp.frontend.export.frontendWebContextPath":"前端應用上下文路徑", - "lcdp.frontend.export.backendApiWebContextPath":"後端應用上下文路徑" + "lcdp.frontend.export.backendApiWebContextPath":"後端應用上下文路徑", + + "lcdp.bpm.tabs.processDefine": "流程定義", + "lcdp.bpm.tabs.processInstance": "流程實例", + "lcdp.bpm.tabs.task": "工作任務", + + "lcdp.bpm.processDefine.grid.title": "流程定義列表", + "lcdp.bpm.processDefine.grid.toolbar.design": "設計", + "lcdp.bpm.processDefine.grid.toolbar.deployment": "發佈", + "lcdp.bpm.processDefine.grid.toolbar.deployment.tip": "您確定要發佈流程嗎?", + "lcdp.bpm.processDefine.grid.toolbar.createProcessInstance": "創建流程實例", + "lcdp.bpm.processDefine.grid.toolbar.queryProcessInstance": "查詢流程實例", + "lcdp.bpm.processDefine.grid.entity.deployId": "發佈 ID", + "lcdp.bpm.processDefine.grid.entity.canClaimTask": "領取任務", + + "lcdp.bpm.designer.dialog.title.prefix": "流程設計器", + + "lcdp.bpm.createProcessInstance.dialog.title": "創建流程實例", + + "lcdp.bpm.processInstance.grid.title": "流程實例列表", + "lcdp.bpm.processInstance.grid.toolbar.queryTask": "查詢任務", + "lcdp.bpm.processInstance.grid.entity.bussinessKey": "業務鍵", + "lcdp.bpm.processInstance.grid.entity.startTime": "發起時間", + "lcdp.bpm.processInstance.grid.entity.startUserId": "發起者", + "lcdp.bpm.processInstance.grid.entity.suspended": "是否掛起", + "lcdp.bpm.processInstance.grid.entity.processDefinitionKey": "流程定義代码", + "lcdp.bpm.processInstance.grid.entity.processDefinitionName": "流程定義名稱", + "lcdp.bpm.processInstance.grid.entity.processDefinitionId": "流程定義发布ID", + "lcdp.bpm.processInstance.grid.entity.variables": "流程變量(持久化)", + "lcdp.bpm.processInstance.grid.entity.transientVariables": "流程變量(臨時)", + "lcdp.bpm.processInstance.grid.entity.autoCompleteFirstTask": "是否自動完成第一個任務", + + "lcdp.bpm.task.grid.title": "任務列表", + "lcdp.bpm.task.grid.toolbar.complete": "完成", + "lcdp.bpm.task.grid.toolbar.complete.tip": "您確定要完成工作任務嗎?", + "lcdp.bpm.task.grid.toolbar.claim": "領取", + "lcdp.bpm.task.grid.toolbar.claim.tip": "您確定要領取工作任務嗎?", + "lcdp.bpm.task.grid.toolbar.unclaim": "歸還", + "lcdp.bpm.task.grid.toolbar.unclaim.tip": "您確定要歸還工作任務嗎?", + "lcdp.bpm.task.grid.toolbar.jump": "跳轉", + "lcdp.bpm.task.grid.toolbar.terminate": "終止", + "lcdp.bpm.task.grid.toolbar.terminate.tip": "您確定要終止工作任務嗎?", + "lcdp.bpm.task.grid.toolbar.variables": "变量", + "lcdp.bpm.task.grid.entity.owner": "所有者", + "lcdp.bpm.task.grid.entity.assignee": "處理人", + "lcdp.bpm.task.grid.entity.createTime": "創建日期", + "lcdp.bpm.task.grid.entity.claimTime": "領取日期", + "lcdp.bpm.task.grid.entity.processInstanceId": "流程實例 ID", + + "lcdp.bpm.variables.grid.title": "變量列表", + "lcdp.bpm.variables.grid.entity.doubleValue":"雙精度數值", + "lcdp.bpm.variables.grid.entity.longValue":"長整數值", + "lcdp.bpm.variables.grid.entity.rev":"修訂", + "lcdp.bpm.variables.grid.entity.executionId":"執行 ID", + "lcdp.bpm.variables.grid.entity.procInstId":"流程實例 ID", + "lcdp.bpm.variables.grid.entity.taskId":"任務 ID", + "lcdp.bpm.variables.grid.entity.scopeId":"範圍 ID", + "lcdp.bpm.variables.grid.entity.subScopeId":"子範圍 ID", + "lcdp.bpm.variables.grid.entity.scopeType":"範圍類型", + "lcdp.bpm.variables.grid.entity.byteArrayId":"字節數組 ID", + "lcdp.bpm.variables.grid.entity.text":"文本", + "lcdp.bpm.variables.grid.entity.text2":"文本2", + + "lcdp.bpm.jumpTask.dialog.title": "任務跳轉", + "lcdp.bpm.jumpTask.form.entity.taskId": "任務ID", + "lcdp.bpm.jumpTask.form.entity.targetActivityId": "目標節點", + "lcdp.bpm.jumpTask.form.entity.targetAssignee": "處理人" } diff --git a/io.sc.platform.lcdp.frontend/src/i18n/messages_zh_CN.json b/io.sc.platform.lcdp.frontend/src/i18n/messages_zh_CN.json index 4a75f500..7ed9837c 100644 --- a/io.sc.platform.lcdp.frontend/src/i18n/messages_zh_CN.json +++ b/io.sc.platform.lcdp.frontend/src/i18n/messages_zh_CN.json @@ -139,12 +139,75 @@ "theme.grid.headBgColor":"表头背景颜色", "theme.grid.stickyBgColor":"锁定列背景颜色", "theme.grid.borderColor":"表格边框颜色", - - "lcdp.bpm.deployId":"发布ID", - "lcdp.bpm.canClaimTask":"领取任务", "lcdp.frontend.export":"一键导出前端包", "lcdp.frontend.export.frontendWebContextPath":"前端应用上下文路径", - "lcdp.frontend.export.backendApiWebContextPath":"后端应用上下文路径" + "lcdp.frontend.export.backendApiWebContextPath":"后端应用上下文路径", + + + "lcdp.bpm.tabs.processDefine": "流程定义", + "lcdp.bpm.tabs.processInstance": "流程实例", + "lcdp.bpm.tabs.task": "工作任务", + + "lcdp.bpm.processDefine.grid.title": "流程定义列表", + "lcdp.bpm.processDefine.grid.toolbar.design": "设计", + "lcdp.bpm.processDefine.grid.toolbar.deployment": "发布", + "lcdp.bpm.processDefine.grid.toolbar.deployment.tip": "您确定要发布流程吗?", + "lcdp.bpm.processDefine.grid.toolbar.createProcessInstance": "创建流程实例", + "lcdp.bpm.processDefine.grid.toolbar.queryProcessInstance": "查询流程实例", + "lcdp.bpm.processDefine.grid.entity.deployId": "发布 ID", + "lcdp.bpm.processDefine.grid.entity.canClaimTask": "领取任务", + + "lcdp.bpm.designer.dialog.title.prefix": "流程设计器", + + "lcdp.bpm.createProcessInstance.dialog.title": "创建流程实例", + + "lcdp.bpm.processInstance.grid.title": "流程实例列表", + "lcdp.bpm.processInstance.grid.toolbar.queryTask": "查询任务", + "lcdp.bpm.processInstance.grid.entity.bussinessKey": "业务键", + "lcdp.bpm.processInstance.grid.entity.startTime": "发起日期", + "lcdp.bpm.processInstance.grid.entity.startUserId": "发起者", + "lcdp.bpm.processInstance.grid.entity.suspended": "是否挂起", + "lcdp.bpm.processInstance.grid.entity.processDefinitionKey": "流程定义代码", + "lcdp.bpm.processInstance.grid.entity.processDefinitionName": "流程定义名称", + "lcdp.bpm.processInstance.grid.entity.processDefinitionId": "流程定义发布ID", + "lcdp.bpm.processInstance.grid.entity.variables": "流程变量(持久化)", + "lcdp.bpm.processInstance.grid.entity.transientVariables": "流程变量(临时)", + "lcdp.bpm.processInstance.grid.entity.autoCompleteFirstTask": "是否自动完成第一个任务", + + "lcdp.bpm.task.grid.title": "任务列表", + "lcdp.bpm.task.grid.toolbar.complete": "完成", + "lcdp.bpm.task.grid.toolbar.complete.tip": "您确定要完成工作任务吗?", + "lcdp.bpm.task.grid.toolbar.claim": "领取", + "lcdp.bpm.task.grid.toolbar.claim.tip": "您确定要领取工作任务吗?", + "lcdp.bpm.task.grid.toolbar.unclaim": "归还", + "lcdp.bpm.task.grid.toolbar.unclaim.tip": "您确定要归还工作任务吗?", + "lcdp.bpm.task.grid.toolbar.jump": "跳转", + "lcdp.bpm.task.grid.toolbar.terminate": "终止", + "lcdp.bpm.task.grid.toolbar.terminate.tip": "您确定要终止工作任务吗?", + "lcdp.bpm.task.grid.toolbar.variables": "变量", + "lcdp.bpm.task.grid.entity.owner": "所有者", + "lcdp.bpm.task.grid.entity.assignee": "处理人", + "lcdp.bpm.task.grid.entity.createTime": "创建日期", + "lcdp.bpm.task.grid.entity.claimTime": "领取日期", + "lcdp.bpm.task.grid.entity.processInstanceId": "流程实例 ID", + + "lcdp.bpm.variables.grid.title": "变量列表", + "lcdp.bpm.variables.grid.entity.doubleValue":"双精度数值", + "lcdp.bpm.variables.grid.entity.longValue":"长整数值", + "lcdp.bpm.variables.grid.entity.rev":"修订", + "lcdp.bpm.variables.grid.entity.executionId":"执行 ID", + "lcdp.bpm.variables.grid.entity.procInstId":"流程实例 ID", + "lcdp.bpm.variables.grid.entity.taskId":"任务 ID", + "lcdp.bpm.variables.grid.entity.scopeId":"范围 ID", + "lcdp.bpm.variables.grid.entity.subScopeId":"子范围 ID", + "lcdp.bpm.variables.grid.entity.scopeType":"范围类型", + "lcdp.bpm.variables.grid.entity.byteArrayId":"字节数据组 ID", + "lcdp.bpm.variables.grid.entity.text":"文本", + "lcdp.bpm.variables.grid.entity.text2":"文本2", + "lcdp.bpm.jumpTask.dialog.title": "任务跳转", + "lcdp.bpm.jumpTask.form.entity.taskId": "任务ID", + "lcdp.bpm.jumpTask.form.entity.targetActivityId": "目标节点", + "lcdp.bpm.jumpTask.form.entity.targetAssignee": "处理人" } diff --git a/io.sc.platform.lcdp.frontend/src/views/bpm/Bpm.vue b/io.sc.platform.lcdp.frontend/src/views/bpm/Bpm.vue index 3d73e3a2..7ca904f5 100644 --- a/io.sc.platform.lcdp.frontend/src/views/bpm/Bpm.vue +++ b/io.sc.platform.lcdp.frontend/src/views/bpm/Bpm.vue @@ -3,22 +3,22 @@ @@ -259,20 +482,29 @@ + + + diff --git a/io.sc.platform.lcdp.frontend/src/views/bpm/VariableDialog.vue b/io.sc.platform.lcdp.frontend/src/views/bpm/VariableDialog.vue new file mode 100644 index 00000000..8da48142 --- /dev/null +++ b/io.sc.platform.lcdp.frontend/src/views/bpm/VariableDialog.vue @@ -0,0 +1,98 @@ + + + diff --git a/io.sc.platform.mvc.frontend/package.json b/io.sc.platform.mvc.frontend/package.json index 8c56f928..806bd8de 100644 --- a/io.sc.platform.mvc.frontend/package.json +++ b/io.sc.platform.mvc.frontend/package.json @@ -1,6 +1,6 @@ { "name": "io.sc.platform.mvc.frontend", - "version": "8.1.22", + "version": "8.1.23", "description": "", "private": false, "keywords": [ @@ -80,7 +80,7 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "platform-core": "8.1.114", + "platform-core": "8.1.119", "quasar": "2.14.2", "tailwindcss": "3.4.0", "vue": "3.4.3", diff --git a/io.sc.platform.mvc.frontend/webpack.env.serve.cjs b/io.sc.platform.mvc.frontend/webpack.env.serve.cjs index e3f793b4..503ae493 100644 --- a/io.sc.platform.mvc.frontend/webpack.env.serve.cjs +++ b/io.sc.platform.mvc.frontend/webpack.env.serve.cjs @@ -6,6 +6,7 @@ const { merge } = require('webpack-merge'); const common = require('./webpack.config.common.cjs'); // webpack 通用配置 const mf = require('./webpack.config.mf.cjs'); // webpack 模块联邦配置 const { RemoteFrontEndModuleRegister } = require('./util-frontend-register.cjs'); // 远程模块注册器 +const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer'); module.exports = (env)=> merge(common, mf,{ mode: 'development', @@ -32,4 +33,10 @@ module.exports = (env)=> merge(common, mf,{ return middlewares; } }, + plugins:[ + new BundleAnalyzerPlugin({ + analyzerPort: 4000, // 指定端口号 + openAnalyzer: false, + }), + ] }); diff --git a/io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/support/QueryParameter.java b/io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/support/QueryParameter.java index 9c9cbfff..59d0c5c4 100644 --- a/io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/support/QueryParameter.java +++ b/io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/support/QueryParameter.java @@ -23,6 +23,17 @@ public class QueryParameter { protected List criterias =new ArrayList(); //criteria 对象列表(将 json 串转成对象后的列表) protected String exportFilename; //导出文件名 + public Criteria getCriteriaByFieldName(String fieldName){ + if(StringUtils.hasText(fieldName)){ + for(Criteria criteria : criterias){ + if(fieldName.equals(criteria.getFieldName())){ + return criteria; + } + } + } + return null; + } + public Pageable getJpaPageable(){ page =page<0? 0 : page; // 最小设置为 0 if(firstPage==1){ diff --git a/io.sc.platform.security.frontend/package.json b/io.sc.platform.security.frontend/package.json index e59e7871..14e1393c 100644 --- a/io.sc.platform.security.frontend/package.json +++ b/io.sc.platform.security.frontend/package.json @@ -1,6 +1,6 @@ { "name": "io.sc.platform.security.frontend", - "version": "8.1.22", + "version": "8.1.23", "description": "", "private": false, "keywords": [ @@ -99,6 +99,6 @@ "vue-dompurify-html": "5.0.1", "vue-i18n": "9.8.0", "vue-router": "4.2.5", - "platform-core": "8.1.114" + "platform-core": "8.1.119" } } \ No newline at end of file diff --git a/io.sc.platform.system.frontend/package.json b/io.sc.platform.system.frontend/package.json index 1c4ef380..30b574a4 100644 --- a/io.sc.platform.system.frontend/package.json +++ b/io.sc.platform.system.frontend/package.json @@ -1,6 +1,6 @@ { "name": "io.sc.platform.system.frontend", - "version": "8.1.22", + "version": "8.1.23", "description": "", "private": false, "keywords": [ @@ -80,7 +80,7 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "platform-core": "8.1.114", + "platform-core": "8.1.119", "quasar": "2.14.2", "tailwindcss": "3.4.0", "vue": "3.4.3", diff --git a/io.sc.platform.system.frontend/src/views/dictionary/Dictionary.vue b/io.sc.platform.system.frontend/src/views/dictionary/Dictionary.vue index 2e8aafba..945dfb19 100644 --- a/io.sc.platform.system.frontend/src/views/dictionary/Dictionary.vue +++ b/io.sc.platform.system.frontend/src/views/dictionary/Dictionary.vue @@ -8,7 +8,7 @@ :data-url="Environment.apiContextPath('/api/system/dictionary')" :query-form-fields="[{ name: 'code', label: $t('code'), type: 'text' }]" :toolbar-configure="{ noIcon: false }" - :toolbar-actions="['refresh', 'separator', 'add', 'clone','edit', 'remove', 'separator', 'view', 'separator', 'export']" + :toolbar-actions="['refresh', 'separator', 'add', 'clone', 'edit', 'remove', 'separator', 'view', 'separator', 'export']" :columns="[ { width: 200, name: 'code', label: $t('code') }, { width: 200, name: 'value', label: $t('value') }, @@ -27,7 +27,7 @@ fields: [ { name: 'code', label: $t('code'), type: 'text', required: true }, { name: 'value', label: $t('value'), type: 'text', required: true }, - { name: 'order', label: $t('order'), type:'text', required: true }, + { name: 'order', label: $t('order'), type: 'text', required: true }, ], }, }"