From d9d44d1ac547c42cbc94ad50a20032135d8549b9 Mon Sep 17 00:00:00 2001 From: wangshaoping Date: Wed, 20 Nov 2024 18:00:12 +0800 Subject: [PATCH] update --- erm.frontend/package.json | 2 +- gradle.properties | 2 +- .../plugins/rule-engine-dictionary.json | 6 +- .../plugins/rule-engine-function.json | 18 + .../core/i18n/messages.properties | 4 +- .../core/i18n/messages_tw_CN.properties | 4 +- .../core/i18n/messages_zh_CN.properties | 4 +- io.sc.engine.mv.frontend/package.json | 2 +- .../code/impl/support/ParameterResult.java | 10 +- .../impl/support/processor/DecisionTree.java | 9 +- .../rule/core/enums/DictionaryType.java | 9 - .../engine/rule/core/enums/IndicatorType.java | 25 +- .../engine/rule/core/enums/ParameterType.java | 29 +- .../engine/rule/core/enums/ResourceType.java | 5 +- .../rule/core/enums/TestCaseOwnerType.java | 3 +- .../sc/engine/rule/core/enums/ValueType.java | 213 - .../rule/core/po/dictionary/Dictionary.java | 25 +- .../dictionary/UserDefinedJavaClassField.java | 41 +- .../sc/engine/rule/core/po/lib/Indicator.java | 10 +- .../engine/rule/core/po/lib/IndicatorLib.java | 3 +- .../io/sc/engine/rule/core/po/lib/Lib.java | 18 +- .../engine/rule/core/po/model/Parameter.java | 37 +- .../model/parameter/IndicatorParameter.java | 4 +- .../rule/core/po/resource/ModelResource.java | 21 +- .../core/po/resource/ReleasableResource.java | 47 - .../rule/core/po/resource/Resource.java | 20 +- .../core/po/testcase/ScoreCardTestCase.java | 15 - .../rule/core/po/testcase/TestCase.java | 23 +- .../rule/core/util/ExpressionReplacer.java | 6 +- .../engine/rule/core/util/ValueTypeUtil.java | 66 + .../META-INF/platform/plugins/messages.json | 3 +- .../plugins/rule-engine-dictionary.json | 16 + .../rule/core/i18n/dictionary.properties | 3 + .../core/i18n/dictionary_tw_CN.properties | 3 + .../core/i18n/dictionary_zh_CN.properties | 3 + .../sc/engine/rule/core/i18n/enums.properties | 11 +- .../rule/core/i18n/enums_tw_CN.properties | 11 +- .../rule/core/i18n/enums_zh_CN.properties | 11 +- io.sc.engine.rule.frontend/package.json | 2 +- .../src/i18n/messages.json | 329 +- .../src/i18n/messages_tw_CN.json | 325 +- .../src/i18n/messages_zh_CN.json | 326 +- .../src/routes/routes.json | 40 +- .../src/utils/PassOrNotFormater.ts | 25 - .../src/views/authorization/Authorization.vue | 60 +- .../src/views/dictionary/dictionary.vue | 342 +- .../src/views/function/Function.vue | 37 +- .../src/views/lib/ImportDialog.vue | 2 +- .../src/views/lib/IndicatorGrid.vue | 248 +- .../src/views/lib/Lib.vue | 32 +- .../src/views/lib/LibGrid.vue | 90 +- .../src/views/lib/ProcessorGrid.vue | 15 +- .../src/views/lib/TestCase.vue | 155 - .../src/views/lib/TestCaseParameter.vue | 210 - .../lib/UploadIndicatorTemplateDialog.vue | 76 + .../src/views/lib/ValidatorGrid.vue | 25 +- .../src/views/resources/ImportDialog.vue | 2 +- .../views/resources/ImportSampleDialog.vue | 6 +- .../src/views/resources/Resources.vue | 244 +- .../resources/designer/DecisionTreeDialog.vue | 23 +- .../src/views/resources/designer/Designer.vue | 107 +- .../resources/designer/DesignerDialog.vue | 46 +- .../designer/ExecutionFlowDialog.vue | 32 +- .../src/views/resources/designer/Model.vue | 40 +- .../src/views/resources/designer/Option.vue | 37 +- .../views/resources/designer/Parameter.vue | 394 +- .../views/resources/designer/Processor.vue | 12 +- .../resources/designer/TestCaseParameter.vue | 204 - .../src/views/resources/designer/Testcase.vue | 201 - .../views/resources/designer/Validator.vue | 67 +- .../src/views/shared/AutoCompletionManager.ts | 105 +- .../views/shared/BloodRelationshipDialog.vue | 23 + .../src/views/shared/LibManager.ts | 28 + .../src/views/shared/MoveParameterDialog.vue | 11 +- .../shared/ObjectPropertiesMatcherDialog.vue | 2 +- .../src/views/shared/Processor.ts | 4 +- .../views/shared/ResourceDeployStatusTag.vue | 14 - .../views/shared/SelectIndicatorDialog.vue | 97 +- .../src/views/shared/SimulatorDialog.vue | 472 + .../shared/TemplateImportAndExportDialog.vue | 82 + .../shared/TemplateImportAndExportManager.ts | 41 + .../src/views/shared/TestCaseGrid.vue | 246 + .../views/shared/TestcaseParameterGrid.vue | 213 + .../shared/UserDefinedFunctionsManager.ts | 13 +- .../src/views/shared/ValueTypeManager.ts | 260 + .../src/views/shared/enums/EngineEnums.ts | 97 + .../src/views/shared/processors/Arithmetic.ts | 4 +- .../views/shared/processors/ConditionRange.ts | 4 +- .../views/shared/processors/DecisionTable.ts | 16 +- .../shared/processors/DecisionTable2c.ts | 14 +- .../views/shared/processors/DecisionTree.ts | 2 +- .../views/shared/processors/ExecutionFlow.ts | 2 +- .../views/shared/processors/GroovyScript.ts | 4 +- .../views/shared/processors/HttpRequest.ts | 42 +- .../views/shared/processors/MathFormula.ts | 2 +- .../views/shared/processors/NumberRange.ts | 7 +- .../shared/processors/ObjectProperties.ts | 8 +- .../views/shared/processors/OptionValue.ts | 4 +- .../src/views/shared/processors/Pmml.ts | 2 +- .../src/views/shared/processors/Rule.ts | 4 +- .../src/views/shared/processors/ScoreCard.ts | 4 +- .../src/views/shared/processors/SingleRule.ts | 2 +- .../src/views/shared/processors/Sql.ts | 49 +- .../src/views/shared/processors/Ternary.ts | 12 +- .../src/views/shared/processors/WhenThen.ts | 14 +- .../src/views/shared/tags/DeployStatusTag.vue | 43 + .../src/views/shared/tags/TestResultTag.vue | 13 + .../src/views/testcase/Testcase.vue | 322 +- .../src/views/workflow/Workflow.vue | 24 +- .../AutoCompletionWebController.java | 32 + .../ParameterAndValueTypeWebController.java | 31 - .../initializer/UserFunctionInitializer.java | 101 + .../common/service/AutoCompletionService.java | 11 + .../service/DictionaryItemPluginsService.java | 9 + .../service/ParameterAndValueTypeService.java | 14 - .../impl/AutoCompletionServiceImpl.java | 271 + .../DictionaryItemPluginsServiceImpl.java | 48 + .../ParameterAndValueTypeServiceImpl.java | 294 - .../service/support/AutoCompletion.java | 34 + .../common/service/support/Parameter.java | 9 + .../support/ParameterAndValueType.java | 35 - .../common/service/support/Property.java | 9 + .../common/service/support/ValueType.java | 10 - .../controller/DictionaryWebController.java | 35 +- .../converter/DictionaryEntityConverter.java | 64 +- .../UserDefinedJavaClassFieldConverter.java | 6 + .../dictionary/entity/DictionaryEntity.java | 52 +- .../entity/EnumDictionaryEntity.java | 5 +- .../dictionary/entity/EnumItemEntity.java | 4 +- .../entity/FolderDictionaryEntity.java | 12 +- .../entity/JavaClassDictionaryEntity.java | 111 - .../entity/ReleasableDictionaryEntity.java | 81 - .../UserDefinedJavaClassDictionaryEntity.java | 6 +- .../UserDefinedJavaClassFieldEntity.java | 93 +- .../EnumItemAlreadyExistsException.java | 26 + .../EnumItemEntityAlreadyExistsException.java | 26 - .../FolderAlreadyExistsException.java | 26 - .../JavaClassNotExistsException.java | 26 - ...meNotAllowSameWithDictionaryException.java | 23 - .../repository/DictionaryRepository.java | 105 +- .../UserDefinedJavaClassFieldRepository.java | 20 +- .../dictionary/service/DictionaryService.java | 41 +- .../service/impl/DictionaryServiceImpl.java | 319 +- .../service/impl/EnumItemServiceImpl.java | 9 +- .../UserDefinedJavaClassFieldServiceImpl.java | 90 +- ...eleasableDictionaryEntityChangedEvent.java | 12 - .../server/dictionary/vo/DictionaryVo.java | 35 +- .../dictionary/vo/EnumDictionaryVo.java | 2 +- .../rule/server/dictionary/vo/EnumItemVo.java | 4 +- .../dictionary/vo/JavaClassDictionaryVo.java | 23 - .../dictionary/vo/ReleasableDictionaryVo.java | 35 - .../vo/UserDefinedJavaClassDictionaryVo.java | 2 +- .../vo/UserDefinedJavaClassFieldVo.java | 41 +- .../function/entity/FunctionEntity.java | 4 +- .../repository/FunctionRepository.java | 7 +- .../rule/server/function/vo/FunctionVo.java | 4 +- .../handler/DictionaryEntityEventHandler.java | 65 +- .../handler/IndicatorEntityEventHandler.java | 6 +- .../handler/LibEntityEventHandler.java | 38 +- ...finedJavaClassFieldEntityEventHandler.java | 2 +- .../IndicatorProcessorWebController.java | 9 +- .../lib/converter/LibEntityConverter.java | 26 +- .../server/lib/entity/FolderLibEntity.java | 14 +- .../server/lib/entity/IndicatorEntity.java | 19 +- .../server/lib/entity/IndicatorLibEntity.java | 8 +- .../lib/entity/IndicatorProcessorEntity.java | 5 +- .../lib/entity/IndicatorValidatorEntity.java | 5 +- .../rule/server/lib/entity/LibEntity.java | 54 +- .../lib/entity/ReleasableLibEntity.java | 81 - .../lib/repository/IndicatorRepository.java | 4 + .../server/lib/repository/LibRepository.java | 95 +- .../rule/server/lib/service/LibService.java | 7 +- .../impl/IndicatorProcessorServiceImpl.java | 60 +- .../service/impl/IndicatorServiceImpl.java | 93 +- .../impl/IndicatorValidatorServiceImpl.java | 2 + .../lib/service/impl/LibServiceImpl.java | 239 +- .../rule/server/lib/vo/IndicatorLibVo.java | 2 +- .../server/lib/vo/IndicatorProcessorVo.java | 4 +- .../server/lib/vo/IndicatorValidatorVo.java | 4 +- .../rule/server/lib/vo/IndicatorVo.java | 4 +- .../sc/engine/rule/server/lib/vo/LibVo.java | 35 +- .../rule/server/lib/vo/ReleasableLibVo.java | 32 - .../service/impl/MigrationServiceImpl.java | 5 +- .../rule/server/model/entity/ModelEntity.java | 14 +- .../server/model/entity/ParameterEntity.java | 18 +- .../entity/ParameterInOptionItemEntity.java | 6 +- .../entity/ParameterProcessorEntity.java | 5 +- .../entity/ParameterValidatorEntity.java | 5 +- .../exception/SqlNotOnlyQueryException.java | 23 + .../model/service/impl/ModelServiceImpl.java | 248 +- .../ParameterInOptionItemServiceImpl.java | 2 + .../impl/ParameterProcessorServiceImpl.java | 36 +- .../service/impl/ParameterServiceImpl.java | 34 +- .../impl/ParameterValidatorServiceImpl.java | 2 + .../engine/rule/server/model/vo/ModelVo.java | 4 +- .../model/vo/ParameterInOptionItemVo.java | 4 +- .../server/model/vo/ParameterProcessorVo.java | 4 +- .../server/model/vo/ParameterValidatorVo.java | 4 +- .../rule/server/model/vo/ParameterVo.java | 4 +- .../rule/server/plugins/PluginManager.java | 82 +- .../server/plugins/item/DictionaryItem.java | 79 +- .../server/plugins/item/FunctionItem.java | 72 + .../ResourcePermissionWebController.java | 5 +- .../converter/ResourceEntityConverter.java | 34 +- .../resource/entity/FolderResourceEntity.java | 10 +- .../resource/entity/ModelResourceEntity.java | 112 +- .../entity/ReleasableResourceEntity.java | 114 - .../resource/entity/ResourceEntity.java | 100 +- .../repository/ResourceRepository.java | 72 +- .../resource/service/ResourceService.java | 4 +- .../service/impl/ResourceServiceImpl.java | 286 +- .../server/resource/vo/ModelResourceVo.java | 51 +- .../resource/vo/ReleasableResourceVo.java | 91 - .../rule/server/resource/vo/ResourceVo.java | 41 +- .../resource/vo/ScoreCardResourceVo.java | 13 - .../controller/TemplateWebController.java | 48 + .../template/service/TemplateService.java | 17 + .../service/impl/TemplateServiceImpl.java | 128 + .../server/template/support/Template.java | 120 + .../template/support/Template4Indicator.java | 84 + .../template/support/Template4Parameter.java | 97 + .../Template4UserDefinedJavaClassField.java | 74 + .../bean/ModelTestCaseParameterBuilder.java | 22 - .../TestCaseParameterWebController.java | 17 +- .../controller/TestCaseWebController.java | 43 +- .../converter/LibTestCaseEntityConverter.java | 2 - .../ResourceTestCaseEntityConverter.java | 14 +- .../entity/ResourceTestCaseEntity.java | 10 +- .../entity/ScoreCardTestCaseEntity.java | 36 - .../testcase/entity/TestCaseEntity.java | 17 +- .../entity/TestCaseParameterEntity.java | 18 +- .../repository/LibTestCaseRepository.java | 5 +- .../repository/ModelTestCaseRepository.java | 5 +- .../ScoreCardTestCaseRepository.java | 13 - .../testcase/service/TestCaseService.java | 50 +- .../service/impl/TestCaseServiceImpl.java | 272 +- .../testcase/vo/ScoreCardTestCaseVo.java | 13 - .../testcase/vo/TestCaseParameterVo.java | 4 +- .../rule/server/testcase/vo/TestCaseVo.java | 13 +- .../wrapper/TestCaseParameterWrapper.java | 166 +- .../testcase/wrapper/TestCaseWrapper.java | 10 - ...ngineResourceDeployComplementListener.java | 17 +- .../impl/RuleEngineWorkflowServiceImpl.java | 52 +- .../META-INF/platform/plugins/components.json | 3 + .../META-INF/platform/plugins/messages.json | 7 +- .../plugins/rule-engine-function.json | 10 + .../plugins/rule-engine-sample-resource.json | 4 +- ...rm.core.initializer.ApplicationInitializer | 3 +- .../engine/rule/server/i18n/enums.properties | 154 - .../rule/server/i18n/enums_zh_CN.properties | 158 - .../rule/server/i18n/example.properties | 9 - .../rule/server/i18n/example_zh_CN.properties | 9 - .../rule/server/i18n/exception.properties | 10 +- .../server/i18n/exception_zh_CN.properties | 16 +- .../engine/rule/server/i18n/menu.properties | 8 - .../rule/server/i18n/menu_zh_CN.properties | 8 - .../rule/server/i18n/messages.properties | 182 - .../server/i18n/messages_zh_CN.properties | 185 - .../引擎内置示例(数据字典).json | 152 - .../server/sample/引擎内置示例.json | 5793 ----------- .../sample/引擎示例(元数据).json | 8934 +++++++++++++++++ .../sample/引擎示例(特征库).json | 3097 ++++++ .../rule/server/sample/引擎示例.json | 4 +- .../server/sample/用户自定义函数.json | 9 - ...20515__Rule Engine Database Schema DDL.xml | 56 +- io.sc.engine.st.frontend/package.json | 2 +- io.sc.platform.core.frontend/package.json | 2 +- .../src/platform/components-ext/index.ts | 1 + .../components-ext/ui/AuditorEntityManager.ts | 28 + .../src/platform/components-ext/ui/index.ts | 1 + .../components/code-mirror/WCodeMirror.vue | 4 +- .../math/context-menu/ContextMenu.vue | 13 +- .../math/dialog/VariableEditorDialog.vue | 11 +- .../components/math/toolbar/Toolbar.vue | 7 +- .../platform/components/tag/WEnableTag.vue | 5 +- .../src/platform/index.ts | 7 +- .../plugin/manager/ServerExceptionHandler.ts | 17 + .../src/platform/utils/EnumTools.ts | 4 +- .../src/platform/utils/Tools.ts | 79 +- .../UserDefinedFunctionsManager.ts | 25 + .../testcase/code-mirror/code-mirror.vue | 20 +- .../src/views/testcase/math/MathEditor.vue | 2 +- .../template-project/package.json | 4 +- .../UserDefinedFunctionsManager.ts | 25 + .../testcase/code-mirror/code-mirror.vue | 20 +- .../src/views/testcase/math/MathEditor.vue | 2 +- .../core/controller/EnumWebController.java | 4 +- .../core/response/ValidationError.java | 13 +- .../core/response/ValidationErrorBuilder.java | 33 + .../sc/platform/core/util/CollectionUtil.java | 31 + .../io/sc/platform/core/util/PinyinUtil.java | 237 +- .../io/sc/platform/core/util/StringUtil.java | 1 + .../sc/platform/core/util/ValidatorUtil.java | 11 + .../META-INF/platform/plugins/security.json | 4 +- .../io/sc/platform/core/i18n/enums.properties | 2 +- .../platform/core/i18n/enums_tw_CN.properties | 2 +- .../platform/core/i18n/enums_zh_CN.properties | 2 +- .../io/sc/platform/core/i18n/words.properties | 6 +- .../platform/core/i18n/words_tw_CN.properties | 6 +- .../platform/core/i18n/words_zh_CN.properties | 6 +- .../io/sc/platform/core/util/dict.txt | 242 + io.sc.platform.developer.doc/package.json | 2 +- .../package.json | 2 +- .../sc/platform/jdbc/util/SqlValidator.java | 30 + io.sc.platform.lcdp.frontend/package.json | 2 +- .../package.json | 2 +- io.sc.platform.mvc.frontend/package.json | 2 +- .../support/RestCrudController.java | 9 +- .../sc/platform/orm/entity/AuditorEntity.java | 2 +- .../package.json | 2 +- .../WebSecurityAutoConfiguration.java | 31 +- ...tUsernamePasswordAuthenticationFilter.java | 27 +- .../service/SecurityConfigureService.java | 7 + .../impl/SecurityConfigureServiceImpl.java | 50 +- io.sc.platform.system.frontend/package.json | 2 +- io.sc.standard.frontend/package.json | 2 +- io.sc.website/package.json | 2 +- 317 files changed, 19557 insertions(+), 13230 deletions(-) create mode 100644 io.sc.creditreport.core/src/main/resources/META-INF/platform/plugins/rule-engine-function.json delete mode 100644 io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/enums/ValueType.java delete mode 100644 io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/resource/ReleasableResource.java delete mode 100644 io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/testcase/ScoreCardTestCase.java create mode 100644 io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/util/ValueTypeUtil.java create mode 100644 io.sc.engine.rule.core/src/main/resources/META-INF/platform/plugins/rule-engine-dictionary.json create mode 100644 io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/i18n/dictionary.properties create mode 100644 io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/i18n/dictionary_tw_CN.properties create mode 100644 io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/i18n/dictionary_zh_CN.properties delete mode 100644 io.sc.engine.rule.frontend/src/utils/PassOrNotFormater.ts delete mode 100644 io.sc.engine.rule.frontend/src/views/lib/TestCase.vue delete mode 100644 io.sc.engine.rule.frontend/src/views/lib/TestCaseParameter.vue create mode 100644 io.sc.engine.rule.frontend/src/views/lib/UploadIndicatorTemplateDialog.vue delete mode 100644 io.sc.engine.rule.frontend/src/views/resources/designer/TestCaseParameter.vue delete mode 100644 io.sc.engine.rule.frontend/src/views/resources/designer/Testcase.vue create mode 100644 io.sc.engine.rule.frontend/src/views/shared/BloodRelationshipDialog.vue create mode 100644 io.sc.engine.rule.frontend/src/views/shared/LibManager.ts delete mode 100644 io.sc.engine.rule.frontend/src/views/shared/ResourceDeployStatusTag.vue create mode 100644 io.sc.engine.rule.frontend/src/views/shared/SimulatorDialog.vue create mode 100644 io.sc.engine.rule.frontend/src/views/shared/TemplateImportAndExportDialog.vue create mode 100644 io.sc.engine.rule.frontend/src/views/shared/TemplateImportAndExportManager.ts create mode 100644 io.sc.engine.rule.frontend/src/views/shared/TestCaseGrid.vue create mode 100644 io.sc.engine.rule.frontend/src/views/shared/TestcaseParameterGrid.vue create mode 100644 io.sc.engine.rule.frontend/src/views/shared/ValueTypeManager.ts create mode 100644 io.sc.engine.rule.frontend/src/views/shared/enums/EngineEnums.ts create mode 100644 io.sc.engine.rule.frontend/src/views/shared/tags/DeployStatusTag.vue create mode 100644 io.sc.engine.rule.frontend/src/views/shared/tags/TestResultTag.vue create mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/common/controller/AutoCompletionWebController.java delete mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/common/controller/ParameterAndValueTypeWebController.java create mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/common/initializer/UserFunctionInitializer.java create mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/common/service/AutoCompletionService.java create mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/common/service/DictionaryItemPluginsService.java delete mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/common/service/ParameterAndValueTypeService.java create mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/common/service/impl/AutoCompletionServiceImpl.java create mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/common/service/impl/DictionaryItemPluginsServiceImpl.java delete mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/common/service/impl/ParameterAndValueTypeServiceImpl.java create mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/common/service/support/AutoCompletion.java delete mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/common/service/support/ParameterAndValueType.java delete mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/dictionary/entity/JavaClassDictionaryEntity.java delete mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/dictionary/entity/ReleasableDictionaryEntity.java create mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/dictionary/exception/EnumItemAlreadyExistsException.java delete mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/dictionary/exception/EnumItemEntityAlreadyExistsException.java delete mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/dictionary/exception/FolderAlreadyExistsException.java delete mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/dictionary/exception/JavaClassNotExistsException.java delete mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/dictionary/exception/UserDefinedJavaClassFieldCodeOrNameNotAllowSameWithDictionaryException.java delete mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/dictionary/service/support/ReleasableDictionaryEntityChangedEvent.java delete mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/dictionary/vo/JavaClassDictionaryVo.java delete mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/dictionary/vo/ReleasableDictionaryVo.java delete mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/lib/entity/ReleasableLibEntity.java delete mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/lib/vo/ReleasableLibVo.java create mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/model/exception/SqlNotOnlyQueryException.java create mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/plugins/item/FunctionItem.java delete mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/resource/entity/ReleasableResourceEntity.java delete mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/resource/vo/ReleasableResourceVo.java delete mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/resource/vo/ScoreCardResourceVo.java create mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/template/controller/TemplateWebController.java create mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/template/service/TemplateService.java create mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/template/service/impl/TemplateServiceImpl.java create mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/template/support/Template.java create mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/template/support/Template4Indicator.java create mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/template/support/Template4Parameter.java create mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/template/support/Template4UserDefinedJavaClassField.java delete mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/testcase/entity/ScoreCardTestCaseEntity.java delete mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/testcase/repository/ScoreCardTestCaseRepository.java delete mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/testcase/vo/ScoreCardTestCaseVo.java create mode 100644 io.sc.engine.rule.server/src/main/resources/META-INF/platform/plugins/rule-engine-function.json delete mode 100644 io.sc.engine.rule.server/src/main/resources/io/sc/engine/rule/server/i18n/enums.properties delete mode 100644 io.sc.engine.rule.server/src/main/resources/io/sc/engine/rule/server/i18n/enums_zh_CN.properties delete mode 100644 io.sc.engine.rule.server/src/main/resources/io/sc/engine/rule/server/i18n/example.properties delete mode 100644 io.sc.engine.rule.server/src/main/resources/io/sc/engine/rule/server/i18n/example_zh_CN.properties delete mode 100644 io.sc.engine.rule.server/src/main/resources/io/sc/engine/rule/server/i18n/menu.properties delete mode 100644 io.sc.engine.rule.server/src/main/resources/io/sc/engine/rule/server/i18n/menu_zh_CN.properties delete mode 100644 io.sc.engine.rule.server/src/main/resources/io/sc/engine/rule/server/i18n/messages.properties delete mode 100644 io.sc.engine.rule.server/src/main/resources/io/sc/engine/rule/server/i18n/messages_zh_CN.properties delete mode 100644 io.sc.engine.rule.server/src/main/resources/io/sc/engine/rule/server/sample/引擎内置示例(数据字典).json delete mode 100644 io.sc.engine.rule.server/src/main/resources/io/sc/engine/rule/server/sample/引擎内置示例.json create mode 100644 io.sc.engine.rule.server/src/main/resources/io/sc/engine/rule/server/sample/引擎示例(元数据).json create mode 100644 io.sc.engine.rule.server/src/main/resources/io/sc/engine/rule/server/sample/引擎示例(特征库).json delete mode 100644 io.sc.engine.rule.server/src/main/resources/io/sc/engine/rule/server/sample/用户自定义函数.json create mode 100644 io.sc.platform.core.frontend/src/platform/components-ext/ui/AuditorEntityManager.ts create mode 100644 io.sc.platform.core.frontend/src/platform/components-ext/ui/index.ts create mode 100644 io.sc.platform.core.frontend/src/views/testcase/code-mirror/UserDefinedFunctionsManager.ts create mode 100644 io.sc.platform.core.frontend/template-project/src/views/testcase/code-mirror/UserDefinedFunctionsManager.ts create mode 100644 io.sc.platform.core/src/main/java/io/sc/platform/core/response/ValidationErrorBuilder.java create mode 100644 io.sc.platform.core/src/main/resources/io/sc/platform/core/util/dict.txt create mode 100644 io.sc.platform.jdbc/src/main/java/io/sc/platform/jdbc/util/SqlValidator.java diff --git a/erm.frontend/package.json b/erm.frontend/package.json index 7de12da0..a178a8fa 100644 --- a/erm.frontend/package.json +++ b/erm.frontend/package.json @@ -111,7 +111,7 @@ "node-sql-parser": "5.3.2", "pinia": "2.2.2", "pinia-undo": "0.2.4", - "platform-core": "8.1.440", + "platform-core": "8.1.454", "quasar": "2.17.0", "svg-path-commander": "2.0.10", "tailwindcss": "3.4.10", diff --git a/gradle.properties b/gradle.properties index a75ea0a9..601630ea 100644 --- a/gradle.properties +++ b/gradle.properties @@ -38,7 +38,7 @@ application_version=1.0.0 platform_group=io.sc platform_version=8.1.50 platform_plugin_version=8.1.50 -platform_core_frontend_version=8.1.440 +platform_core_frontend_version=8.1.454 ########################################################### # dependencies version diff --git a/io.sc.creditreport.core/src/main/resources/META-INF/platform/plugins/rule-engine-dictionary.json b/io.sc.creditreport.core/src/main/resources/META-INF/platform/plugins/rule-engine-dictionary.json index fa85a478..e1fa5593 100644 --- a/io.sc.creditreport.core/src/main/resources/META-INF/platform/plugins/rule-engine-dictionary.json +++ b/io.sc.creditreport.core/src/main/resources/META-INF/platform/plugins/rule-engine-dictionary.json @@ -1,4 +1,4 @@ [ - "io.sc.creditreport.core.company.Document", - "io.sc.creditreport.core.person.Document" -] \ No newline at end of file + { "type": "JAVA_CLASS", "order": 1000, "id": "io.sc.creditreport.core.company.Document", "parent": "re.dictionary.category.engine", "code": "io.sc.creditreport.core.company.Document", "nameI18nKey": "io.sc.creditreport.core.company.Document", "description": "企业征信报告", "version": 2}, + { "type": "JAVA_CLASS", "order": 2000, "id": "io.sc.creditreport.core.person.Document", "parent": "re.dictionary.category.engine", "code": "io.sc.creditreport.core.person.Document", "nameI18nKey": "io.sc.creditreport.core.person.Document", "description": "企业征信报告", "version": 2} +] diff --git a/io.sc.creditreport.core/src/main/resources/META-INF/platform/plugins/rule-engine-function.json b/io.sc.creditreport.core/src/main/resources/META-INF/platform/plugins/rule-engine-function.json new file mode 100644 index 00000000..0bbc37d4 --- /dev/null +++ b/io.sc.creditreport.core/src/main/resources/META-INF/platform/plugins/rule-engine-function.json @@ -0,0 +1,18 @@ +[ + { + "name" : "parseCompanyCreditReport", + "signature" : "parseCompanyCreditReport(xml)", + "description" : "将 xml 解析成征信报告对象(企业)", + "enable" : true, + "mathXml" : "\n\n parseCompanyCreditReport\n (\n \n xml\n \n )\n\n", + "body" : "def parseCompanyCreditReport(String xml){\n return io.sc.creditreport.core.CreditReportParser.parseCompanyCreditReport(xml);\n}" + }, + { + "name" : "parsePersonCreditReport", + "signature" : "parsePersonCreditReport(xml)", + "description" : "将 xml 解析成征信报告对象(个人)", + "enable" : true, + "mathXml" : "\n\n parsePersonCreditReport\n (\n \n xml\n \n )\n\n", + "body" : "def parsePersonCreditReport(String xml){\n return io.sc.creditreport.core.CreditReportParser.parsePersonCreditReport(xml);\n}" + } +] \ No newline at end of file diff --git a/io.sc.creditreport.core/src/main/resources/io/sc/creditreport/core/i18n/messages.properties b/io.sc.creditreport.core/src/main/resources/io/sc/creditreport/core/i18n/messages.properties index 77c0804c..dacd3c24 100644 --- a/io.sc.creditreport.core/src/main/resources/io/sc/creditreport/core/i18n/messages.properties +++ b/io.sc.creditreport.core/src/main/resources/io/sc/creditreport/core/i18n/messages.properties @@ -1,4 +1,4 @@ -io.sc.creditreport.core.company.Document = \u4F01\u4E1A\u4FE1\u7528\u62A5\u544A\u63A5\u53E3\u67E5\u8BE2 +io.sc.creditreport.core.company.Document = \u4F01\u4E1A\u4FE1\u7528\u62A5\u544A io.sc.creditreport.core.company.EA01 = \u62A5\u544A\u5934\u4FE1\u606F\u5355\u5143 io.sc.creditreport.core.company.EA01A = \u62A5\u544A\u6807\u8BC6\u4FE1\u606F\u6BB5 io.sc.creditreport.core.company.EA01A.ea01ai01 = \u62A5\u544A\u7F16\u53F7 @@ -1180,7 +1180,7 @@ io.sc.creditreport.core.company.eg10b = \u4E8B\u4E1A\u5355\u4F4D\u6536\u5165\u65 io.sc.creditreport.core.company.ega = \u8D22\u52A1\u4FE1\u606F io.sc.creditreport.core.company.eha = \u8BC4\u7EA7\u4FE1\u606F io.sc.creditreport.core.company.eia = \u58F0\u660E\u53CA\u5F02\u8BAE\u6807\u6CE8\u4FE1\u606F -io.sc.creditreport.core.person.Document = \u4E2A\u4EBA\u4FE1\u7528\u62A5\u544A\u63A5\u53E3\u67E5\u8BE2 +io.sc.creditreport.core.person.Document = \u4E2A\u4EBA\u4FE1\u7528\u62A5\u544A io.sc.creditreport.core.person.PA01 = \u62A5\u544A\u5934\u4FE1\u606F\u5355\u5143 io.sc.creditreport.core.person.PA01A = \u62A5\u544A\u6807\u8BC6\u4FE1\u606F\u6BB5 io.sc.creditreport.core.person.PA01A.pa01ai01 = \u62A5\u544A\u7F16\u53F7 diff --git a/io.sc.creditreport.core/src/main/resources/io/sc/creditreport/core/i18n/messages_tw_CN.properties b/io.sc.creditreport.core/src/main/resources/io/sc/creditreport/core/i18n/messages_tw_CN.properties index 77c0804c..dacd3c24 100644 --- a/io.sc.creditreport.core/src/main/resources/io/sc/creditreport/core/i18n/messages_tw_CN.properties +++ b/io.sc.creditreport.core/src/main/resources/io/sc/creditreport/core/i18n/messages_tw_CN.properties @@ -1,4 +1,4 @@ -io.sc.creditreport.core.company.Document = \u4F01\u4E1A\u4FE1\u7528\u62A5\u544A\u63A5\u53E3\u67E5\u8BE2 +io.sc.creditreport.core.company.Document = \u4F01\u4E1A\u4FE1\u7528\u62A5\u544A io.sc.creditreport.core.company.EA01 = \u62A5\u544A\u5934\u4FE1\u606F\u5355\u5143 io.sc.creditreport.core.company.EA01A = \u62A5\u544A\u6807\u8BC6\u4FE1\u606F\u6BB5 io.sc.creditreport.core.company.EA01A.ea01ai01 = \u62A5\u544A\u7F16\u53F7 @@ -1180,7 +1180,7 @@ io.sc.creditreport.core.company.eg10b = \u4E8B\u4E1A\u5355\u4F4D\u6536\u5165\u65 io.sc.creditreport.core.company.ega = \u8D22\u52A1\u4FE1\u606F io.sc.creditreport.core.company.eha = \u8BC4\u7EA7\u4FE1\u606F io.sc.creditreport.core.company.eia = \u58F0\u660E\u53CA\u5F02\u8BAE\u6807\u6CE8\u4FE1\u606F -io.sc.creditreport.core.person.Document = \u4E2A\u4EBA\u4FE1\u7528\u62A5\u544A\u63A5\u53E3\u67E5\u8BE2 +io.sc.creditreport.core.person.Document = \u4E2A\u4EBA\u4FE1\u7528\u62A5\u544A io.sc.creditreport.core.person.PA01 = \u62A5\u544A\u5934\u4FE1\u606F\u5355\u5143 io.sc.creditreport.core.person.PA01A = \u62A5\u544A\u6807\u8BC6\u4FE1\u606F\u6BB5 io.sc.creditreport.core.person.PA01A.pa01ai01 = \u62A5\u544A\u7F16\u53F7 diff --git a/io.sc.creditreport.core/src/main/resources/io/sc/creditreport/core/i18n/messages_zh_CN.properties b/io.sc.creditreport.core/src/main/resources/io/sc/creditreport/core/i18n/messages_zh_CN.properties index 77c0804c..dacd3c24 100644 --- a/io.sc.creditreport.core/src/main/resources/io/sc/creditreport/core/i18n/messages_zh_CN.properties +++ b/io.sc.creditreport.core/src/main/resources/io/sc/creditreport/core/i18n/messages_zh_CN.properties @@ -1,4 +1,4 @@ -io.sc.creditreport.core.company.Document = \u4F01\u4E1A\u4FE1\u7528\u62A5\u544A\u63A5\u53E3\u67E5\u8BE2 +io.sc.creditreport.core.company.Document = \u4F01\u4E1A\u4FE1\u7528\u62A5\u544A io.sc.creditreport.core.company.EA01 = \u62A5\u544A\u5934\u4FE1\u606F\u5355\u5143 io.sc.creditreport.core.company.EA01A = \u62A5\u544A\u6807\u8BC6\u4FE1\u606F\u6BB5 io.sc.creditreport.core.company.EA01A.ea01ai01 = \u62A5\u544A\u7F16\u53F7 @@ -1180,7 +1180,7 @@ io.sc.creditreport.core.company.eg10b = \u4E8B\u4E1A\u5355\u4F4D\u6536\u5165\u65 io.sc.creditreport.core.company.ega = \u8D22\u52A1\u4FE1\u606F io.sc.creditreport.core.company.eha = \u8BC4\u7EA7\u4FE1\u606F io.sc.creditreport.core.company.eia = \u58F0\u660E\u53CA\u5F02\u8BAE\u6807\u6CE8\u4FE1\u606F -io.sc.creditreport.core.person.Document = \u4E2A\u4EBA\u4FE1\u7528\u62A5\u544A\u63A5\u53E3\u67E5\u8BE2 +io.sc.creditreport.core.person.Document = \u4E2A\u4EBA\u4FE1\u7528\u62A5\u544A io.sc.creditreport.core.person.PA01 = \u62A5\u544A\u5934\u4FE1\u606F\u5355\u5143 io.sc.creditreport.core.person.PA01A = \u62A5\u544A\u6807\u8BC6\u4FE1\u606F\u6BB5 io.sc.creditreport.core.person.PA01A.pa01ai01 = \u62A5\u544A\u7F16\u53F7 diff --git a/io.sc.engine.mv.frontend/package.json b/io.sc.engine.mv.frontend/package.json index 104e9b2b..abdfeb84 100644 --- a/io.sc.engine.mv.frontend/package.json +++ b/io.sc.engine.mv.frontend/package.json @@ -111,7 +111,7 @@ "node-sql-parser": "5.3.2", "pinia": "2.2.2", "pinia-undo": "0.2.4", - "platform-core": "8.1.440", + "platform-core": "8.1.454", "quasar": "2.17.0", "svg-path-commander": "2.0.10", "tailwindcss": "3.4.10", diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/impl/support/ParameterResult.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/impl/support/ParameterResult.java index a16de1cf..82c59959 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/impl/support/ParameterResult.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/impl/support/ParameterResult.java @@ -1,15 +1,13 @@ package io.sc.engine.rule.core.code.impl.support; -import java.math.BigDecimal; -import java.math.RoundingMode; - +import com.fasterxml.jackson.core.JsonProcessingException; import io.sc.engine.rule.core.classes.RuleResult; import io.sc.engine.rule.core.classes.SingleRuleResult; import io.sc.engine.rule.core.enums.ParameterType; -import io.sc.engine.rule.core.enums.ValueType; import io.sc.engine.rule.core.util.JacksonObjectMapper; -import com.fasterxml.jackson.core.JsonProcessingException; +import java.math.BigDecimal; +import java.math.RoundingMode; /** * 参数结果 @@ -59,7 +57,7 @@ public class ParameterResult { this.valueScale =valueScale; this.valueRoundingMode =valueRoundingMode; this.value =value; - if(ValueType.Decimal.getJavaType().equals(valueType)) { + if(BigDecimal.class.getName().equals(valueType)) { if(value!=null && !"".equals(value.trim())) { BigDecimal _value =new BigDecimal(value); if(valueScale!=null && valueRoundingMode!=null) { diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/impl/support/processor/DecisionTree.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/impl/support/processor/DecisionTree.java index 905c0dc7..f5e0dfab 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/impl/support/processor/DecisionTree.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/impl/support/processor/DecisionTree.java @@ -5,7 +5,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import io.sc.engine.rule.core.enums.ValueType; import io.sc.engine.rule.core.mxgraph.parser.DecisionTreeParser; import io.sc.engine.rule.core.mxgraph.po.*; import io.sc.engine.rule.core.po.model.Parameter; @@ -153,13 +152,13 @@ public class DecisionTree { */ private static String generateResourceAbstractGroovyCode(Map methodNameCache,Parameter parameter,ResourceAbstractNode expressionNode,String methodName) { StringBuilder sb =new StringBuilder(); - sb.append("\tprivate static ").append(ValueType.getSimpleJavaType(parameter.getValueType())).append(" ").append(methodName).append("(Executor executor,Argument ").append(ExpressionReplacer.ARGUMENT_NAME).append("){//资源").append("\n"); - String code =ExpressionReplacer.groovy(expressionNode.getCode(),ValueType.String.getJavaType()); - String version =ExpressionReplacer.groovy(expressionNode.getVersion(),ValueType.Long.getJavaType()); + sb.append("\tprivate static ").append(parameter.getValueType()).append(" ").append(methodName).append("(Executor executor,Argument ").append(ExpressionReplacer.ARGUMENT_NAME).append("){//资源").append("\n"); + String code =ExpressionReplacer.groovy(expressionNode.getCode(),String.class.getName()); + String version =ExpressionReplacer.groovy(expressionNode.getVersion(),Long.class.getName()); if(version==null || version.trim().isEmpty()) { version ="null"; } - sb.append("\t\t").append("return new ").append(ValueType.getSimpleJavaType(parameter.getValueType())).append("(").append(code).append(",").append(version).append(")").append(";\n"); + sb.append("\t\t").append("return new ").append(parameter.getValueType()).append("(").append(code).append(",").append(version).append(")").append(";\n"); sb.append("\t}").append("\n\n"); return sb.toString(); diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/enums/DictionaryType.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/enums/DictionaryType.java index cc270e61..9077e004 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/enums/DictionaryType.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/enums/DictionaryType.java @@ -8,13 +8,4 @@ public enum DictionaryType { JAVA_CLASS, //Java类 UD_JAVA_CLASS, //自定义Java类 ENUM; //枚举 - - public int getOrder() { - switch(this) { - case FOLDER: - return 0; - default: - return 1; - } - } } diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/enums/IndicatorType.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/enums/IndicatorType.java index 952a4244..945cceea 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/enums/IndicatorType.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/enums/IndicatorType.java @@ -5,5 +5,28 @@ package io.sc.engine.rule.core.enums; */ public enum IndicatorType { INTERFACE, //接口 - INDICATOR //指标 + INDICATOR; //指标 + + public static boolean isInputType(IndicatorType type) { + return IndicatorType.INTERFACE.equals(type); + } + + public static boolean isInputType(String type){ + return IndicatorType.INTERFACE.toString().equals(type); + } + + public static boolean isOutputType(IndicatorType type) { + return IndicatorType.INDICATOR.equals(type); + } + + public static boolean isOutputType(String type) { + return IndicatorType.INDICATOR.toString().equals(type); + } + + public static String[] getNames(){ + return new String[]{ + INTERFACE.toString(), + INDICATOR.toString() + }; + } } diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/enums/ParameterType.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/enums/ParameterType.java index 8f379759..08d29d4f 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/enums/ParameterType.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/enums/ParameterType.java @@ -12,6 +12,31 @@ public enum ParameterType { OUT, //输出 RULE_RESULT, //规则结果值 SINGLE_RULE_RESULT, //单规则结果值 - CONSTANT //常量 - + CONSTANT; //常量 + + public static boolean isInputType(ParameterType type) { + return ParameterType.IN.equals(type) || ParameterType.IN_OPTION.equals(type) || ParameterType.INDICATOR.equals(type); + } + + public static boolean isInputType(String type){ + return ParameterType.IN.toString().equals(type) || ParameterType.IN_OPTION.toString().equals(type) || ParameterType.INDICATOR.toString().equals(type); + } + + public static boolean isOutputType(ParameterType type) { + return ParameterType.INTERMEDIATE.equals(type) || ParameterType.OUT.equals(type); + } + + public static boolean isOutputType(String type) { + return ParameterType.INTERMEDIATE.toString().equals(type) || ParameterType.OUT.toString().equals(type); + } + + public static String[] getNames(){ + return new String[]{ + IN.toString(), + IN_OPTION.toString(), + INDICATOR.toString(), + INTERMEDIATE.toString(), + OUT.toString() + }; + } } diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/enums/ResourceType.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/enums/ResourceType.java index f9e8b977..9eab465c 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/enums/ResourceType.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/enums/ResourceType.java @@ -5,9 +5,8 @@ package io.sc.engine.rule.core.enums; */ public enum ResourceType { FOLDER, //文件夹 - MODEL, //模型 - SCORE_CARD; //评分卡 - + MODEL; //模型 + public int getOrder() { switch(this) { case FOLDER: diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/enums/TestCaseOwnerType.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/enums/TestCaseOwnerType.java index de8da561..aa33d1ff 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/enums/TestCaseOwnerType.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/enums/TestCaseOwnerType.java @@ -6,8 +6,7 @@ package io.sc.engine.rule.core.enums; * */ public enum TestCaseOwnerType { - LIB, //指标库 RESOURCE, //资源 MODEL, //模型 - SCORE_CARD //评分卡 + LIB; //指标库 } diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/enums/ValueType.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/enums/ValueType.java deleted file mode 100644 index dc825358..00000000 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/enums/ValueType.java +++ /dev/null @@ -1,213 +0,0 @@ -package io.sc.engine.rule.core.enums; - -import java.math.BigDecimal; -import java.math.BigInteger; -import java.util.Calendar; -import java.util.Date; -import java.util.List; -import java.util.Map; - -import io.sc.engine.rule.core.classes.ResourceAbstract; -import io.sc.engine.rule.core.classes.RuleResult; -import io.sc.engine.rule.core.classes.SingleRuleResult; -import io.sc.engine.rule.core.util.DateUtil; -import io.sc.engine.rule.core.util.JacksonObjectMapper; - -import com.fasterxml.jackson.core.JsonProcessingException; - -/** - * 值类型 - * @author wangshaoping - * - */ -public enum ValueType { - Boolean, //布尔 - Long, //整数 - Float, //浮点数 - Decimal, //小数 - String, //字符串 - Date, //日期 - List, //列表 - Map, //字典 - RuleResult, //规则结果值 - SingleRuleResult, //单规则结果值 - ResourceAbstract; //资源摘要 - - public static boolean isBase(Object o){ - if(o==null){ - return true; - } - return isBase(o.getClass()); - } - - public static boolean isBase(Class clazz){ - if(clazz.isPrimitive()){ - return true; - } - if( - Byte.class.equals(clazz) - || Short.class.equals(clazz) - || Integer.class.equals(clazz) - || BigInteger.class.equals(clazz) - || Long.class.equals(clazz) - || Float.class.equals(clazz) - || Double.class.equals(clazz) - || BigDecimal.class.equals(clazz) - || String.class.equals(clazz) - || Calendar.class.equals(clazz) - || Date.class.equals(clazz) - ){ - return true; - } - return false; - } - - public static boolean isList(Class clazz){ - return List.class.isAssignableFrom(clazz); - } - - public static boolean isMap(Class clazz){ - return Map.class.isAssignableFrom(clazz); - } - - public String getJavaType() { - switch(this) { - case Boolean: - return "java.lang.Boolean"; - case Long: - return "java.lang.Long"; - case Float: - return "java.lang.Float"; - case Decimal: - return "java.math.BigDecimal"; - case String: - return "java.lang.String"; - case Date: - return "java.util.Date"; - case List: - return "java.util.List"; - case Map: - return "java.util.Map"; - case RuleResult: - return "io.sc.engine.rule.core.classes.RuleResult"; - case SingleRuleResult: - return "io.sc.engine.rule.core.classes.SingleRuleResult"; - case ResourceAbstract: - return "io.sc.engine.rule.core.classes.ResourceAbstract"; - default: - return this.toString(); - } - } - - public String getSimpleJavaType() { - switch(this) { - case Boolean: - return "Boolean"; - case Long: - return "Long"; - case Float: - return "Float"; - case Decimal: - return "BigDecimal"; - case String: - return "String"; - case Date: - return "Date"; - case List: - return "List"; - case Map: - return "Map"; - case RuleResult: - return "RuleResult"; - case SingleRuleResult: - return "SingleRuleResult"; - case ResourceAbstract: - return "ResourceAbstract"; - default: - return this.toString(); - } - } - - public static String getSimpleJavaType(String type) { - if(Boolean.getJavaType().equals(type)) { - return Boolean.getSimpleJavaType(); - }else if(Long.getJavaType().equals(type)) { - return Long.getSimpleJavaType(); - }else if(Float.getJavaType().equals(type)) { - return Float.getSimpleJavaType(); - }else if(Decimal.getJavaType().equals(type)) { - return Decimal.getSimpleJavaType(); - }else if(String.getJavaType().equals(type)) { - return String.getSimpleJavaType(); - }else if(Date.getJavaType().equals(type)) { - return Date.getSimpleJavaType(); - }else if(List.getJavaType().equals(type)) { - return List.getSimpleJavaType(); - }else if(Map.getJavaType().equals(type)) { - return Map.getSimpleJavaType(); - }else if(RuleResult.getJavaType().equals(type)) { - return RuleResult.getSimpleJavaType(); - }else if(SingleRuleResult.getJavaType().equals(type)) { - return SingleRuleResult.getSimpleJavaType(); - }else if(ResourceAbstract.getJavaType().equals(type)) { - return ResourceAbstract.getSimpleJavaType(); - }else { - return type; - } - } - - public static boolean isBaseType(String type) { - if( - Boolean.getJavaType().equals(type) || Boolean.getSimpleJavaType().equals(type) - || Long.getJavaType().equals(type) || Long.getSimpleJavaType().equals(type) - || Float.getJavaType().equals(type) || Float.getSimpleJavaType().equals(type) - || Decimal.getJavaType().equals(type) || Decimal.getSimpleJavaType().equals(type) - || String.getJavaType().equals(type) || String.getSimpleJavaType().equals(type) - || Date.getJavaType().equals(type)|| Date.getSimpleJavaType().equals(type) - || List.getJavaType().equals(type)|| List.getSimpleJavaType().equals(type) - || Map.getJavaType().equals(type)|| Map.getSimpleJavaType().equals(type) - || RuleResult.getJavaType().equals(type)|| RuleResult.getSimpleJavaType().equals(type) - || SingleRuleResult.getJavaType().equals(type)|| SingleRuleResult.getSimpleJavaType().equals(type) - || ResourceAbstract.getJavaType().equals(type)|| ResourceAbstract.getSimpleJavaType().equals(type) - ) { - return true; - } - return false; - } - - public static String generateSampleValue(String type) { - if(Boolean.getJavaType().equals(type)) { - return "true"; - }else if(Long.getJavaType().equals(type)) { - return "1"; - }else if(Float.getJavaType().equals(type)) { - return "1.0"; - }else if(Decimal.getJavaType().equals(type)) { - return "1.0"; - }else if(String.getJavaType().equals(type)) { - return "\"string\""; - }else if(Date.getJavaType().equals(type)) { - return "\"" + DateUtil.formatDate(new Date(), DateUtil.yyyy_MM_dd_HH_mm_ss) + "\""; - }else if(List.getJavaType().equals(type)) { - return "new ArrayList()"; - }else if(Map.getJavaType().equals(type)) { - return "new LinkedHashMap()"; - }else if(RuleResult.getJavaType().equals(type)) { - try { - return JacksonObjectMapper.getDefaultObjectMapper().writeValueAsString(new RuleResult()); - } catch (JsonProcessingException e) { - } - }else if(SingleRuleResult.getJavaType().equals(type)) { - try { - return JacksonObjectMapper.getDefaultObjectMapper().writeValueAsString(new SingleRuleResult()); - } catch (JsonProcessingException e) { - } - }else if(ResourceAbstract.getJavaType().equals(type)) { - try { - return JacksonObjectMapper.getDefaultObjectMapper().writeValueAsString(new ResourceAbstract()); - } catch (JsonProcessingException e) { - } - } - return null; - } -} diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/dictionary/Dictionary.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/dictionary/Dictionary.java index 1ea77040..7273f4a6 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/dictionary/Dictionary.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/dictionary/Dictionary.java @@ -6,6 +6,7 @@ import java.util.List; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; +import io.sc.engine.rule.core.enums.DeployStatus; @JsonIgnoreProperties(ignoreUnknown=true) @JsonTypeInfo(use=JsonTypeInfo.Id.NAME, include=JsonTypeInfo.As.PROPERTY, property="type",defaultImpl=FolderDictionary.class) @@ -19,8 +20,10 @@ public abstract class Dictionary { protected String id; //Id protected String code; //代码 protected String name; //名称 + protected String namec; //名称(字母) protected String description; //描述 - protected Integer order; //排序 + protected Integer version; //版本 + protected DeployStatus status; //状态 private List children =new ArrayList();//孩子集合 public Dictionary() {} @@ -46,17 +49,29 @@ public abstract class Dictionary { public void setName(String name) { this.name = name; } + public String getNamec() { + return namec; + } + public void setNamec(String namec) { + this.namec = namec; + } public String getDescription() { return description; } public void setDescription(String description) { this.description = description; } - public Integer getOrder() { - return order; + public Integer getVersion() { + return version; + } + public void setVersion(Integer version) { + this.version = version; + } + public DeployStatus getStatus() { + return status; } - public void setOrder(Integer order) { - this.order = order; + public void setStatus(DeployStatus status) { + this.status = status; } public List getChildren() { return children; diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/dictionary/UserDefinedJavaClassField.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/dictionary/UserDefinedJavaClassField.java index 26c98394..4364d5cb 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/dictionary/UserDefinedJavaClassField.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/dictionary/UserDefinedJavaClassField.java @@ -1,15 +1,20 @@ package io.sc.engine.rule.core.po.dictionary; +import java.math.RoundingMode; + public class UserDefinedJavaClassField { - protected String id; //Id - protected String code; //代码 - protected String name; //名称 - protected String description; //描述 - protected String valueType; //值类型 - protected Boolean valueTypeIsList; //值是否为列表 - protected String defaultValue; //默认值 - protected String valueCalculation; //值计算逻辑 - protected Integer order; //排序 + protected String id; //Id + protected String code; //代码 + protected String name; //名称 + protected String description; //描述 + protected String valueType; //值类型 + protected Integer valueTypeVersion; //值版本 + protected Integer valueScale; //值精度 + protected RoundingMode valueRoundingMode; //值四舍五入模式 + protected Boolean valueTypeIsList; //值是否为列表 + protected String defaultValue; //默认值 + protected String valueCalculation; //值计算逻辑 + protected Integer order; //排序 public String getId() { return id; @@ -41,6 +46,24 @@ public class UserDefinedJavaClassField { public void setValueType(String valueType) { this.valueType = valueType; } + public Integer getValueTypeVersion() { + return valueTypeVersion; + } + public void setValueTypeVersion(Integer valueTypeVersion) { + this.valueTypeVersion = valueTypeVersion; + } + public Integer getValueScale() { + return valueScale; + } + public void setValueScale(Integer valueScale) { + this.valueScale = valueScale; + } + public RoundingMode getValueRoundingMode() { + return valueRoundingMode; + } + public void setValueRoundingMode(RoundingMode valueRoundingMode) { + this.valueRoundingMode = valueRoundingMode; + } public Boolean getValueTypeIsList() { return valueTypeIsList; } diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/lib/Indicator.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/lib/Indicator.java index 2bcd80bc..3ac0bb2a 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/lib/Indicator.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/lib/Indicator.java @@ -7,7 +7,6 @@ import java.util.List; import io.sc.engine.rule.core.code.impl.support.ResourceWrapper; import io.sc.engine.rule.core.code.impl.support.parameter.ParameterGroovyCodeContributionItem; import io.sc.engine.rule.core.enums.IndicatorType; -import io.sc.engine.rule.core.enums.ValueType; import io.sc.engine.rule.core.po.lib.indicator.IndicatorIndicator; import io.sc.engine.rule.core.po.lib.indicator.InterfaceIndicator; import io.sc.engine.rule.core.po.lib.processor.EmptyIndicatorProcessor; @@ -16,6 +15,7 @@ import io.sc.engine.rule.core.util.CodeReplacer; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; +import io.sc.engine.rule.core.util.ValueTypeUtil; /** * 指标 @@ -47,8 +47,8 @@ public abstract class Indicator implements ParameterGroovyCodeContributionItem{ public String getValueTypeFullName() { String parameterValueType =this.getValueType(); - if(ValueType.isBaseType(parameterValueType)) { - parameterValueType =ValueType.getSimpleJavaType(parameterValueType); + if(ValueTypeUtil.isBase(parameterValueType)) { + return parameterValueType; }else { parameterValueType =parameterValueType + (this.getValueTypeVersion()==null?"":"_V" + this.getValueTypeVersion()); } @@ -98,7 +98,7 @@ public abstract class Indicator implements ParameterGroovyCodeContributionItem{ sb.append("}"); sb.append("//").append(this.getName()); - if(!ValueType.isBaseType(parameterValueType)) { + if(!ValueTypeUtil.isBase(parameterValueType)) { sb.append("\n\t\t\t"); sb.append("if(").append(targetVarName).append(".").append(CodeReplacer.fieldName(parameterCode)).append("!=null){"); sb.append(targetVarName).append(".").append(CodeReplacer.fieldName(parameterCode)).append(".init();}"); @@ -110,7 +110,7 @@ public abstract class Indicator implements ParameterGroovyCodeContributionItem{ public String forConvertArgumentFromJson(ResourceWrapper wrapper,String targetVarName) { StringBuilder sb =new StringBuilder(""); String parameterValueType =getValueTypeFullName(); - if(!ValueType.isBaseType(parameterValueType)) { + if(!ValueTypeUtil.isBase(parameterValueType)) { sb.append("if(").append(targetVarName).append(".").append(CodeReplacer.fieldName(this.getCode())).append("!=null){"); sb.append(targetVarName).append(".").append(CodeReplacer.fieldName(this.getCode())).append(".init();}"); }else { diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/lib/IndicatorLib.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/lib/IndicatorLib.java index f0ec30b0..f65d86d0 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/lib/IndicatorLib.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/lib/IndicatorLib.java @@ -8,7 +8,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("INDICATOR") @JsonIgnoreProperties(ignoreUnknown=true) -public class IndicatorLib extends ReleasableLib { +public class IndicatorLib extends Lib { protected List indicators =new ArrayList(); public List getIndicators() { @@ -18,5 +18,4 @@ public class IndicatorLib extends ReleasableLib { public void setIndicators(List indicators) { this.indicators = indicators; } - } diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/lib/Lib.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/lib/Lib.java index ff8263d4..3617cbf7 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/lib/Lib.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/lib/Lib.java @@ -3,6 +3,7 @@ package io.sc.engine.rule.core.po.lib; import java.util.ArrayList; import java.util.List; +import io.sc.engine.rule.core.enums.DeployStatus; import io.sc.engine.rule.core.po.testcase.LibTestCase; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -20,7 +21,8 @@ public abstract class Lib { protected String code; //代码 protected String name; //名称 protected String description; //描述 - protected Integer order; //排序 + protected Integer version; //版本 + protected DeployStatus status; //状态 private List children =new ArrayList();//孩子集合 protected List testCases =new ArrayList();//测试用例 @@ -53,11 +55,17 @@ public abstract class Lib { public void setDescription(String description) { this.description = description; } - public Integer getOrder() { - return order; + public Integer getVersion() { + return version; } - public void setOrder(Integer order) { - this.order = order; + public void setVersion(Integer version) { + this.version = version; + } + public DeployStatus getStatus() { + return status; + } + public void setStatus(DeployStatus status) { + this.status = status; } public List getChildren() { return children; diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/model/Parameter.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/model/Parameter.java index 6bf313d8..380229b1 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/model/Parameter.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/model/Parameter.java @@ -1,27 +1,18 @@ package io.sc.engine.rule.core.po.model; -import java.math.RoundingMode; -import java.util.ArrayList; -import java.util.List; - +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import io.sc.engine.rule.core.code.impl.support.ResourceWrapper; import io.sc.engine.rule.core.code.impl.support.parameter.ParameterGroovyCodeContributionItem; import io.sc.engine.rule.core.enums.ParameterType; -import io.sc.engine.rule.core.enums.ValueType; -import io.sc.engine.rule.core.po.model.parameter.ConstantParameter; -import io.sc.engine.rule.core.po.model.parameter.InOptionParameter; -import io.sc.engine.rule.core.po.model.parameter.InParameter; -import io.sc.engine.rule.core.po.model.parameter.InSubOutParameter; -import io.sc.engine.rule.core.po.model.parameter.IndicatorParameter; -import io.sc.engine.rule.core.po.model.parameter.IntermediateParameter; -import io.sc.engine.rule.core.po.model.parameter.OutParameter; -import io.sc.engine.rule.core.po.model.parameter.RuleResultParameter; -import io.sc.engine.rule.core.po.model.parameter.SingleRuleResultParameter; +import io.sc.engine.rule.core.po.model.parameter.*; import io.sc.engine.rule.core.util.CodeReplacer; +import io.sc.engine.rule.core.util.ValueTypeUtil; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonSubTypes; -import com.fasterxml.jackson.annotation.JsonTypeInfo; +import java.math.RoundingMode; +import java.util.ArrayList; +import java.util.List; @JsonTypeInfo(use=JsonTypeInfo.Id.NAME, include=JsonTypeInfo.As.PROPERTY, property="type",defaultImpl=InParameter.class) @JsonSubTypes({ @@ -55,13 +46,7 @@ public abstract class Parameter implements ParameterGroovyCodeContributionItem{ public abstract ParameterType getType(); public String getValueTypeFullName() { - String parameterValueType =this.getValueType(); - if(ValueType.isBaseType(parameterValueType)) { - parameterValueType =ValueType.getSimpleJavaType(parameterValueType); - }else { - parameterValueType =parameterValueType + (this.getValueTypeVersion()==null?"":"_V" + this.getValueTypeVersion()); - } - return parameterValueType; + return this.getValueType() + (this.getValueTypeVersion()==null?"":"_V" + this.getValueTypeVersion()); } @Override @@ -107,7 +92,7 @@ public abstract class Parameter implements ParameterGroovyCodeContributionItem{ sb.append("}"); sb.append("//").append(this.getName()); - if(!ValueType.isBaseType(parameterValueType)) { + if(!ValueTypeUtil.isBase(parameterValueType)) { sb.append("\\n\t\t\t"); sb.append("if(").append(targetVarName).append(".").append(CodeReplacer.fieldName(parameterCode)).append("!=null){"); sb.append(targetVarName).append(".").append(CodeReplacer.fieldName(parameterCode)).append(".init();}"); @@ -119,7 +104,7 @@ public abstract class Parameter implements ParameterGroovyCodeContributionItem{ public String forConvertArgumentFromJson(ResourceWrapper wrapper,String targetVarName) { StringBuilder sb =new StringBuilder(""); String parameterValueType =getValueTypeFullName(); - if(!ValueType.isBaseType(parameterValueType)) { + if(!ValueTypeUtil.isBase(parameterValueType)) { sb.append("if(").append(targetVarName).append(".").append(CodeReplacer.fieldName(this.getCode())).append("!=null){"); sb.append(targetVarName).append(".").append(CodeReplacer.fieldName(this.getCode())).append(".init();}"); }else { diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/model/parameter/IndicatorParameter.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/model/parameter/IndicatorParameter.java index 6bb5a848..808e6a13 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/model/parameter/IndicatorParameter.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/model/parameter/IndicatorParameter.java @@ -5,13 +5,13 @@ import io.sc.engine.rule.core.code.impl.support.ResourceWrapper4Resource; import io.sc.engine.rule.core.code.impl.support.lib.LibUtil; import io.sc.engine.rule.core.code.impl.support.parameter.ParameterGroovyCodeContributionItem; import io.sc.engine.rule.core.enums.ParameterType; -import io.sc.engine.rule.core.enums.ValueType; import io.sc.engine.rule.core.po.lib.Indicator; import io.sc.engine.rule.core.po.model.Parameter; import io.sc.engine.rule.core.util.CodeReplacer; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonTypeName; +import io.sc.engine.rule.core.util.ValueTypeUtil; /** * 模型参数(指标) @@ -53,7 +53,7 @@ public class IndicatorParameter extends Parameter implements ParameterGroovyCode sb.append("}"); sb.append("//").append(this.getName()); - if(!ValueType.isBaseType(parameterValueType)) { + if(!ValueTypeUtil.isBase(parameterValueType)) { sb.append("\n\t\t\t"); sb.append("if(").append(targetVarName).append(".").append(CodeReplacer.fieldName(parameterCode)).append("!=null){"); sb.append(targetVarName).append(".").append(CodeReplacer.fieldName(parameterCode)).append(".init();}"); diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/resource/ModelResource.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/resource/ModelResource.java index 83746e7b..303f3808 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/resource/ModelResource.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/resource/ModelResource.java @@ -6,19 +6,34 @@ import io.sc.engine.rule.core.po.model.Model; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonTypeName; +import java.util.Date; + @JsonTypeName("MODEL") @JsonIgnoreProperties(ignoreUnknown=true) -public class ModelResource extends ReleasableResource { +public class ModelResource extends Resource { private Model model; + protected Date effectiveDate; //生效日期 + protected String imports; //imports public Model getModel() { return model; } - public void setModel(Model model) { this.model = model; } - + public Date getEffectiveDate() { + return effectiveDate; + } + public void setEffectiveDate(Date effectiveDate) { + this.effectiveDate = effectiveDate; + } + public String getImports() { + return imports; + } + public void setImports(String imports) { + this.imports = imports; + } + @Override public ResourceType getType() { return ResourceType.MODEL; diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/resource/ReleasableResource.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/resource/ReleasableResource.java deleted file mode 100644 index 6c7023e1..00000000 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/resource/ReleasableResource.java +++ /dev/null @@ -1,47 +0,0 @@ -package io.sc.engine.rule.core.po.resource; - -import java.util.Date; - -import io.sc.engine.rule.core.enums.DeployStatus; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; - -@JsonIgnoreProperties(ignoreUnknown=true) -public abstract class ReleasableResource extends Resource{ - protected DeployStatus status; //状态 - protected Integer version; //版本 - protected Date effectiveDate; //生效日期 - protected String imports; //imports - - public DeployStatus getStatus() { - return status; - } - - public void setStatus(DeployStatus status) { - this.status = status; - } - - public Integer getVersion() { - return version; - } - - public void setVersion(Integer version) { - this.version = version; - } - - public Date getEffectiveDate() { - return effectiveDate; - } - - public void setEffectiveDate(Date effectiveDate) { - this.effectiveDate = effectiveDate; - } - - public String getImports() { - return imports; - } - - public void setImports(String imports) { - this.imports = imports; - } -} diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/resource/Resource.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/resource/Resource.java index ccd96340..62ab2a02 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/resource/Resource.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/resource/Resource.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; +import io.sc.engine.rule.core.enums.DeployStatus; import io.sc.engine.rule.core.enums.ResourceType; import io.sc.engine.rule.core.po.testcase.ResourceTestCase; @@ -21,8 +22,9 @@ public abstract class Resource { protected String code; //代码 protected String name; //名称 protected String description; //描述 - protected Integer order; //排序 - + protected Integer version; //版本 + protected DeployStatus status; //状态 + private List children =new ArrayList();//孩子集合 protected List testCases =new ArrayList();//测试用例 @@ -58,11 +60,17 @@ public abstract class Resource { public void setDescription(String description) { this.description = description; } - public Integer getOrder() { - return order; + public Integer getVersion() { + return version; + } + public void setVersion(Integer version) { + this.version = version; + } + public DeployStatus getStatus() { + return status; } - public void setOrder(Integer order) { - this.order = order; + public void setStatus(DeployStatus status) { + this.status = status; } public List getChildren() { return children; diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/testcase/ScoreCardTestCase.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/testcase/ScoreCardTestCase.java deleted file mode 100644 index b33cbc59..00000000 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/testcase/ScoreCardTestCase.java +++ /dev/null @@ -1,15 +0,0 @@ -package io.sc.engine.rule.core.po.testcase; - -import io.sc.engine.rule.core.enums.TestCaseOwnerType; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonTypeName; - -@JsonTypeName("SCORE_CARD") -@JsonIgnoreProperties(ignoreUnknown=true) -public class ScoreCardTestCase extends ResourceTestCase{ - @Override - public TestCaseOwnerType getType() { - return TestCaseOwnerType.SCORE_CARD; - } -} diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/testcase/TestCase.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/testcase/TestCase.java index 0432e50f..ceffaea5 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/testcase/TestCase.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/testcase/TestCase.java @@ -1,30 +1,27 @@ package io.sc.engine.rule.core.po.testcase; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import io.sc.engine.rule.core.enums.TestCaseOwnerType; -import io.sc.engine.rule.core.enums.TestResult; -import io.sc.engine.rule.core.po.lib.FolderLib; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; +import io.sc.engine.rule.core.enums.TestCaseOwnerType; +import io.sc.engine.rule.core.enums.TestResult; +import io.sc.engine.rule.core.po.lib.FolderLib; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; @JsonIgnoreProperties(ignoreUnknown=true) @JsonTypeInfo(use=JsonTypeInfo.Id.NAME, include=JsonTypeInfo.As.PROPERTY, property="type",defaultImpl=FolderLib.class) @JsonSubTypes({ @JsonSubTypes.Type(value=ModelTestCase.class), - @JsonSubTypes.Type(value=ScoreCardTestCase.class), @JsonSubTypes.Type(value=LibTestCase.class), }) public abstract class TestCase { protected String id; //ID protected String name; //名称 protected String description; //描述 - protected Integer order; //排序 protected Date lastTestDate; //最近执行测试用例日期 protected TestResult testResult; //测试用例执行结果 protected List parameters =new ArrayList(); //测试用例包含的参数 @@ -55,12 +52,6 @@ public abstract class TestCase { public void setDescription(String description) { this.description = description; } - public Integer getOrder() { - return order; - } - public void setOrder(Integer order) { - this.order = order; - } public Date getLastTestDate() { return lastTestDate; } diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/util/ExpressionReplacer.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/util/ExpressionReplacer.java index de4ec73d..b1341407 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/util/ExpressionReplacer.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/util/ExpressionReplacer.java @@ -7,8 +7,6 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import io.sc.engine.rule.core.enums.ValueType; - public class ExpressionReplacer { /** * 转为 groovy 脚本时变量所属参数名 @@ -88,7 +86,7 @@ public class ExpressionReplacer { */ public static String groovy(String expression,String valueType) { if(expression==null) return null; - if(ValueType.String.getJavaType().equals(valueType)) { + if(String.class.getName().equals(valueType)) { //查找占位符模式(`xxx`) Matcher matcher =PLACE_HOLDER_REGEX_PATTERN2.matcher(expression); Map founds =new HashMap(); @@ -133,7 +131,7 @@ public class ExpressionReplacer { founds.put(matcher.group(1),matcher.group(2)); } - if(ValueType.String.getJavaType().equals(valueType)) { + if(String.class.getName().equals(valueType)) { String result =expression; if(founds!=null && founds.size()>0) { for(String placeholder : founds.keySet()) { diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/util/ValueTypeUtil.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/util/ValueTypeUtil.java new file mode 100644 index 00000000..a4d8a30b --- /dev/null +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/util/ValueTypeUtil.java @@ -0,0 +1,66 @@ +package io.sc.engine.rule.core.util; + +import org.springframework.util.StringUtils; + +import java.math.BigDecimal; +import java.math.BigInteger; +import java.util.*; + +public class ValueTypeUtil { + private static final Map> BASE_CLASS_MAP = new HashMap<>(); + + static { + BASE_CLASS_MAP.put(Boolean.class.getName(),Boolean.class); + BASE_CLASS_MAP.put(Byte.class.getName(),Byte.class); + BASE_CLASS_MAP.put(Character.class.getName(),Character.class); + BASE_CLASS_MAP.put(Short.class.getName(),Short.class); + BASE_CLASS_MAP.put(Integer.class.getName(),Integer.class); + BASE_CLASS_MAP.put(Long.class.getName(),Long.class); + BASE_CLASS_MAP.put(Float.class.getName(),Float.class); + BASE_CLASS_MAP.put(Double.class.getName(),Double.class); + BASE_CLASS_MAP.put(BigInteger.class.getName(),BigInteger.class); + BASE_CLASS_MAP.put(BigDecimal.class.getName(),BigDecimal.class); + + BASE_CLASS_MAP.put(String.class.getName(),String.class); + BASE_CLASS_MAP.put(Date.class.getName(),Date.class); + BASE_CLASS_MAP.put(Calendar.class.getName(),Calendar.class); + + } + + public static boolean isBase(Class type){ + return isBase(type.getName()); + } + + public static boolean isBase(String type){ + return BASE_CLASS_MAP.containsKey(type); + } + + public static boolean isList(Class clazz){ + return List.class.isAssignableFrom(clazz); + } + + public static boolean isMap(Class clazz){ + return Map.class.isAssignableFrom(clazz); + } + + public static String generateSampleValue(String type) { + if(Boolean.class.getName().equals(type)) { + return "true"; + }else if(Long.class.getName().equals(type)) { + return "1"; + }else if(Float.class.getName().equals(type)) { + return "1.0"; + }else if(BigDecimal.class.getName().equals(type)) { + return "1.0"; + }else if(String.class.getName().equals(type)) { + return "\"string\""; + }else if(Date.class.getName().equals(type)) { + return "\"" + DateUtil.formatDate(new Date(), DateUtil.yyyy_MM_dd_HH_mm_ss) + "\""; + }else if(List.class.getName().equals(type)) { + return "new ArrayList()"; + }else if(Map.class.getName().equals(type)) { + return "new LinkedHashMap()"; + } + return null; + } +} diff --git a/io.sc.engine.rule.core/src/main/resources/META-INF/platform/plugins/messages.json b/io.sc.engine.rule.core/src/main/resources/META-INF/platform/plugins/messages.json index 49a3c883..c0d32cae 100644 --- a/io.sc.engine.rule.core/src/main/resources/META-INF/platform/plugins/messages.json +++ b/io.sc.engine.rule.core/src/main/resources/META-INF/platform/plugins/messages.json @@ -10,7 +10,8 @@ { "includes":[ - "io/sc/engine/rule/core/i18n/enums" + "io/sc/engine/rule/core/i18n/enums", + "io/sc/engine/rule/core/i18n/dictionary" ], "excludes":[] } diff --git a/io.sc.engine.rule.core/src/main/resources/META-INF/platform/plugins/rule-engine-dictionary.json b/io.sc.engine.rule.core/src/main/resources/META-INF/platform/plugins/rule-engine-dictionary.json new file mode 100644 index 00000000..8ef5cf7a --- /dev/null +++ b/io.sc.engine.rule.core/src/main/resources/META-INF/platform/plugins/rule-engine-dictionary.json @@ -0,0 +1,16 @@ +[ + { "type": "FOLDER", "order": 1000, "id": "re.dictionary.category.base", "parent": null, "code": "re.dictionary.category.base", "nameI18nKey": "re.dictionary.category.base", "description": "基本类型", "version": null}, + { "type": "JAVA_CLASS", "order": 100, "id": "java.lang.Boolean", "parent": "re.dictionary.category.base", "code": "java.lang.Boolean", "nameI18nKey": "java.lang.Boolean", "description": "布尔类型", "version": null}, + { "type": "JAVA_CLASS", "order": 200, "id": "java.lang.Long", "parent": "re.dictionary.category.base", "code": "java.lang.Long", "nameI18nKey": "java.lang.Long", "description": "整数类型", "version": null}, + { "type": "JAVA_CLASS", "order": 300, "id": "java.lang.Float", "parent": "re.dictionary.category.base", "code": "java.lang.Float", "nameI18nKey": "java.lang.Float", "description": "浮点数类型", "version": null}, + { "type": "JAVA_CLASS", "order": 400, "id": "java.math.BigDecimal", "parent": "re.dictionary.category.base", "code": "java.math.BigDecimal", "nameI18nKey": "java.math.BigDecimal", "description": "小数类型", "version": null}, + { "type": "JAVA_CLASS", "order": 500, "id": "java.lang.String", "parent": "re.dictionary.category.base", "code": "java.lang.String", "nameI18nKey": "java.lang.String", "description": "字符串类型", "version": null}, + { "type": "JAVA_CLASS", "order": 600, "id": "java.util.Date", "parent": "re.dictionary.category.base", "code": "java.util.Date", "nameI18nKey": "java.util.Date", "description": "日期类型", "version": null}, + { "type": "JAVA_CLASS", "order": 700, "id": "java.util.List", "parent": "re.dictionary.category.base", "code": "java.util.List", "nameI18nKey": "java.util.List", "description": "列表类型", "version": null}, + { "type": "JAVA_CLASS", "order": 800, "id": "java.util.Map", "parent": "re.dictionary.category.base", "code": "java.util.Map", "nameI18nKey": "java.util.Map", "description": "字典类型", "version": null}, + { "type": "FOLDER", "order": 2000, "id": "re.dictionary.category.engine", "parent": null, "code": "re.dictionary.category.engine", "nameI18nKey": "re.dictionary.category.engine", "description": "引擎内置类型", "version": null}, + { "type": "JAVA_CLASS", "order": 100, "id": "io.sc.engine.rule.core.classes.ResourceAbstract", "parent": "re.dictionary.category.engine", "code": "io.sc.engine.rule.core.classes.ResourceAbstract", "nameI18nKey": "io.sc.engine.rule.core.classes.ResourceAbstract", "description": "资源摘要", "version": null}, + { "type": "JAVA_CLASS", "order": 200, "id": "io.sc.engine.rule.core.classes.RuleResult", "parent": "re.dictionary.category.engine", "code": "io.sc.engine.rule.core.classes.RuleResult", "nameI18nKey": "io.sc.engine.rule.core.classes.RuleResult", "description": "规则集结果", "version": null}, + { "type": "JAVA_CLASS", "order": 300, "id": "io.sc.engine.rule.core.classes.SingleRuleResult", "parent": "re.dictionary.category.engine", "code": "io.sc.engine.rule.core.classes.SingleRuleResult", "nameI18nKey": "io.sc.engine.rule.core.classes.SingleRuleResult", "description": "单规则结果", "version": null}, + { "type": "FOLDER", "order": 3000, "id": "re.dictionary.category.customization", "parent": null, "code": "re.dictionary.category.customization", "nameI18nKey": "re.dictionary.category.customization", "description": "用户自定义类型", "version": null} +] diff --git a/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/i18n/dictionary.properties b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/i18n/dictionary.properties new file mode 100644 index 00000000..8f42acb9 --- /dev/null +++ b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/i18n/dictionary.properties @@ -0,0 +1,3 @@ +re.dictionary.category.base=Base +re.dictionary.category.engine=Engine +re.dictionary.category.customization=User Customization \ No newline at end of file diff --git a/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/i18n/dictionary_tw_CN.properties b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/i18n/dictionary_tw_CN.properties new file mode 100644 index 00000000..9f667b47 --- /dev/null +++ b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/i18n/dictionary_tw_CN.properties @@ -0,0 +1,3 @@ +re.dictionary.category.base=\u57FA\u672C\u985E\u578B +re.dictionary.category.engine=\u5F15\u64CE\u5167\u7F6E\u985E\u578B +re.dictionary.category.customization=\u7528\u6236\u81EA\u5B9A\u7FA9\u985E\u578B \ No newline at end of file diff --git a/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/i18n/dictionary_zh_CN.properties b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/i18n/dictionary_zh_CN.properties new file mode 100644 index 00000000..8d495d2f --- /dev/null +++ b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/i18n/dictionary_zh_CN.properties @@ -0,0 +1,3 @@ +re.dictionary.category.base=\u57FA\u672C\u7C7B\u578B +re.dictionary.category.engine=\u5F15\u64CE\u5185\u7F6E\u7C7B\u578B +re.dictionary.category.customization=\u7528\u6237\u81EA\u5B9A\u4E49\u7C7B\u578B \ No newline at end of file diff --git a/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/i18n/enums.properties b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/i18n/enums.properties index 5d740676..2e0be28d 100644 --- a/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/i18n/enums.properties +++ b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/i18n/enums.properties @@ -92,7 +92,7 @@ io.sc.engine.rule.core.enums.HttpAuthorizationType.BEARER=Bearer Token #================================================ io.sc.engine.rule.core.enums.DictionaryType.FOLDER=Folder io.sc.engine.rule.core.enums.DictionaryType.JAVA_CLASS=Java Class -io.sc.engine.rule.core.enums.DictionaryType.UD_JAVA_CLASS=User Defined Class +io.sc.engine.rule.core.enums.DictionaryType.UD_JAVA_CLASS=Structure io.sc.engine.rule.core.enums.DictionaryType.ENUM=Enumerate #================================================ @@ -133,4 +133,11 @@ io.sc.engine.rule.core.enums.ScoreCardVarType.RESULT=Result #================================================ io.sc.engine.rule.core.enums.TestCaseOwnerType.MODEL=Model io.sc.engine.rule.core.enums.TestCaseOwnerType.SCORE_CARD=Score Card -io.sc.engine.rule.core.enums.TestCaseOwnerType.LIB=Lib \ No newline at end of file +io.sc.engine.rule.core.enums.TestCaseOwnerType.LIB=Lib + +#================================================ +# \u6D4B\u8BD5\u7ED3\u679C\u679A\u4E3E +#================================================ +io.sc.engine.rule.core.enums.TestResult.PASSED=Passed +io.sc.engine.rule.core.enums.TestResult.UN_PASSED=UnPassed +io.sc.engine.rule.core.enums.TestResult.ERROR=Error \ No newline at end of file diff --git a/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/i18n/enums_tw_CN.properties b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/i18n/enums_tw_CN.properties index dff65dc0..837daf7b 100644 --- a/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/i18n/enums_tw_CN.properties +++ b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/i18n/enums_tw_CN.properties @@ -92,7 +92,7 @@ io.sc.engine.rule.core.enums.HttpAuthorizationType.BEARER=Bearer Token #================================================ io.sc.engine.rule.core.enums.DictionaryType.FOLDER=\u6587\u4EF6\u593E io.sc.engine.rule.core.enums.DictionaryType.JAVA_CLASS=Java \u985E -io.sc.engine.rule.core.enums.DictionaryType.UD_JAVA_CLASS=\u81EA\u5B9A\u7FA9\u985E +io.sc.engine.rule.core.enums.DictionaryType.UD_JAVA_CLASS=\u7D50\u69CB\u9AD4 io.sc.engine.rule.core.enums.DictionaryType.ENUM=\u679A\u8209 #================================================ @@ -133,4 +133,11 @@ io.sc.engine.rule.core.enums.ScoreCardVarType.RESULT=\u7D50\u679C\u503C #================================================ io.sc.engine.rule.core.enums.TestCaseOwnerType.MODEL=\u6A21\u578B io.sc.engine.rule.core.enums.TestCaseOwnerType.SCORE_CARD=\u8A55\u5206\u5361 -io.sc.engine.rule.core.enums.TestCaseOwnerType.LIB=\u6307\u6A19\u5EAB \ No newline at end of file +io.sc.engine.rule.core.enums.TestCaseOwnerType.LIB=\u6307\u6A19\u5EAB + +#================================================ +# \u6D4B\u8BD5\u7ED3\u679C\u679A\u4E3E +#================================================ +io.sc.engine.rule.core.enums.TestResult.PASSED=\u901A\u904E +io.sc.engine.rule.core.enums.TestResult.UN_PASSED=\u672A\u901A\u904E +io.sc.engine.rule.core.enums.TestResult.ERROR=\u932F\u8AA4 \ No newline at end of file diff --git a/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/i18n/enums_zh_CN.properties b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/i18n/enums_zh_CN.properties index 6d2844b7..f0aa83ad 100644 --- a/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/i18n/enums_zh_CN.properties +++ b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/i18n/enums_zh_CN.properties @@ -92,7 +92,7 @@ io.sc.engine.rule.core.enums.HttpAuthorizationType.BEARER=Bearer Token #================================================ io.sc.engine.rule.core.enums.DictionaryType.FOLDER=\u6587\u4EF6\u5939 io.sc.engine.rule.core.enums.DictionaryType.JAVA_CLASS=Java \u7C7B -io.sc.engine.rule.core.enums.DictionaryType.UD_JAVA_CLASS=\u81EA\u5B9A\u4E49\u7C7B +io.sc.engine.rule.core.enums.DictionaryType.UD_JAVA_CLASS=\u7ED3\u6784\u4F53 io.sc.engine.rule.core.enums.DictionaryType.ENUM=\u679A\u4E3E #================================================ @@ -133,4 +133,11 @@ io.sc.engine.rule.core.enums.ScoreCardVarType.RESULT=\u7ED3\u679C\u503C #================================================ io.sc.engine.rule.core.enums.TestCaseOwnerType.MODEL=\u6A21\u578B io.sc.engine.rule.core.enums.TestCaseOwnerType.SCORE_CARD=\u8BC4\u5206\u5361 -io.sc.engine.rule.core.enums.TestCaseOwnerType.LIB=\u6307\u6807\u5E93 \ No newline at end of file +io.sc.engine.rule.core.enums.TestCaseOwnerType.LIB=\u6307\u6807\u5E93 + +#================================================ +# \u6D4B\u8BD5\u7ED3\u679C\u679A\u4E3E +#================================================ +io.sc.engine.rule.core.enums.TestResult.PASSED=\u901A\u8FC7 +io.sc.engine.rule.core.enums.TestResult.UN_PASSED=\u672A\u901A\u8FC7 +io.sc.engine.rule.core.enums.TestResult.ERROR=\u51FA\u73B0\u9519\u8BEF \ No newline at end of file diff --git a/io.sc.engine.rule.frontend/package.json b/io.sc.engine.rule.frontend/package.json index 33604cb7..d7db7948 100644 --- a/io.sc.engine.rule.frontend/package.json +++ b/io.sc.engine.rule.frontend/package.json @@ -111,7 +111,7 @@ "node-sql-parser": "5.3.2", "pinia": "2.2.2", "pinia-undo": "0.2.4", - "platform-core": "8.1.440", + "platform-core": "8.1.454", "quasar": "2.17.0", "svg-path-commander": "2.0.10", "tailwindcss": "3.4.10", diff --git a/io.sc.engine.rule.frontend/src/i18n/messages.json b/io.sc.engine.rule.frontend/src/i18n/messages.json index 00aea1e3..959fe155 100644 --- a/io.sc.engine.rule.frontend/src/i18n/messages.json +++ b/io.sc.engine.rule.frontend/src/i18n/messages.json @@ -9,11 +9,10 @@ "menu.engine.rule.testcase": "Test Case Manager", "menu.engine.rule.migration": "Data Back and Migration", - "re.resources.grid.title": "Model", + "re.resources.grid.title": "Resources", "re.resources.grid.toolbar.addTop": "Top Folder", "re.resources.grid.toolbar.addChild": "Child Folder", "re.resources.grid.toolbar.addModel": "Model", - "re.resources.grid.toolbar.addScoreCard": "Score Card", "re.resources.grid.toolbar.deepClone.tip": "Are you sure to deep clone the resource?", "re.resources.grid.toolbar.deepCloneNew": "Deep Clone(new)", "re.resources.grid.toolbar.deepCloneNew.tip": "Are you sure to deep clone the resource as new resource?", @@ -22,6 +21,7 @@ "re.resources.grid.toolbar.deploy.online.tip": "Are you sure to on line the resource?", "re.resources.grid.toolbar.deploy.offline": "Offline", "re.resources.grid.toolbar.deploy.offline.tip": "Are you sure to off line the resource?", + "re.resources.grid.toolbar.viewBloodRelationship": "View Blood Relationship", "re.resources.grid.toolbar.importExample": "Import Example", "re.resources.grid.entity.effectiveDate": "Effective Date", @@ -29,170 +29,129 @@ "re.resources.grid.entity.taskName": "Task Name", "re.resources.grid.entity.taskAssignee": "Task Assignee", + "re.resources.dialog.import.title": "Import Resource", + + "re.resources.dialog.importSample.title": "Import Sample Resource", + "re.resources.dialog.importSample.grid.title": "Sample List", + "re.resources.dialog.importSample.grid.toolbar.import": "Import Sample", + "re.resources.dialog.importSample.grid.toolbar.import.tip": "Are you sure to import the samples?", + "re.resources.dialog.attachment.title": "Attachment Manager", "re.resources.dialog.attachment.grid.title": "Attachment List", "re.resources.dialog.attachment.grid.entity.file": "Please select a file", - "re.resources.designer.dialog.title": "Model Designer - {name} ({status},V{version})", - "re.resources.designer.model.grid.title": "Model Structure", - "re.resources.designer.model.grid.toolbar.addChild": "Add Child Model", - "re.resources.designer.model.grid.toolbar.deepClone.tip": "Are you sure to deep clone the model?", - "re.resources.designer.model.grid.toolbar.generateGroovySourceCode": "Generate Script Code", - "re.resources.designer.model.grid.toolbar.generateGroovySourceCode4TestCase": "Generate Script Code(Test Case)", - "re.resources.designer.model.grid.entity.executeMode": "Execute Mode", - - "re.resources.designer.parameter.tab.title": "Parameter", - "re.resources.designer.testcase.tab.title": "Test Case", - "re.resources.designer.validator.tab.title": "Validator", - "re.resources.designer.processor.tab.title": "Processor", - "re.resources.designer.option.tab.title": "Option", - - "re.resources.designer.parameter.grid.title": "Parameter List", - "re.resources.designer.parameter.grid.toolbar.move": "Move", - "re.resources.designer.parameter.grid.toolbar.add.constant": "Constant", - "re.resources.designer.parameter.grid.toolbar.add.in": "Input", - "re.resources.designer.parameter.grid.toolbar.add.inOption": "Input(Option)", - "re.resources.designer.parameter.grid.toolbar.add.indicator": "Indicator", - "re.resources.designer.parameter.grid.toolbar.add.intermediate": "Intermediate", - "re.resources.designer.parameter.grid.toolbar.add.out": "Output", - "re.resources.designer.parameter.grid.toolbar.add.ruleResult": "Rule Set Output", - "re.resources.designer.parameter.grid.toolbar.add.singleRuleResult": "Single Rule Output", - "re.resources.designer.parameter.grid.toolbar.add.importPmml": "Import PMML", - "re.resources.designer.parameter.grid.toolbar.deepClone.tip": "Are you sure to deep clone the parameter?", - "re.resources.designer.parameter.grid.entity.valueType": "Value Type", - "re.resources.designer.parameter.grid.entity.valueTypeVersion": "Value Type Version", - "re.resources.designer.parameter.grid.entity.valueScale": "Value Scale", - "re.resources.designer.parameter.grid.entity.valueRoundingMode": "Rounding Mode", - "re.resources.designer.parameter.grid.entity.valueTypeIsList": "Is List", - "re.resources.designer.parameter.grid.entity.libCode": "Library", - "re.resources.designer.parameter.grid.entity.libVersion": "Library Version", - "re.resources.designer.parameter.grid.entity.indicatorCode": "Indicator", - - "re.resources.designer.validator.grid.title": "Validator", - "re.resources.designer.validator.grid.entity.content": "Content", - "re.resources.designer.validator.grid.entity.tip": "Error Tip", - - "re.resources.designer.option.grid.title": "Options", - "re.resources.designer.option.grid.entity.inputValue": "Input Value", - "re.resources.designer.option.grid.entity.value": "Value", - "re.resources.designer.option.grid.entity.title": "Title", - - "re.resources.designer.processor.grid.title": "Processor", - "re.resources.designer.processor.grid.entity.content": "Content", - "re.resources.designer.processor.grid.entity.arithmetic": "Arithmetic", - "re.resources.designer.processor.grid.entity.conditionRangeVar": "Condition Range Variable", - "re.resources.designer.processor.grid.entity.conditionRange": "Condition Range", - "re.resources.designer.processor.grid.entity.decisionTable": "Decision Table", - "re.resources.designer.processor.grid.entity.decisionTable2C": "Simple Decision Table", - "re.resources.designer.processor.grid.entity.decisionTree": "Decision Tree", - "re.resources.designer.processor.grid.entity.executionFlow": "Execution Flow", - "re.resources.designer.processor.grid.entity.groovyScript": "Script", - "re.resources.designer.processor.grid.entity.httpMethod": "Http Method", - "re.resources.designer.processor.grid.entity.httpUrl": "URL", - "re.resources.designer.processor.grid.entity.httpAuthType": "Authorization Type", - "re.resources.designer.processor.grid.entity.httpAuthApikey": "API Key", - "re.resources.designer.processor.grid.entity.httpAuthApiValue": "API Value", - "re.resources.designer.processor.grid.entity.httpAuthBasicUsername": "User Name", - "re.resources.designer.processor.grid.entity.httpAuthBasicPassword": "Password", - "re.resources.designer.processor.grid.entity.httpAuthBearerToken": "Bearer Token", - "re.resources.designer.processor.grid.entity.httpRequestBody": "Request Body", - "re.resources.designer.processor.grid.entity.httpResponseBody": "Response Body", - "re.resources.designer.processor.grid.entity.httpResponseMapping": "Response Mapping", - "re.resources.designer.processor.grid.entity.mathFormula": "Math Formula", - "re.resources.designer.processor.grid.entity.numberRangeVar": "Number Range Variable", - "re.resources.designer.processor.grid.entity.numberRange": "Number Range", - "re.resources.designer.processor.grid.entity.objectCondition": "Condition", - "re.resources.designer.processor.grid.entity.objectProperties": "Object Properties", - "re.resources.designer.processor.grid.entity.optionCode": "Option", - "re.resources.designer.processor.grid.entity.pmml": "PMML", - "re.resources.designer.processor.grid.entity.rule": "Rule", - "re.resources.designer.processor.grid.entity.scoreCard": "Score Card", - "re.resources.designer.processor.grid.entity.singleRule": "Single Rule", - "re.resources.designer.processor.grid.entity.sqlDatasourceName": "Datasource Name", - "re.resources.designer.processor.grid.entity.sql": "SQL", - "re.resources.designer.processor.grid.entity.sqlParameterValues": "Parameter Values", - "re.resources.designer.processor.grid.entity.sqlQueryResult": "Query Result", - "re.resources.designer.processor.grid.entity.sqlFieldMapping": "Result Mapping", - "re.resources.designer.processor.grid.entity.ternaryCondition": "Ternary Condition", - "re.resources.designer.processor.grid.entity.ternaryTrue": "Ternary True", - "re.resources.designer.processor.grid.entity.ternaryFalse": "Ternary False", - "re.resources.designer.processor.grid.entity.when": "When Expression", - "re.resources.designer.processor.grid.entity.then": "Then Expression", - "re.resources.designer.processor.grid.entity.isWhenThenShorted": "Shorted", - - "re.resources.designer.processor.decisionTable.toolbar.addCol2Left": "Add Column at Left", - "re.resources.designer.processor.decisionTable.toolbar.addCol2Right": "Add Column at Right", - "re.resources.designer.processor.decisionTable.toolbar.addRow": "Add Row", - "re.resources.designer.processor.decisionTable.toolbar.addConditionRow": "Add Condition Row", - "re.resources.designer.processor.decisionTable.toolbar.addResultRow": "Add Result Row", - "re.resources.designer.processor.decisionTable.toolbar.removeCol": "Remove Column", - "re.resources.designer.processor.decisionTable.toolbar.removeRow": "Remove Row", - "re.resources.designer.processor.decisionTable.action.addConditionRow": "Add Condition Row", - "re.resources.designer.processor.decisionTable.action.addResultRow": "Add Result Row", - - "re.resources.designer.processor.dialog.decisionTree.title": "Decision Tree Designer", - "re.resources.designer.processor.dialog.executionFlow.title": "Execution Flow Designer", - - "re.graph.vertex.start.label": "Start", - "re.graph.vertex.start.title": "Start", - "re.graph.vertex.condition.label": "C", - "re.graph.vertex.condition.title": "Condition", - "re.graph.vertex.condition.entity.condition": "Condition", - "re.graph.vertex.expression.label": "Exp", - "re.graph.vertex.expression.title": "Expression", - "re.graph.vertex.expression.entity.expression": "Expression", - "re.graph.vertex.expression.entity.commands": "Commands", - "re.graph.vertex.resourceAbstract.label": "RA", - "re.graph.vertex.resourceAbstract.title": "Resource", - "re.graph.vertex.resourceAbstract.entity.resourceAbstractId": "Resource", - "re.graph.vertex.commandSet.label": "Commands", - "re.graph.vertex.commandSet.title": "Commands", - "re.graph.vertex.commandSet.entity.commands": "Commands", - "re.graph.vertex.configurableResourceAbstract.label": "RA(I/O)", - "re.graph.vertex.configurableResourceAbstract.title": "Resource with Input/Output Commands", - "re.graph.vertex.configurableResourceAbstract.entity.resourceAbstractId": "Resource", - "re.graph.vertex.configurableResourceAbstract.entity.inputCommands": "Input Commands", - "re.graph.vertex.configurableResourceAbstract.entity.outputCommands": "Output Commands", - "re.graph.vertex.subModelAbstract.label": "SM", - "re.graph.vertex.subModelAbstract.title": "Sub Model", - "re.graph.vertex.subModelAbstract.entity.code": "Sub Model", - - "re.graph.edge.conditionBranch.entity.valueType": "Value Type", - "re.graph.edge.conditionBranch.entity.value": "Value", - "re.graph.edge.conditionBranch.entity.commands": "Commands", - - "re.resources.designer.testCase.grid.title": "Test Cases", - "re.resources.designer.testCase.grid.tools.batchTest": "Batch Test", - "re.resources.designer.testCase.grid.tools.download": "Download Template", - "re.resources.designer.testCase.grid.tools.upload": "Upload Data and Execute", - "re.resources.designer.testCase.grid.entity.testResult": "Result", - "re.resources.designer.testCase.grid.entity.lastTestDate": "Test Date", - "re.resources.designer.testCase.grid.entity.ownerCode": "Code", - "re.resources.designer.testCase.grid.entity.ownerName": "Name", - "re.resources.designer.testCase.grid.entity.ownerVersion": "Version", - "re.resources.designer.testCase.grid.entity.ownerStatus": "Status", - - "re.resources.designer.testCaseParameter.grid.title": "Parameter List", - "re.resources.designer.testCaseParameter.grid.entity.inputValue": "Input Value", - "re.resources.designer.testCaseParameter.grid.entity.expectValue": "Expect Value", - "re.resources.designer.testCaseParameter.grid.entity.resultValue": "Result Value", - "re.resources.designer.testCaseParameter.grid.entity.skipCheck": "Skip Check", - "re.resources.designer.testCaseParameter.grid.entity.testResult": "Result", - - "re.resources.import.dialog.title": "Import Resource", - - "re.resources.importSample.dialog.title": "Import Sample Resource", - "re.resources.importSample.grid.title": "Sample List", - "re.resources.importSample.grid.toolbar.import": "Import Sample", - "re.resources.importSample.grid.toolbar.import.tip": "Are you sure to import the samples?", + "re.resources.dialog.designer.title": "Model Designer - {name} ({status},V{version})", + "re.resources.dialog.designer.tab.parameter.title": "Parameter", + "re.resources.dialog.designer.tab.testcase.title": "Test Case", + "re.resources.dialog.designer.tab.validator.title": "Validator", + "re.resources.dialog.designer.tab.processor.title": "Processor", + "re.resources.dialog.designer.tab.option.title": "Option", + + "re.model.grid.title": "Model Structure", + "re.model.grid.toolbar.addChild": "Add Child Model", + "re.model.grid.toolbar.deepClone.tip": "Are you sure to deep clone the model?", + "re.model.grid.toolbar.generateGroovySourceCode": "Generate Script Code", + "re.model.grid.toolbar.generateGroovySourceCode4TestCase": "Generate Script Code(Test Case)", + "re.model.grid.entity.resource": "Resource", + "re.model.grid.entity.executeMode": "Execute Mode", + + "re.parameter.grid.title": "Parameter List", + "re.parameter.grid.toolbar.move": "Move", + "re.parameter.grid.toolbar.add.constant": "Constant", + "re.parameter.grid.toolbar.add.in": "Input", + "re.parameter.grid.toolbar.add.inOption": "Input(Option)", + "re.parameter.grid.toolbar.add.indicator": "Indicator", + "re.parameter.grid.toolbar.add.intermediate": "Intermediate", + "re.parameter.grid.toolbar.add.out": "Output", + "re.parameter.grid.toolbar.add.ruleResult": "Rule Set Output", + "re.parameter.grid.toolbar.add.singleRuleResult": "Single Rule Output", + "re.parameter.grid.toolbar.add.importPmml": "Import PMML", + "re.parameter.grid.toolbar.deepClone.tip": "Are you sure to deep clone the parameter?", + "re.parameter.grid.entity.model": "Model", + "re.parameter.grid.entity.valueType": "Value Type", + "re.parameter.grid.entity.valueTypeVersion": "Value Type Version", + "re.parameter.grid.entity.valueScale": "Value Scale", + "re.parameter.grid.entity.valueRoundingMode": "Rounding Mode", + "re.parameter.grid.entity.valueTypeIsList": "Is List", + "re.parameter.grid.entity.libCode": "Library", + "re.parameter.grid.entity.libVersion": "Library Version", + "re.parameter.grid.entity.indicatorCode": "Indicator", + "re.parameter.tip.indicatorParameterCanNotEditable": "Indicator parameter can NOT editable!", + + "re.parameter.dialog.moveParameter.title": "Select Target Location of Parameter", + + "re.validator.grid.title": "Validator", + "re.validator.grid.entity.content": "Content", + "re.validator.grid.entity.tip": "Error Tip", + + "re.option.grid.title": "Options", + "re.option.grid.entity.inputValue": "Input Value", + "re.option.grid.entity.value": "Value", + "re.option.grid.entity.title": "Title", + + "re.processor.dialog.decisionTree.title": "Decision Tree Designer", + "re.processor.dialog.executionFlow.title": "Execution Flow Designer", + + "re.processor.grid.title": "Processor", + "re.processor.grid.entity.content": "Content", + "re.processor.grid.entity.arithmetic": "Arithmetic", + "re.processor.grid.entity.conditionRangeVar": "Condition Range Variable", + "re.processor.grid.entity.conditionRange": "Condition Range", + "re.processor.grid.entity.decisionTable": "Decision Table", + "re.processor.grid.entity.decisionTable2C": "Simple Decision Table", + "re.processor.grid.entity.decisionTree": "Decision Tree", + "re.processor.grid.entity.executionFlow": "Execution Flow", + "re.processor.grid.entity.groovyScript": "Script", + "re.processor.grid.entity.httpMethod": "Http Method", + "re.processor.grid.entity.httpUrl": "URL", + "re.processor.grid.entity.httpAuthType": "Authorization Type", + "re.processor.grid.entity.httpAuthApikey": "API Key", + "re.processor.grid.entity.httpAuthApiValue": "API Value", + "re.processor.grid.entity.httpAuthBasicUsername": "User Name", + "re.processor.grid.entity.httpAuthBasicPassword": "Password", + "re.processor.grid.entity.httpAuthBearerToken": "Bearer Token", + "re.processor.grid.entity.httpRequestBody": "Request Body", + "re.processor.grid.entity.httpResponseBody": "Response Body", + "re.processor.grid.entity.httpResponseMapping": "Response Mapping", + "re.processor.grid.entity.mathFormula": "Math Formula", + "re.processor.grid.entity.numberRangeVar": "Number Range Variable", + "re.processor.grid.entity.numberRange": "Number Range", + "re.processor.grid.entity.objectCondition": "Condition", + "re.processor.grid.entity.objectProperties": "Object Properties", + "re.processor.grid.entity.optionCode": "Option", + "re.processor.grid.entity.pmml": "PMML", + "re.processor.grid.entity.rule": "Rule", + "re.processor.grid.entity.scoreCard": "Score Card", + "re.processor.grid.entity.singleRule": "Single Rule", + "re.processor.grid.entity.sqlDatasourceName": "Datasource Name", + "re.processor.grid.entity.sql": "SQL", + "re.processor.grid.entity.sqlParameterValues": "Parameter Values", + "re.processor.grid.entity.sqlQueryResult": "Query Result", + "re.processor.grid.entity.sqlFieldMapping": "Result Mapping", + "re.processor.grid.entity.ternaryCondition": "Ternary Condition", + "re.processor.grid.entity.ternaryTrue": "Ternary True", + "re.processor.grid.entity.ternaryFalse": "Ternary False", + "re.processor.grid.entity.when": "When Expression", + "re.processor.grid.entity.then": "Then Expression", + "re.processor.grid.entity.isWhenThenShorted": "Shorted", + + "re.processor.decisionTable.toolbar.addCol2Left": "Add Column at Left", + "re.processor.decisionTable.toolbar.addCol2Right": "Add Column at Right", + "re.processor.decisionTable.toolbar.addRow": "Add Row", + "re.processor.decisionTable.toolbar.addConditionRow": "Add Condition Row", + "re.processor.decisionTable.toolbar.addResultRow": "Add Result Row", + "re.processor.decisionTable.toolbar.removeCol": "Remove Column", + "re.processor.decisionTable.toolbar.removeRow": "Remove Row", + "re.processor.decisionTable.action.addConditionRow": "Add Condition Row", + "re.processor.decisionTable.action.addResultRow": "Add Result Row", "re.dictionary.grid.title": "Meta Data", "re.dictionary.grid.toolbar.addGroup": "Add New", "re.dictionary.grid.toolbar.addTop": "Top Folder", "re.dictionary.grid.toolbar.addChild": "Child Folder", "re.dictionary.grid.toolbar.addJavaType": "Java Type", - "re.dictionary.grid.toolbar.addUserDefinedJavaClassType": "User Defined Type", - "re.dictionary.grid.toolbar.addEnumType": "Enum Type", + "re.dictionary.grid.toolbar.addUserDefinedJavaClassType": "Structure", + "re.dictionary.grid.toolbar.addEnumType": "Enum", "re.dictionary.grid.toolbar.cloneGroup": "Clone", "re.dictionary.grid.toolbar.deepClone": "Deep Clone", "re.dictionary.grid.toolbar.deepClone.tip": "Are you sure to deep clone the meta data?", @@ -209,7 +168,7 @@ "re.dictionary.field.grid.title": "Field List", "re.dictionary.field.grid.entity.valueType": "Value Type", - "re.dictionary.field.grid.entity.valueTypeIsList": "Is List", + "re.dictionary.field.grid.entity.valueTypeIsList": "List?", "re.dictionary.field.grid.entity.valueCalculation": "Calculation Expression", "re.dictionary.enum.grid.title": "Enum List", @@ -253,6 +212,32 @@ "re.indicator.grid.toolbar.addInterface": "Interface", "re.indicator.grid.toolbar.addIndicator": "Indicator", + "re.testcase.grid.title": "Test Cases", + "re.testcase.grid.tools.batchTest": "Batch Test", + "re.testcase.grid.tools.download": "Download Template", + "re.testcase.grid.tools.upload": "Upload Data and Execute", + "re.testcase.grid.entity.testResult": "Result", + "re.testcase.grid.entity.lastTestDate": "Test Date", + "re.testcase.grid.entity.ownerId": "Owner ID", + "re.testcase.grid.entity.ownerType": "Owner Type", + "re.testcase.grid.entity.ownerCode": "Owner Code", + "re.testcase.grid.entity.ownerName": "Owner Name", + "re.testcase.grid.entity.ownerVersion": "Owner Version", + "re.testcase.grid.entity.ownerStatus": "Owner Status", + "re.testcase.grid.entity.ownerDescription": "Owner Name", + + "re.testCaseParameter.grid.title": "Parameter List", + "re.testCaseParameter.grid.entity.testCaseId": "Test Case ID", + "re.testCaseParameter.grid.entity.inputValue": "Input Value", + "re.testCaseParameter.grid.entity.expectValue": "Expect Value", + "re.testCaseParameter.grid.entity.resultValue": "Result Value", + "re.testCaseParameter.grid.entity.skipCheck": "Skip Check", + "re.testCaseParameter.grid.entity.testResult": "Result", + + "re.templateImportAndExport.action.group": "Batch Creation", + "re.templateImportAndExport.action.downloadTemplate": "Download Template", + "re.templateImportAndExport.action.upload": "Upload and Create in Batch", + "re.migration.import.title": "Import ( From The File Uploaded )", "re.migration.import.subTitle": "", "re.migration.import.action": "Import", @@ -304,5 +289,33 @@ "re.workflow.task.grid.entity.resourceStatus": "Resource Status", "re.workflow.task.grid.entity.attachments": "Attachments", - "re.workflow.historyTask.grid.title": "历史任务列表" + "re.workflow.historyTask.grid.title": "History Tasks", + + "re.graph.vertex.start.label": "Start", + "re.graph.vertex.start.title": "Start", + "re.graph.vertex.condition.label": "C", + "re.graph.vertex.condition.title": "Condition", + "re.graph.vertex.condition.entity.condition": "Condition", + "re.graph.vertex.expression.label": "Exp", + "re.graph.vertex.expression.title": "Expression", + "re.graph.vertex.expression.entity.expression": "Expression", + "re.graph.vertex.expression.entity.commands": "Commands", + "re.graph.vertex.resourceAbstract.label": "RA", + "re.graph.vertex.resourceAbstract.title": "Resource", + "re.graph.vertex.resourceAbstract.entity.resourceAbstractId": "Resource", + "re.graph.vertex.commandSet.label": "Commands", + "re.graph.vertex.commandSet.title": "Commands", + "re.graph.vertex.commandSet.entity.commands": "Commands", + "re.graph.vertex.configurableResourceAbstract.label": "RA(I/O)", + "re.graph.vertex.configurableResourceAbstract.title": "Resource with Input/Output Commands", + "re.graph.vertex.configurableResourceAbstract.entity.resourceAbstractId": "Resource", + "re.graph.vertex.configurableResourceAbstract.entity.inputCommands": "Input Commands", + "re.graph.vertex.configurableResourceAbstract.entity.outputCommands": "Output Commands", + "re.graph.vertex.subModelAbstract.label": "SM", + "re.graph.vertex.subModelAbstract.title": "Sub Model", + "re.graph.vertex.subModelAbstract.entity.code": "Sub Model", + + "re.graph.edge.conditionBranch.entity.valueType": "Value Type", + "re.graph.edge.conditionBranch.entity.value": "Value", + "re.graph.edge.conditionBranch.entity.commands": "Commands" } diff --git a/io.sc.engine.rule.frontend/src/i18n/messages_tw_CN.json b/io.sc.engine.rule.frontend/src/i18n/messages_tw_CN.json index 9d550ffd..1b88751b 100644 --- a/io.sc.engine.rule.frontend/src/i18n/messages_tw_CN.json +++ b/io.sc.engine.rule.frontend/src/i18n/messages_tw_CN.json @@ -13,7 +13,6 @@ "re.resources.grid.toolbar.addTop": "頂級文件夾", "re.resources.grid.toolbar.addChild": "子文件夾", "re.resources.grid.toolbar.addModel": "模型", - "re.resources.grid.toolbar.addScoreCard": "評分卡", "re.resources.grid.toolbar.deepClone.tip": "您確定要深度複製資源嗎?", "re.resources.grid.toolbar.deepCloneNew": "深度複製(新)", "re.resources.grid.toolbar.deepCloneNew.tip": "您確定要深度複製資源成一個新的資源嗎?", @@ -22,6 +21,7 @@ "re.resources.grid.toolbar.deploy.online.tip": "您確定要上線資源嗎?", "re.resources.grid.toolbar.deploy.offline": "下線", "re.resources.grid.toolbar.deploy.offline.tip": "您確定要下線資源嗎?", + "re.resources.grid.toolbar.viewBloodRelationship": "查看血緣關係", "re.resources.grid.toolbar.importExample": "導入示例", "re.resources.grid.entity.effectiveDate": "生效日期", @@ -29,170 +29,129 @@ "re.resources.grid.entity.taskName": "任務名稱", "re.resources.grid.entity.taskAssignee": "處理人", + "re.resources.dialog.import.title": "導入資源", + + "re.resources.dialog.importSample.title": "導入示例資源", + "re.resources.dialog.importSample.grid.title": "示例資源列表", + "re.resources.dialog.importSample.grid.toolbar.import": "導入示例", + "re.resources.dialog.importSample.grid.toolbar.import.tip": "您確定要導入示例資源嗎?", + "re.resources.dialog.attachment.title": "附件管理", "re.resources.dialog.attachment.grid.title": "附件列表", "re.resources.dialog.attachment.grid.entity.file": "請選擇一個文件", - "re.resources.designer.dialog.title": "模型設計 - {name} ({status},V{version})", - "re.resources.designer.model.grid.title": "模型結構", - "re.resources.designer.model.grid.toolbar.addChild": "添加子模型", - "re.resources.designer.model.grid.toolbar.deepClone.tip": "您確定要深度複製模型嗎?", - "re.resources.designer.model.grid.toolbar.generateGroovySourceCode": "生成腳本代碼", - "re.resources.designer.model.grid.toolbar.generateGroovySourceCode4TestCase": "生成腳本代碼(測試用例)", - "re.resources.designer.model.grid.entity.executeMode": "執行模式", - - "re.resources.designer.parameter.tab.title": "參數", - "re.resources.designer.testcase.tab.title": "試算用例", - "re.resources.designer.validator.tab.title": "驗證器", - "re.resources.designer.processor.tab.title": "處理邏輯", - "re.resources.designer.option.tab.title": "選項", - - "re.resources.designer.parameter.grid.title": "參數列表", - "re.resources.designer.parameter.grid.toolbar.move": "移動", - "re.resources.designer.parameter.grid.toolbar.add.constant": "常量", - "re.resources.designer.parameter.grid.toolbar.add.in": "輸入值", - "re.resources.designer.parameter.grid.toolbar.add.inOption": "輸入值(選項)", - "re.resources.designer.parameter.grid.toolbar.add.indicator": "指標", - "re.resources.designer.parameter.grid.toolbar.add.intermediate": "中間值", - "re.resources.designer.parameter.grid.toolbar.add.out": "結果值", - "re.resources.designer.parameter.grid.toolbar.add.ruleResult": "規則集結果值", - "re.resources.designer.parameter.grid.toolbar.add.singleRuleResult": "單規則結果值", - "re.resources.designer.parameter.grid.toolbar.add.importPmml": "導入 PMML", - "re.resources.designer.parameter.grid.toolbar.deepClone.tip": "您確定要深度複製參數嗎?", - "re.resources.designer.parameter.grid.entity.valueType": "值類型", - "re.resources.designer.parameter.grid.entity.valueTypeVersion": "值類型版本", - "re.resources.designer.parameter.grid.entity.valueScale": "值精度", - "re.resources.designer.parameter.grid.entity.valueRoundingMode": "四捨五入模式", - "re.resources.designer.parameter.grid.entity.valueTypeIsList": "是否列表", - "re.resources.designer.parameter.grid.entity.libCode": "指標庫", - "re.resources.designer.parameter.grid.entity.libVersion": "指標庫版本", - "re.resources.designer.parameter.grid.entity.indicatorCode": "指標", - - "re.resources.designer.validator.grid.title": "驗證器", - "re.resources.designer.validator.grid.entity.content": "內容", - "re.resources.designer.validator.grid.entity.tip": "錯誤提示", - - "re.resources.designer.option.grid.title": "選項", - "re.resources.designer.option.grid.entity.inputValue": "輸入值", - "re.resources.designer.option.grid.entity.value": "計算值", - "re.resources.designer.option.grid.entity.title": "顯示文本", - - "re.resources.designer.processor.grid.title": "處理邏輯", - "re.resources.designer.processor.grid.entity.content": "內容", - "re.resources.designer.processor.grid.entity.arithmetic": "算數表達式", - "re.resources.designer.processor.grid.entity.conditionRangeVar": "条件分段", - "re.resources.designer.processor.grid.entity.conditionRange": "條件分段", - "re.resources.designer.processor.grid.entity.decisionTable": "決策表", - "re.resources.designer.processor.grid.entity.decisionTable2C": "簡單決策表", - "re.resources.designer.processor.grid.entity.decisionTree": "決策樹", - "re.resources.designer.processor.grid.entity.executionFlow": "執行流", - "re.resources.designer.processor.grid.entity.groovyScript": "腳本代碼", - "re.resources.designer.processor.grid.entity.httpMethod": "請求方法", - "re.resources.designer.processor.grid.entity.httpUrl": "URL", - "re.resources.designer.processor.grid.entity.httpAuthType": "認證類型", - "re.resources.designer.processor.grid.entity.httpAuthApikey": "API Key", - "re.resources.designer.processor.grid.entity.httpAuthApiValue": "API Value", - "re.resources.designer.processor.grid.entity.httpAuthBasicUsername": "用戶名", - "re.resources.designer.processor.grid.entity.httpAuthBasicPassword": "密碼", - "re.resources.designer.processor.grid.entity.httpAuthBearerToken": "Bearer Token", - "re.resources.designer.processor.grid.entity.httpRequestBody": "請求體", - "re.resources.designer.processor.grid.entity.httpResponseBody": "響應體", - "re.resources.designer.processor.grid.entity.httpResponseMapping": "響應映射", - "re.resources.designer.processor.grid.entity.mathFormula": "數學公式", - "re.resources.designer.processor.grid.entity.numberRangeVar": "數值分段表達式", - "re.resources.designer.processor.grid.entity.numberRange": "數值分段", - "re.resources.designer.processor.grid.entity.objectCondition": "條件", - "re.resources.designer.processor.grid.entity.objectProperties": "對象屬性", - "re.resources.designer.processor.grid.entity.optionCode": "選項", - "re.resources.designer.processor.grid.entity.pmml": "PMML", - "re.resources.designer.processor.grid.entity.rule": "規則", - "re.resources.designer.processor.grid.entity.scoreCard": "評分卡", - "re.resources.designer.processor.grid.entity.singleRule": "單規則", - "re.resources.designer.processor.grid.entity.sqlDatasourceName": "數據源名稱", - "re.resources.designer.processor.grid.entity.sql": "SQL 語句", - "re.resources.designer.processor.grid.entity.sqlParameterValues": "參數值", - "re.resources.designer.processor.grid.entity.sqlQueryResult": "執行結果", - "re.resources.designer.processor.grid.entity.sqlFieldMapping": "結果映射", - "re.resources.designer.processor.grid.entity.ternaryCondition": "條件", - "re.resources.designer.processor.grid.entity.ternaryTrue": "條件滿足時", - "re.resources.designer.processor.grid.entity.ternaryFalse": "條件不滿足時", - "re.resources.designer.processor.grid.entity.when": "When 表達式", - "re.resources.designer.processor.grid.entity.then": "Then 表達式", - "re.resources.designer.processor.grid.entity.isWhenThenShorted": "跳過後續操作", - - "re.resources.designer.processor.decisionTable.toolbar.addCol2Left": "在左邊新增列", - "re.resources.designer.processor.decisionTable.toolbar.addCol2Right": "在右邊新增列", - "re.resources.designer.processor.decisionTable.toolbar.addRow": "新增行", - "re.resources.designer.processor.decisionTable.toolbar.addConditionRow": "新增條件行", - "re.resources.designer.processor.decisionTable.toolbar.addResultRow": "新增結果行", - "re.resources.designer.processor.decisionTable.toolbar.removeCol": "刪除列", - "re.resources.designer.processor.decisionTable.toolbar.removeRow": "刪除行", - "re.resources.designer.processor.decisionTable.action.addConditionRow": "添加條件行", - "re.resources.designer.processor.decisionTable.action.addResultRow": "添加結果行", - - "re.resources.designer.processor.dialog.decisionTree.title": "決策樹設計器", - "re.resources.designer.processor.dialog.executionFlow.title": "執行流設計器", - - "re.graph.vertex.start.label": "開始", - "re.graph.vertex.start.title": "開始", - "re.graph.vertex.condition.label": "條件", - "re.graph.vertex.condition.title": "條件", - "re.graph.vertex.condition.entity.condition": "判斷條件", - "re.graph.vertex.expression.label": "表達式", - "re.graph.vertex.expression.title": "表達式", - "re.graph.vertex.expression.entity.expression": "表達式", - "re.graph.vertex.expression.entity.commands": "附加指令集", - "re.graph.vertex.resourceAbstract.label": "資源", - "re.graph.vertex.resourceAbstract.title": "資源", - "re.graph.vertex.resourceAbstract.entity.resourceAbstractId": "資源", - "re.graph.vertex.commandSet.label": "指令集", - "re.graph.vertex.commandSet.title": "指令集", - "re.graph.vertex.commandSet.entity.commands": "指令集", - "re.graph.vertex.configurableResourceAbstract.label": "資源", - "re.graph.vertex.configurableResourceAbstract.title": "帶輸入輸出指令的資源", - "re.graph.vertex.configurableResourceAbstract.entity.resourceAbstractId": "資源", - "re.graph.vertex.configurableResourceAbstract.entity.inputCommands": "輸入指令集", - "re.graph.vertex.configurableResourceAbstract.entity.outputCommands": "輸出指令集", - "re.graph.vertex.subModelAbstract.label": "子模型", - "re.graph.vertex.subModelAbstract.title": "子模型", - "re.graph.vertex.subModelAbstract.entity.code": "子模型", - - "re.graph.edge.conditionBranch.entity.valueType": "值類型", - "re.graph.edge.conditionBranch.entity.value": "值", - "re.graph.edge.conditionBranch.entity.commands": "附加指令集", - - "re.resources.designer.testCase.grid.title": "試算用例", - "re.resources.designer.testCase.grid.tools.batchTest": "批量試算", - "re.resources.designer.testCase.grid.tools.download": "下載試算模版", - "re.resources.designer.testCase.grid.tools.upload": "上傳用例並試算", - "re.resources.designer.testCase.grid.entity.testResult": "結果", - "re.resources.designer.testCase.grid.entity.lastTestDate": "測試日期", - "re.resources.designer.testCase.grid.entity.ownerCode": "資源代碼", - "re.resources.designer.testCase.grid.entity.ownerName": "資源名稱", - "re.resources.designer.testCase.grid.entity.ownerVersion": "資源版本", - "re.resources.designer.testCase.grid.entity.ownerStatus": "資源狀態", - - "re.resources.designer.testCaseParameter.grid.title": "參數列表", - "re.resources.designer.testCaseParameter.grid.entity.inputValue": "輸入值", - "re.resources.designer.testCaseParameter.grid.entity.expectValue": "期望值", - "re.resources.designer.testCaseParameter.grid.entity.resultValue": "結果值", - "re.resources.designer.testCaseParameter.grid.entity.skipCheck": "跳過檢查", - "re.resources.designer.testCaseParameter.grid.entity.testResult": "結果", - - "re.resources.import.dialog.title": "導入資源", - - "re.resources.importSample.dialog.title": "導入示例資源", - "re.resources.importSample.grid.title": "示例資源列表", - "re.resources.importSample.grid.toolbar.import": "導入示例", - "re.resources.importSample.grid.toolbar.import.tip": "您確定要導入示例資源嗎?", + "re.resources.dialog.designer.title": "模型設計 - {name} ({status},V{version})", + "re.resources.dialog.designer.tab.parameter.title": "參數", + "re.resources.dialog.designer.tab.testcase.title": "試算用例", + "re.resources.dialog.designer.tab.validator.title": "驗證器", + "re.resources.dialog.designer.tab.processor.title": "處理邏輯", + "re.resources.dialog.designer.tab.option.title": "選項", + + "re.model.grid.title": "模型結構", + "re.model.grid.toolbar.addChild": "添加子模型", + "re.model.grid.toolbar.deepClone.tip": "您確定要深度複製模型嗎?", + "re.model.grid.toolbar.generateGroovySourceCode": "生成腳本代碼", + "re.model.grid.toolbar.generateGroovySourceCode4TestCase": "生成腳本代碼(測試用例)", + "re.model.grid.entity.resource": "資源", + "re.model.grid.entity.executeMode": "執行模式", + + "re.parameter.grid.title": "參數列表", + "re.parameter.grid.toolbar.move": "移動", + "re.parameter.grid.toolbar.add.constant": "常量", + "re.parameter.grid.toolbar.add.in": "輸入值", + "re.parameter.grid.toolbar.add.inOption": "輸入值(選項)", + "re.parameter.grid.toolbar.add.indicator": "指標", + "re.parameter.grid.toolbar.add.intermediate": "中間值", + "re.parameter.grid.toolbar.add.out": "結果值", + "re.parameter.grid.toolbar.add.ruleResult": "規則集結果值", + "re.parameter.grid.toolbar.add.singleRuleResult": "單規則結果值", + "re.parameter.grid.toolbar.add.importPmml": "導入 PMML", + "re.parameter.grid.toolbar.deepClone.tip": "您確定要深度複製參數嗎?", + "re.parameter.grid.entity.model": "模型", + "re.parameter.grid.entity.valueType": "值類型", + "re.parameter.grid.entity.valueTypeVersion": "值類型版本", + "re.parameter.grid.entity.valueScale": "值精度", + "re.parameter.grid.entity.valueRoundingMode": "四捨五入模式", + "re.parameter.grid.entity.valueTypeIsList": "列表?", + "re.parameter.grid.entity.libCode": "指標庫", + "re.parameter.grid.entity.libVersion": "指標庫版本", + "re.parameter.grid.entity.indicatorCode": "指標", + "re.parameter.tip.indicatorParameterCanNotEditable": "類型為指標的參數不能進行編輯!", + + "re.parameter.dialog.moveParameter.title": "選擇參數移動的目標位置", + + "re.validator.grid.title": "驗證器", + "re.validator.grid.entity.content": "內容", + "re.validator.grid.entity.tip": "錯誤提示", + + "re.option.grid.title": "選項", + "re.option.grid.entity.inputValue": "輸入值", + "re.option.grid.entity.value": "計算值", + "re.option.grid.entity.title": "顯示文本", + + "re.processor.dialog.decisionTree.title": "決策樹設計器", + "re.processor.dialog.executionFlow.title": "執行流設計器", + + "re.processor.grid.title": "處理邏輯", + "re.processor.grid.entity.content": "內容", + "re.processor.grid.entity.arithmetic": "算數表達式", + "re.processor.grid.entity.conditionRangeVar": "条件分段", + "re.processor.grid.entity.conditionRange": "條件分段", + "re.processor.grid.entity.decisionTable": "決策表", + "re.processor.grid.entity.decisionTable2C": "簡單決策表", + "re.processor.grid.entity.decisionTree": "決策樹", + "re.processor.grid.entity.executionFlow": "執行流", + "re.processor.grid.entity.groovyScript": "腳本代碼", + "re.processor.grid.entity.httpMethod": "請求方法", + "re.processor.grid.entity.httpUrl": "URL", + "re.processor.grid.entity.httpAuthType": "認證類型", + "re.processor.grid.entity.httpAuthApikey": "API Key", + "re.processor.grid.entity.httpAuthApiValue": "API Value", + "re.processor.grid.entity.httpAuthBasicUsername": "用戶名", + "re.processor.grid.entity.httpAuthBasicPassword": "密碼", + "re.processor.grid.entity.httpAuthBearerToken": "Bearer Token", + "re.processor.grid.entity.httpRequestBody": "請求體", + "re.processor.grid.entity.httpResponseBody": "響應體", + "re.processor.grid.entity.httpResponseMapping": "響應映射", + "re.processor.grid.entity.mathFormula": "數學公式", + "re.processor.grid.entity.numberRangeVar": "數值分段表達式", + "re.processor.grid.entity.numberRange": "數值分段", + "re.processor.grid.entity.objectCondition": "條件", + "re.processor.grid.entity.objectProperties": "對象屬性", + "re.processor.grid.entity.optionCode": "選項", + "re.processor.grid.entity.pmml": "PMML", + "re.processor.grid.entity.rule": "規則", + "re.processor.grid.entity.scoreCard": "評分卡", + "re.processor.grid.entity.singleRule": "單規則", + "re.processor.grid.entity.sqlDatasourceName": "數據源名稱", + "re.processor.grid.entity.sql": "SQL 語句", + "re.processor.grid.entity.sqlParameterValues": "參數值", + "re.processor.grid.entity.sqlQueryResult": "執行結果", + "re.processor.grid.entity.sqlFieldMapping": "結果映射", + "re.processor.grid.entity.ternaryCondition": "條件", + "re.processor.grid.entity.ternaryTrue": "條件滿足時", + "re.processor.grid.entity.ternaryFalse": "條件不滿足時", + "re.processor.grid.entity.when": "When 表達式", + "re.processor.grid.entity.then": "Then 表達式", + "re.processor.grid.entity.isWhenThenShorted": "跳過後續操作", + + "re.processor.decisionTable.toolbar.addCol2Left": "在左邊新增列", + "re.processor.decisionTable.toolbar.addCol2Right": "在右邊新增列", + "re.processor.decisionTable.toolbar.addRow": "新增行", + "re.processor.decisionTable.toolbar.addConditionRow": "新增條件行", + "re.processor.decisionTable.toolbar.addResultRow": "新增結果行", + "re.processor.decisionTable.toolbar.removeCol": "刪除列", + "re.processor.decisionTable.toolbar.removeRow": "刪除行", + "re.processor.decisionTable.action.addConditionRow": "添加條件行", + "re.processor.decisionTable.action.addResultRow": "添加結果行", "re.dictionary.grid.title": "元數據", "re.dictionary.grid.toolbar.addGroup": "新增", "re.dictionary.grid.toolbar.addTop": "頂級文件夾", "re.dictionary.grid.toolbar.addChild": "子文件夾", "re.dictionary.grid.toolbar.addJavaType": "Java 類型", - "re.dictionary.grid.toolbar.addUserDefinedJavaClassType": "用戶自定義類型", - "re.dictionary.grid.toolbar.addEnumType": "枚舉類型", + "re.dictionary.grid.toolbar.addUserDefinedJavaClassType": "結構體", + "re.dictionary.grid.toolbar.addEnumType": "枚舉", "re.dictionary.grid.toolbar.cloneGroup": "複製", "re.dictionary.grid.toolbar.deepClone": "深度複製", "re.dictionary.grid.toolbar.deepClone.tip": "您確定要深度複製元數據嗎?", @@ -253,6 +212,32 @@ "re.indicator.grid.toolbar.addInterface": "接口", "re.indicator.grid.toolbar.addIndicator": "指標", + "re.testcase.grid.title": "試算用例", + "re.testcase.grid.tools.batchTest": "批量試算", + "re.testcase.grid.tools.download": "下載試算模版", + "re.testcase.grid.tools.upload": "上傳用例並試算", + "re.testcase.grid.entity.testResult": "結果", + "re.testcase.grid.entity.lastTestDate": "測試日期", + "re.testcase.grid.entity.ownerId": "所有者ID", + "re.testcase.grid.entity.ownerType": "所有者類型", + "re.testcase.grid.entity.ownerCode": "所有者代碼", + "re.testcase.grid.entity.ownerName": "所有者名稱", + "re.testcase.grid.entity.ownerVersion": "所有者版本", + "re.testcase.grid.entity.ownerStatus": "所有者狀態", + "re.testcase.grid.entity.ownerDescription": "所有者名稱", + + "re.testCaseParameter.grid.title": "參數列表", + "re.testCaseParameter.grid.entity.testCaseId": "試算用例ID", + "re.testCaseParameter.grid.entity.inputValue": "輸入值", + "re.testCaseParameter.grid.entity.expectValue": "期望值", + "re.testCaseParameter.grid.entity.resultValue": "結果值", + "re.testCaseParameter.grid.entity.skipCheck": "跳過檢查", + "re.testCaseParameter.grid.entity.testResult": "結果", + + "re.templateImportAndExport.action.group": "批量創建", + "re.templateImportAndExport.action.downloadTemplate": "下載模版", + "re.templateImportAndExport.action.upload": "上傳並創建", + "re.migration.import.title": "導入數據 (通過上傳文件導入)", "re.migration.import.subTitle": "", "re.migration.import.action": "導入數據", @@ -304,5 +289,33 @@ "re.workflow.task.grid.entity.resourceStatus": "資源狀態", "re.workflow.task.grid.entity.attachments": "資源附件", - "re.workflow.historyTask.grid.title": "歷史任務列表" + "re.workflow.historyTask.grid.title": "歷史任務列表", + + "re.graph.vertex.start.label": "開始", + "re.graph.vertex.start.title": "開始", + "re.graph.vertex.condition.label": "條件", + "re.graph.vertex.condition.title": "條件", + "re.graph.vertex.condition.entity.condition": "判斷條件", + "re.graph.vertex.expression.label": "表達式", + "re.graph.vertex.expression.title": "表達式", + "re.graph.vertex.expression.entity.expression": "表達式", + "re.graph.vertex.expression.entity.commands": "附加指令集", + "re.graph.vertex.resourceAbstract.label": "資源", + "re.graph.vertex.resourceAbstract.title": "資源", + "re.graph.vertex.resourceAbstract.entity.resourceAbstractId": "資源", + "re.graph.vertex.commandSet.label": "指令集", + "re.graph.vertex.commandSet.title": "指令集", + "re.graph.vertex.commandSet.entity.commands": "指令集", + "re.graph.vertex.configurableResourceAbstract.label": "資源", + "re.graph.vertex.configurableResourceAbstract.title": "帶輸入輸出指令的資源", + "re.graph.vertex.configurableResourceAbstract.entity.resourceAbstractId": "資源", + "re.graph.vertex.configurableResourceAbstract.entity.inputCommands": "輸入指令集", + "re.graph.vertex.configurableResourceAbstract.entity.outputCommands": "輸出指令集", + "re.graph.vertex.subModelAbstract.label": "子模型", + "re.graph.vertex.subModelAbstract.title": "子模型", + "re.graph.vertex.subModelAbstract.entity.code": "子模型", + + "re.graph.edge.conditionBranch.entity.valueType": "值類型", + "re.graph.edge.conditionBranch.entity.value": "值", + "re.graph.edge.conditionBranch.entity.commands": "附加指令集" } diff --git a/io.sc.engine.rule.frontend/src/i18n/messages_zh_CN.json b/io.sc.engine.rule.frontend/src/i18n/messages_zh_CN.json index ea6cb55a..c4fe2c54 100644 --- a/io.sc.engine.rule.frontend/src/i18n/messages_zh_CN.json +++ b/io.sc.engine.rule.frontend/src/i18n/messages_zh_CN.json @@ -13,7 +13,6 @@ "re.resources.grid.toolbar.addTop": "顶级文件夹", "re.resources.grid.toolbar.addChild": "子文件夹", "re.resources.grid.toolbar.addModel": "模型", - "re.resources.grid.toolbar.addScoreCard": "评分卡", "re.resources.grid.toolbar.deepClone.tip": "您确定要深度复制资源吗?", "re.resources.grid.toolbar.deepCloneNew": "深度复制(新)", "re.resources.grid.toolbar.deepCloneNew.tip": "您确定要深度复制资源成一个新的资源吗?", @@ -22,6 +21,7 @@ "re.resources.grid.toolbar.deploy.online.tip": "您确定要上线资源吗?", "re.resources.grid.toolbar.deploy.offline": "下线", "re.resources.grid.toolbar.deploy.offline.tip": "您确定要下线资源吗?", + "re.resources.grid.toolbar.viewBloodRelationship": "查看血缘关系", "re.resources.grid.toolbar.importExample": "导入示例", "re.resources.grid.entity.effectiveDate": "生效日期", @@ -29,170 +29,128 @@ "re.resources.grid.entity.taskName": "任务名称", "re.resources.grid.entity.taskAssignee": "处理人", + "re.resources.dialog.import.title": "导入资源", + + "re.resources.dialog.importSample.title": "导入示例资源", + "re.resources.dialog.importSample.grid.title": "示例资源列表", + "re.resources.dialog.importSample.grid.toolbar.import": "导入示例", + "re.resources.dialog.importSample.grid.toolbar.import.tip": "您确定要导入示例资源吗?", + "re.resources.dialog.attachment.title": "附件管理", "re.resources.dialog.attachment.grid.title": "附件列表", "re.resources.dialog.attachment.grid.entity.file": "请选择一个文件", - "re.resources.designer.dialog.title": "模型设计 - {name} ({status},V{version})", - "re.resources.designer.model.grid.title": "模型结构", - "re.resources.designer.model.grid.toolbar.addChild": "添加子模型", - "re.resources.designer.model.grid.toolbar.deepClone.tip": "您确定要深度复制模型吗?", - "re.resources.designer.model.grid.toolbar.generateGroovySourceCode": "生成脚本代码", - "re.resources.designer.model.grid.toolbar.generateGroovySourceCode4TestCase": "生成脚本代码(测试用例)", - "re.resources.designer.model.grid.entity.executeMode": "执行模式", - - "re.resources.designer.parameter.tab.title": "参数", - "re.resources.designer.testcase.tab.title": "试算用例", - "re.resources.designer.validator.tab.title": "验证器", - "re.resources.designer.processor.tab.title": "处理逻辑", - "re.resources.designer.option.tab.title": "选项", - - "re.resources.designer.parameter.grid.title": "参数列表", - "re.resources.designer.parameter.grid.toolbar.move": "移动", - "re.resources.designer.parameter.grid.toolbar.add.constant": "常量", - "re.resources.designer.parameter.grid.toolbar.add.in": "输入值", - "re.resources.designer.parameter.grid.toolbar.add.inOption": "输入值(选项)", - "re.resources.designer.parameter.grid.toolbar.add.indicator": "指标", - "re.resources.designer.parameter.grid.toolbar.add.intermediate": "中间值", - "re.resources.designer.parameter.grid.toolbar.add.out": "结果值", - "re.resources.designer.parameter.grid.toolbar.add.ruleResult": "规则集结果值", - "re.resources.designer.parameter.grid.toolbar.add.singleRuleResult": "单规则结果值", - "re.resources.designer.parameter.grid.toolbar.add.importPmml": "导入 PMML", - "re.resources.designer.parameter.grid.toolbar.deepClone.tip": "您确定要深度复制参数吗?", - "re.resources.designer.parameter.grid.entity.valueType": "值类型", - "re.resources.designer.parameter.grid.entity.valueTypeVersion": "值类型版本", - "re.resources.designer.parameter.grid.entity.valueScale": "值精度", - "re.resources.designer.parameter.grid.entity.valueRoundingMode": "四舍五入模式", - "re.resources.designer.parameter.grid.entity.valueTypeIsList": "是否列表", - "re.resources.designer.parameter.grid.entity.libCode": "指标库", - "re.resources.designer.parameter.grid.entity.libVersion": "指标库版本", - "re.resources.designer.parameter.grid.entity.indicatorCode": "指标", - - "re.resources.designer.validator.grid.title": "验证器", - "re.resources.designer.validator.grid.entity.content": "内容", - "re.resources.designer.validator.grid.entity.tip": "错误提示", - - "re.resources.designer.option.grid.title": "选项", - "re.resources.designer.option.grid.entity.inputValue": "输入值", - "re.resources.designer.option.grid.entity.value": "计算值", - "re.resources.designer.option.grid.entity.title": "显示文本", - - "re.resources.designer.processor.grid.title": "处理逻辑", - "re.resources.designer.processor.grid.entity.content": "内容", - "re.resources.designer.processor.grid.entity.arithmetic": "算数表达式", - "re.resources.designer.processor.grid.entity.conditionRangeVar": "条件分段", - "re.resources.designer.processor.grid.entity.conditionRange": "条件分段", - "re.resources.designer.processor.grid.entity.decisionTable": "决策表", - "re.resources.designer.processor.grid.entity.decisionTable2C": "简单决策表", - "re.resources.designer.processor.grid.entity.decisionTree": "决策树", - "re.resources.designer.processor.grid.entity.executionFlow": "执行流", - "re.resources.designer.processor.grid.entity.groovyScript": "脚本代码", - "re.resources.designer.processor.grid.entity.httpMethod": "请求方法", - "re.resources.designer.processor.grid.entity.httpUrl": "URL", - "re.resources.designer.processor.grid.entity.httpAuthType": "认证类型", - "re.resources.designer.processor.grid.entity.httpAuthApikey": "API Key", - "re.resources.designer.processor.grid.entity.httpAuthApiValue": "API Value", - "re.resources.designer.processor.grid.entity.httpAuthBasicUsername": "用户名", - "re.resources.designer.processor.grid.entity.httpAuthBasicPassword": "密码", - "re.resources.designer.processor.grid.entity.httpAuthBearerToken": "Bearer Token", - "re.resources.designer.processor.grid.entity.httpRequestBody": "请求体", - "re.resources.designer.processor.grid.entity.httpResponseBody": "响应体", - "re.resources.designer.processor.grid.entity.httpResponseMapping": "响应映射", - "re.resources.designer.processor.grid.entity.mathFormula": "数学公式", - "re.resources.designer.processor.grid.entity.numberRangeVar": "数值分段表达式", - "re.resources.designer.processor.grid.entity.numberRange": "数值分段", - "re.resources.designer.processor.grid.entity.objectCondition": "条件", - "re.resources.designer.processor.grid.entity.objectProperties": "对象属性", - "re.resources.designer.processor.grid.entity.optionCode": "选项", - "re.resources.designer.processor.grid.entity.pmml": "PMML", - "re.resources.designer.processor.grid.entity.rule": "规则", - "re.resources.designer.processor.grid.entity.scoreCard": "评分卡", - "re.resources.designer.processor.grid.entity.singleRule": "单规则", - "re.resources.designer.processor.grid.entity.sqlDatasourceName": "数据源名称", - "re.resources.designer.processor.grid.entity.sql": "SQL 语句", - "re.resources.designer.processor.grid.entity.sqlParameterValues": "参数值", - "re.resources.designer.processor.grid.entity.sqlQueryResult": "执行结果", - "re.resources.designer.processor.grid.entity.sqlFieldMapping": "结果映射", - "re.resources.designer.processor.grid.entity.ternaryCondition": "条件", - "re.resources.designer.processor.grid.entity.ternaryTrue": "条件满足时", - "re.resources.designer.processor.grid.entity.ternaryFalse": "条件不满足时", - "re.resources.designer.processor.grid.entity.when": "When 表达式", - "re.resources.designer.processor.grid.entity.then": "Then 表达式", - "re.resources.designer.processor.grid.entity.isWhenThenShorted": "跳过后续操作", - - "re.resources.designer.processor.decisionTable.toolbar.addCol2Left": "在左边新增列", - "re.resources.designer.processor.decisionTable.toolbar.addCol2Right": "在右边新增列", - "re.resources.designer.processor.decisionTable.toolbar.addRow": "新增行", - "re.resources.designer.processor.decisionTable.toolbar.addConditionRow": "新增条件行", - "re.resources.designer.processor.decisionTable.toolbar.addResultRow": "新增结果行", - "re.resources.designer.processor.decisionTable.toolbar.removeCol": "删除列", - "re.resources.designer.processor.decisionTable.toolbar.removeRow": "删除行", - "re.resources.designer.processor.decisionTable.action.addConditionRow": "添加条件行", - "re.resources.designer.processor.decisionTable.action.addResultRow": "添加结果行", - - "re.resources.designer.processor.dialog.decisionTree.title": "决策树设计器", - "re.resources.designer.processor.dialog.executionFlow.title": "执行流设计器", - - "re.graph.vertex.start.label": "开始", - "re.graph.vertex.start.title": "开始", - "re.graph.vertex.condition.label": "条件", - "re.graph.vertex.condition.title": "条件", - "re.graph.vertex.condition.entity.condition": "判断条件", - "re.graph.vertex.expression.label": "表达式", - "re.graph.vertex.expression.title": "表达式", - "re.graph.vertex.expression.entity.expression": "表达式", - "re.graph.vertex.expression.entity.commands": "附加指令集", - "re.graph.vertex.resourceAbstract.label": "资源", - "re.graph.vertex.resourceAbstract.title": "资源", - "re.graph.vertex.resourceAbstract.entity.resourceAbstractId": "资源", - "re.graph.vertex.commandSet.label": "指令集", - "re.graph.vertex.commandSet.title": "指令集", - "re.graph.vertex.commandSet.entity.commands": "指令集", - "re.graph.vertex.configurableResourceAbstract.label": "资源", - "re.graph.vertex.configurableResourceAbstract.title": "带输入输出指令的资源", - "re.graph.vertex.configurableResourceAbstract.entity.resourceAbstractId": "资源", - "re.graph.vertex.configurableResourceAbstract.entity.inputCommands": "输入指令集", - "re.graph.vertex.configurableResourceAbstract.entity.outputCommands": "输出指令集", - "re.graph.vertex.subModelAbstract.label": "子模型", - "re.graph.vertex.subModelAbstract.title": "子模型", - "re.graph.vertex.subModelAbstract.entity.code": "子模型", - - "re.graph.edge.conditionBranch.entity.valueType": "值类型", - "re.graph.edge.conditionBranch.entity.value": "值", - "re.graph.edge.conditionBranch.entity.commands": "附加指令集", - - "re.resources.designer.testCase.grid.title": "试算用例", - "re.resources.designer.testCase.grid.tools.batchTest": "批量试算", - "re.resources.designer.testCase.grid.tools.download": "下载试算模版", - "re.resources.designer.testCase.grid.tools.upload": "上传用例并试算", - "re.resources.designer.testCase.grid.entity.testResult": "结果", - "re.resources.designer.testCase.grid.entity.lastTestDate": "测试日期", - "re.resources.designer.testCase.grid.entity.ownerCode": "资源代码", - "re.resources.designer.testCase.grid.entity.ownerName": "资源名称", - "re.resources.designer.testCase.grid.entity.ownerVersion": "资源版本", - "re.resources.designer.testCase.grid.entity.ownerStatus": "资源状态", - - "re.resources.designer.testCaseParameter.grid.title": "参数列表", - "re.resources.designer.testCaseParameter.grid.entity.inputValue": "输入值", - "re.resources.designer.testCaseParameter.grid.entity.expectValue": "期望值", - "re.resources.designer.testCaseParameter.grid.entity.resultValue": "结果值", - "re.resources.designer.testCaseParameter.grid.entity.skipCheck": "跳过检查", - "re.resources.designer.testCaseParameter.grid.entity.testResult": "结果", - - "re.resources.import.dialog.title": "导入资源", - - "re.resources.importSample.dialog.title": "导入示例资源", - "re.resources.importSample.grid.title": "示例资源列表", - "re.resources.importSample.grid.toolbar.import": "导入示例", - "re.resources.importSample.grid.toolbar.import.tip": "您确定要导入示例资源吗?", + "re.resources.dialog.designer.title": "模型设计 - {name} ({status},V{version})", + "re.resources.dialog.designer.tab.parameter.title": "参数", + "re.resources.dialog.designer.tab.testcase.title": "试算用例", + "re.resources.dialog.designer.tab.validator.title": "验证器", + "re.resources.dialog.designer.tab.processor.title": "处理逻辑", + "re.resources.dialog.designer.tab.option.title": "选项", + + "re.model.grid.title": "模型结构", + "re.model.grid.toolbar.addChild": "添加子模型", + "re.model.grid.toolbar.deepClone.tip": "您确定要深度复制模型吗?", + "re.model.grid.toolbar.generateGroovySourceCode": "生成脚本代码", + "re.model.grid.toolbar.generateGroovySourceCode4TestCase": "生成脚本代码(测试用例)", + "re.model.grid.entity.resource": "资源", + "re.model.grid.entity.executeMode": "执行模式", + + "re.parameter.grid.title": "参数列表", + "re.parameter.grid.toolbar.move": "移动", + "re.parameter.grid.toolbar.add.constant": "常量", + "re.parameter.grid.toolbar.add.in": "输入值", + "re.parameter.grid.toolbar.add.inOption": "输入值(选项)", + "re.parameter.grid.toolbar.add.indicator": "指标", + "re.parameter.grid.toolbar.add.intermediate": "中间值", + "re.parameter.grid.toolbar.add.out": "结果值", + "re.parameter.grid.toolbar.add.ruleResult": "规则集结果值", + "re.parameter.grid.toolbar.add.singleRuleResult": "单规则结果值", + "re.parameter.grid.toolbar.add.importPmml": "导入 PMML", + "re.parameter.grid.toolbar.deepClone.tip": "您确定要深度复制参数吗?", + "re.parameter.grid.entity.model": "模型", + "re.parameter.grid.entity.valueType": "值类型", + "re.parameter.grid.entity.valueTypeVersion": "值类型版本", + "re.parameter.grid.entity.valueScale": "值精度", + "re.parameter.grid.entity.valueRoundingMode": "四舍五入模式", + "re.parameter.grid.entity.valueTypeIsList": "列表?", + "re.parameter.grid.entity.libCode": "指标库", + "re.parameter.grid.entity.libVersion": "指标库版本", + "re.parameter.grid.entity.indicatorCode": "指标", + "re.parameter.tip.indicatorParameterCanNotEditable": "类型为指标的参数不能进行编辑!", + + "re.parameter.dialog.moveParameter.title": "选择参数移动的目标位置", + + "re.validator.grid.title": "验证器", + "re.validator.grid.entity.content": "内容", + "re.validator.grid.entity.tip": "错误提示", + + "re.option.grid.title": "选项", + "re.option.grid.entity.inputValue": "输入值", + "re.option.grid.entity.value": "计算值", + "re.option.grid.entity.title": "显示文本", + + "re.processor.dialog.decisionTree.title": "决策树设计器", + "re.processor.dialog.executionFlow.title": "执行流设计器", + + "re.processor.grid.title": "处理逻辑", + "re.processor.grid.entity.content": "内容", + "re.processor.grid.entity.arithmetic": "算数表达式", + "re.processor.grid.entity.conditionRangeVar": "条件分段", + "re.processor.grid.entity.conditionRange": "条件分段", + "re.processor.grid.entity.decisionTable": "决策表", + "re.processor.grid.entity.decisionTable2C": "简单决策表", + "re.processor.grid.entity.decisionTree": "决策树", + "re.processor.grid.entity.executionFlow": "执行流", + "re.processor.grid.entity.groovyScript": "脚本代码", + "re.processor.grid.entity.httpMethod": "请求方法", + "re.processor.grid.entity.httpUrl": "URL", + "re.processor.grid.entity.httpAuthType": "认证类型", + "re.processor.grid.entity.httpAuthApikey": "API Key", + "re.processor.grid.entity.httpAuthApiValue": "API Value", + "re.processor.grid.entity.httpAuthBasicUsername": "用户名", + "re.processor.grid.entity.httpAuthBasicPassword": "密码", + "re.processor.grid.entity.httpAuthBearerToken": "Bearer Token", + "re.processor.grid.entity.httpRequestBody": "请求体", + "re.processor.grid.entity.httpResponseBody": "响应体", + "re.processor.grid.entity.httpResponseMapping": "响应映射", + "re.processor.grid.entity.mathFormula": "数学公式", + "re.processor.grid.entity.numberRangeVar": "数值分段表达式", + "re.processor.grid.entity.numberRange": "数值分段", + "re.processor.grid.entity.objectCondition": "条件", + "re.processor.grid.entity.objectProperties": "对象属性", + "re.processor.grid.entity.optionCode": "选项", + "re.processor.grid.entity.pmml": "PMML", + "re.processor.grid.entity.rule": "规则", + "re.processor.grid.entity.scoreCard": "评分卡", + "re.processor.grid.entity.singleRule": "单规则", + "re.processor.grid.entity.sqlDatasourceName": "数据源名称", + "re.processor.grid.entity.sql": "SQL 语句", + "re.processor.grid.entity.sqlParameterValues": "参数值", + "re.processor.grid.entity.sqlQueryResult": "执行结果", + "re.processor.grid.entity.sqlFieldMapping": "结果映射", + "re.processor.grid.entity.ternaryCondition": "条件", + "re.processor.grid.entity.ternaryTrue": "条件满足时", + "re.processor.grid.entity.ternaryFalse": "条件不满足时", + "re.processor.grid.entity.when": "When 表达式", + "re.processor.grid.entity.then": "Then 表达式", + "re.processor.grid.entity.isWhenThenShorted": "跳过后续操作", + + "re.processor.decisionTable.toolbar.addCol2Left": "在左边新增列", + "re.processor.decisionTable.toolbar.addCol2Right": "在右边新增列", + "re.processor.decisionTable.toolbar.addRow": "新增行", + "re.processor.decisionTable.toolbar.addConditionRow": "新增条件行", + "re.processor.decisionTable.toolbar.addResultRow": "新增结果行", + "re.processor.decisionTable.toolbar.removeCol": "删除列", + "re.processor.decisionTable.toolbar.removeRow": "删除行", + "re.processor.decisionTable.action.addConditionRow": "添加条件行", + "re.processor.decisionTable.action.addResultRow": "添加结果行", "re.dictionary.grid.title": "元数据", "re.dictionary.grid.toolbar.addGroup": "新增", "re.dictionary.grid.toolbar.addTop": "顶级文件夹", "re.dictionary.grid.toolbar.addChild": "子文件夹", - "re.dictionary.grid.toolbar.addJavaType": "Java 类型", - "re.dictionary.grid.toolbar.addUserDefinedJavaClassType": "用户自定义类型", - "re.dictionary.grid.toolbar.addEnumType": "枚举类型", + "re.dictionary.grid.toolbar.addUserDefinedJavaClassType": "结构体", + "re.dictionary.grid.toolbar.addEnumType": "枚举", "re.dictionary.grid.toolbar.cloneGroup": "复制", "re.dictionary.grid.toolbar.deepClone": "深度复制", "re.dictionary.grid.toolbar.deepClone.tip": "您确定要深度复制元数据吗?", @@ -253,6 +211,32 @@ "re.indicator.grid.toolbar.addInterface": "接口", "re.indicator.grid.toolbar.addIndicator": "指标", + "re.testcase.grid.title": "试算用例", + "re.testcase.grid.tools.batchTest": "批量试算", + "re.testcase.grid.tools.download": "下载试算模版", + "re.testcase.grid.tools.upload": "上传用例并试算", + "re.testcase.grid.entity.testResult": "结果", + "re.testcase.grid.entity.lastTestDate": "测试日期", + "re.testcase.grid.entity.ownerId": "所有者ID", + "re.testcase.grid.entity.ownerType": "所有者类型", + "re.testcase.grid.entity.ownerCode": "所有者代码", + "re.testcase.grid.entity.ownerName": "所有者名称", + "re.testcase.grid.entity.ownerVersion": "所有者版本", + "re.testcase.grid.entity.ownerStatus": "所有者状态", + "re.testcase.grid.entity.ownerDescription": "所有者名称", + + "re.testCaseParameter.grid.title": "参数列表", + "re.testCaseParameter.grid.entity.testCaseId": "测试用例ID", + "re.testCaseParameter.grid.entity.inputValue": "输入值", + "re.testCaseParameter.grid.entity.expectValue": "期望值", + "re.testCaseParameter.grid.entity.resultValue": "结果值", + "re.testCaseParameter.grid.entity.skipCheck": "跳过检查", + "re.testCaseParameter.grid.entity.testResult": "结果", + + "re.templateImportAndExport.action.group": "批量创建", + "re.templateImportAndExport.action.downloadTemplate": "下载模版", + "re.templateImportAndExport.action.upload": "上传并创建", + "re.migration.import.title": "导入数据 (通过上传文件导入)", "re.migration.import.subTitle": "", "re.migration.import.action": "导入数据", @@ -304,5 +288,33 @@ "re.workflow.task.grid.entity.resourceStatus": "资源状态", "re.workflow.task.grid.entity.attachments": "资源附件", - "re.workflow.historyTask.grid.title": "历史任务列表" + "re.workflow.historyTask.grid.title": "历史任务列表", + + "re.graph.vertex.start.label": "开始", + "re.graph.vertex.start.title": "开始", + "re.graph.vertex.condition.label": "条件", + "re.graph.vertex.condition.title": "条件", + "re.graph.vertex.condition.entity.condition": "判断条件", + "re.graph.vertex.expression.label": "表达式", + "re.graph.vertex.expression.title": "表达式", + "re.graph.vertex.expression.entity.expression": "表达式", + "re.graph.vertex.expression.entity.commands": "附加指令集", + "re.graph.vertex.resourceAbstract.label": "资源", + "re.graph.vertex.resourceAbstract.title": "资源", + "re.graph.vertex.resourceAbstract.entity.resourceAbstractId": "资源", + "re.graph.vertex.commandSet.label": "指令集", + "re.graph.vertex.commandSet.title": "指令集", + "re.graph.vertex.commandSet.entity.commands": "指令集", + "re.graph.vertex.configurableResourceAbstract.label": "资源", + "re.graph.vertex.configurableResourceAbstract.title": "带输入输出指令的资源", + "re.graph.vertex.configurableResourceAbstract.entity.resourceAbstractId": "资源", + "re.graph.vertex.configurableResourceAbstract.entity.inputCommands": "输入指令集", + "re.graph.vertex.configurableResourceAbstract.entity.outputCommands": "输出指令集", + "re.graph.vertex.subModelAbstract.label": "子模型", + "re.graph.vertex.subModelAbstract.title": "子模型", + "re.graph.vertex.subModelAbstract.entity.code": "子模型", + + "re.graph.edge.conditionBranch.entity.valueType": "值类型", + "re.graph.edge.conditionBranch.entity.value": "值", + "re.graph.edge.conditionBranch.entity.commands": "附加指令集" } diff --git a/io.sc.engine.rule.frontend/src/routes/routes.json b/io.sc.engine.rule.frontend/src/routes/routes.json index e22f12ba..8012af56 100644 --- a/io.sc.engine.rule.frontend/src/routes/routes.json +++ b/io.sc.engine.rule.frontend/src/routes/routes.json @@ -9,25 +9,21 @@ "componentPath": "@/views/resources/Resources.vue", "redirect": null, "meta": { - "permissions": [ - "/re/resources/**/*" - ] + "permissions": ["/re/resources/**/*"] } }, { "force": true, "name": "route.engine.rule.designer", - "path": "re/designer", + "icon": "bi-1-circle", + "path": "re/designer/:id", "parent": "/", "priority": 0, - "module": "io.sc.engine.rule.frontend", "component": "component.engine.rule.designer", "componentPath": "@/views/resources/designer/Designer.vue", "redirect": null, "meta": { - "permissions": [ - "/re/resources/**/*" - ] + "permissions": ["/re/resources/**/*"] } }, { @@ -40,9 +36,7 @@ "componentPath": "@/views/authorization/Authorization.vue", "redirect": null, "meta": { - "permissions": [ - "/re/authorization/**/*" - ] + "permissions": ["/re/authorization/**/*"] } }, { @@ -55,9 +49,7 @@ "componentPath": "@/views/workflow/Workflow.vue", "redirect": null, "meta": { - "permissions": [ - "/re/workflow/**/*" - ] + "permissions": ["/re/workflow/**/*"] } }, { @@ -70,9 +62,7 @@ "componentPath": "@/views/dictionary/Dictionary.vue", "redirect": null, "meta": { - "permissions": [ - "/re/dictionary/**/*" - ] + "permissions": ["/re/dictionary/**/*"] } }, { @@ -85,9 +75,7 @@ "componentPath": "@/views/lib/Lib.vue", "redirect": null, "meta": { - "permissions": [ - "/re/lib/**/*" - ] + "permissions": ["/re/lib/**/*"] } }, { @@ -100,9 +88,7 @@ "componentPath": "@/views/function/Function.vue", "redirect": null, "meta": { - "permissions": [ - "/re/function/**/*" - ] + "permissions": ["/re/function/**/*"] } }, { @@ -115,9 +101,7 @@ "componentPath": "@/views/testcase/Testcase.vue", "redirect": null, "meta": { - "permissions": [ - "/re/testcase/**/*" - ] + "permissions": ["/re/testcase/**/*"] } }, { @@ -130,9 +114,7 @@ "componentPath": "@/views/migration/Migration.vue", "redirect": null, "meta": { - "permissions": [ - "/re/migration/**/*" - ] + "permissions": ["/re/migration/**/*"] } } ] diff --git a/io.sc.engine.rule.frontend/src/utils/PassOrNotFormater.ts b/io.sc.engine.rule.frontend/src/utils/PassOrNotFormater.ts deleted file mode 100644 index 5dda35cc..00000000 --- a/io.sc.engine.rule.frontend/src/utils/PassOrNotFormater.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { Tools } from 'platform-core'; - -const PassOrNotFormater = (value) => { - if (Tools.isUndefinedOrNull(value)) { - return ''; - } - if (value === 'PASSED') { - return { - componentType: 'QIcon', - attrs: { name: 'bi-check-circle', size: '20px', color: 'green' }, - }; - } else if (value === 'UN_PASSED') { - return { - componentType: 'QIcon', - attrs: { name: 'bi-x-circle', size: '20px', color: 'red' }, - }; - } else if (value === 'ERROR') { - return { - componentType: 'QIcon', - attrs: { name: 'bi-x-circle', size: '20px', color: 'red' }, - }; - } -}; - -export default PassOrNotFormater; diff --git a/io.sc.engine.rule.frontend/src/views/authorization/Authorization.vue b/io.sc.engine.rule.frontend/src/views/authorization/Authorization.vue index fdf52c4a..e1764614 100644 --- a/io.sc.engine.rule.frontend/src/views/authorization/Authorization.vue +++ b/io.sc.engine.rule.frontend/src/views/authorization/Authorization.vue @@ -4,6 +4,7 @@
@@ -133,12 +149,12 @@ diff --git a/io.sc.engine.rule.frontend/src/views/dictionary/dictionary.vue b/io.sc.engine.rule.frontend/src/views/dictionary/dictionary.vue index 6e7b79a7..59f25faa 100644 --- a/io.sc.engine.rule.frontend/src/views/dictionary/dictionary.vue +++ b/io.sc.engine.rule.frontend/src/views/dictionary/dictionary.vue @@ -1,5 +1,5 @@ diff --git a/io.sc.engine.rule.frontend/src/views/lib/Lib.vue b/io.sc.engine.rule.frontend/src/views/lib/Lib.vue index 42ea5651..43ff5c32 100644 --- a/io.sc.engine.rule.frontend/src/views/lib/Lib.vue +++ b/io.sc.engine.rule.frontend/src/views/lib/Lib.vue @@ -1,5 +1,5 @@