@lcap/nasl 1.0.0 → 2.12.0-beta
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/out/automate/engine/index.js +39 -127
- package/out/automate/engine/index.js.map +1 -1
- package/out/automate/engine/operators.d.ts +13 -0
- package/out/automate/engine/operators.js +63 -0
- package/out/automate/engine/operators.js.map +1 -0
- package/out/automate/engine/uniqueName.d.ts +6 -0
- package/out/automate/engine/uniqueName.js +39 -0
- package/out/automate/engine/uniqueName.js.map +1 -0
- package/out/automate/engine/utils.d.ts +1 -0
- package/out/automate/engine/utils.js +105 -67
- package/out/automate/engine/utils.js.map +1 -1
- package/out/common/BaseNode.d.ts +1 -1
- package/out/common/BaseNode.js +13 -3
- package/out/common/BaseNode.js.map +1 -1
- package/out/concepts/App__.d.ts +52 -49
- package/out/concepts/App__.js +95 -60
- package/out/concepts/App__.js.map +1 -1
- package/out/concepts/Argument__.js +1 -1
- package/out/concepts/Argument__.js.map +1 -1
- package/out/concepts/Assignee__.d.ts +11 -0
- package/out/concepts/Assignee__.js +36 -2
- package/out/concepts/Assignee__.js.map +1 -1
- package/out/concepts/Assignment__.js +1 -1
- package/out/concepts/Assignment__.js.map +1 -1
- package/out/concepts/Attribute__.js +1 -1
- package/out/concepts/Attribute__.js.map +1 -1
- package/out/concepts/BinaryExpression__.js +1 -1
- package/out/concepts/BinaryExpression__.js.map +1 -1
- package/out/concepts/BindAttribute__.js +4 -4
- package/out/concepts/BindAttribute__.js.map +1 -1
- package/out/concepts/BindDirective__.js +2 -2
- package/out/concepts/BindDirective__.js.map +1 -1
- package/out/concepts/BindEvent__.js +11 -6
- package/out/concepts/BindEvent__.js.map +1 -1
- package/out/concepts/BooleanLiteral__.js +1 -1
- package/out/concepts/BooleanLiteral__.js.map +1 -1
- package/out/concepts/CallFunction__.js +25 -5
- package/out/concepts/CallFunction__.js.map +1 -1
- package/out/concepts/CallInterface__.js +1 -1
- package/out/concepts/CallInterface__.js.map +1 -1
- package/out/concepts/CallLogic__.js +24 -22
- package/out/concepts/CallLogic__.js.map +1 -1
- package/out/concepts/CallQueryComponent__.d.ts +35 -5
- package/out/concepts/CallQueryComponent__.js +344 -99
- package/out/concepts/CallQueryComponent__.js.map +1 -1
- package/out/concepts/Comment__.js +2 -2
- package/out/concepts/Comment__.js.map +1 -1
- package/out/concepts/CompletionProperty__.js +1 -1
- package/out/concepts/CompletionProperty__.js.map +1 -1
- package/out/concepts/ConfigGroup__.d.ts +1 -0
- package/out/concepts/ConfigGroup__.js +9 -2
- package/out/concepts/ConfigGroup__.js.map +1 -1
- package/out/concepts/ConfigPropertyValue__.js +1 -1
- package/out/concepts/ConfigPropertyValue__.js.map +1 -1
- package/out/concepts/ConfigProperty__.d.ts +1 -0
- package/out/concepts/ConfigProperty__.js +5 -2
- package/out/concepts/ConfigProperty__.js.map +1 -1
- package/out/concepts/Configuration__.d.ts +1 -0
- package/out/concepts/Configuration__.js +5 -2
- package/out/concepts/Configuration__.js.map +1 -1
- package/out/concepts/Constant__.js +7 -7
- package/out/concepts/Constant__.js.map +1 -1
- package/out/concepts/DataElement__.js +1 -1
- package/out/concepts/DataElement__.js.map +1 -1
- package/out/concepts/DataSource__.d.ts +143 -0
- package/out/concepts/DataSource__.js +316 -0
- package/out/concepts/DataSource__.js.map +1 -0
- package/out/concepts/Destination__.js +26 -9
- package/out/concepts/Destination__.js.map +1 -1
- package/out/concepts/End__.js +3 -3
- package/out/concepts/End__.js.map +1 -1
- package/out/concepts/EntityIndex__.d.ts +5 -0
- package/out/concepts/EntityIndex__.js +11 -3
- package/out/concepts/EntityIndex__.js.map +1 -1
- package/out/concepts/EntityProperty__.d.ts +9 -0
- package/out/concepts/EntityProperty__.js +23 -8
- package/out/concepts/EntityProperty__.js.map +1 -1
- package/out/concepts/Entity__.d.ts +6 -3
- package/out/concepts/Entity__.js +28 -24
- package/out/concepts/Entity__.js.map +1 -1
- package/out/concepts/EnumItem__.js +1 -1
- package/out/concepts/EnumItem__.js.map +1 -1
- package/out/concepts/Enum__.d.ts +1 -0
- package/out/concepts/Enum__.js +15 -5
- package/out/concepts/Enum__.js.map +1 -1
- package/out/concepts/Event__.js +2 -2
- package/out/concepts/Event__.js.map +1 -1
- package/out/concepts/ForEachStatement__.d.ts +1 -1
- package/out/concepts/ForEachStatement__.js +5 -5
- package/out/concepts/ForEachStatement__.js.map +1 -1
- package/out/concepts/Function__.d.ts +18 -0
- package/out/concepts/Function__.js +100 -5
- package/out/concepts/Function__.js.map +1 -1
- package/out/concepts/Identifier__.js +2 -12
- package/out/concepts/Identifier__.js.map +1 -1
- package/out/concepts/IfStatement__.js +9 -9
- package/out/concepts/IfStatement__.js.map +1 -1
- package/out/concepts/InterfaceParam__.js +10 -5
- package/out/concepts/InterfaceParam__.js.map +1 -1
- package/out/concepts/Interface__.js +21 -14
- package/out/concepts/Interface__.js.map +1 -1
- package/out/concepts/JSBlock__.js +1 -1
- package/out/concepts/JSBlock__.js.map +1 -1
- package/out/concepts/LogicItem__.js +1 -1
- package/out/concepts/LogicItem__.js.map +1 -1
- package/out/concepts/Logic__.d.ts +4 -0
- package/out/concepts/Logic__.js +59 -46
- package/out/concepts/Logic__.js.map +1 -1
- package/out/concepts/MemberExpression__.js +1 -2
- package/out/concepts/MemberExpression__.js.map +1 -1
- package/out/concepts/Module__.d.ts +1 -85
- package/out/concepts/Module__.js +13 -114
- package/out/concepts/Module__.js.map +1 -1
- package/out/concepts/Namespace__.d.ts +0 -86
- package/out/concepts/Namespace__.js +12 -119
- package/out/concepts/Namespace__.js.map +1 -1
- package/out/concepts/NullLiteral__.js +1 -1
- package/out/concepts/NullLiteral__.js.map +1 -1
- package/out/concepts/NumericLiteral__.js +1 -1
- package/out/concepts/NumericLiteral__.js.map +1 -1
- package/out/concepts/Param__.d.ts +3 -2
- package/out/concepts/Param__.js +15 -8
- package/out/concepts/Param__.js.map +1 -1
- package/out/concepts/Point__.js +1 -1
- package/out/concepts/Point__.js.map +1 -1
- package/out/concepts/ProcessComponent__.js +3 -3
- package/out/concepts/ProcessComponent__.js.map +1 -1
- package/out/concepts/ProcessElement__.js +39 -18
- package/out/concepts/ProcessElement__.js.map +1 -1
- package/out/concepts/ProcessOutcome__.js +1 -1
- package/out/concepts/ProcessOutcome__.js.map +1 -1
- package/out/concepts/Process__.js +21 -14
- package/out/concepts/Process__.js.map +1 -1
- package/out/concepts/QueryAggregateExpression__.js +2 -2
- package/out/concepts/QueryAggregateExpression__.js.map +1 -1
- package/out/concepts/QueryFieldExpression__.d.ts +1 -0
- package/out/concepts/QueryFieldExpression__.js +12 -2
- package/out/concepts/QueryFieldExpression__.js.map +1 -1
- package/out/concepts/QueryFromExpression__.d.ts +4 -0
- package/out/concepts/QueryFromExpression__.js +14 -3
- package/out/concepts/QueryFromExpression__.js.map +1 -1
- package/out/concepts/QueryGroupByExpression__.d.ts +3 -0
- package/out/concepts/QueryGroupByExpression__.js +21 -1
- package/out/concepts/QueryGroupByExpression__.js.map +1 -1
- package/out/concepts/QueryJoinExpression__.d.ts +4 -0
- package/out/concepts/QueryJoinExpression__.js +16 -5
- package/out/concepts/QueryJoinExpression__.js.map +1 -1
- package/out/concepts/QueryLimitExpression__.js.map +1 -1
- package/out/concepts/QueryOrderByExpression__.js +1 -1
- package/out/concepts/QueryOrderByExpression__.js.map +1 -1
- package/out/concepts/QuerySelectExpression__.js +2 -2
- package/out/concepts/QuerySelectExpression__.js.map +1 -1
- package/out/concepts/Rect__.js +1 -1
- package/out/concepts/Rect__.js.map +1 -1
- package/out/concepts/Return__.d.ts +1 -1
- package/out/concepts/Return__.js +16 -11
- package/out/concepts/Return__.js.map +1 -1
- package/out/concepts/Role__.js +11 -4
- package/out/concepts/Role__.js.map +1 -1
- package/out/concepts/Slot__.js +1 -1
- package/out/concepts/Slot__.js.map +1 -1
- package/out/concepts/SqlQueryComponent__.d.ts +10 -0
- package/out/concepts/SqlQueryComponent__.js +32 -5
- package/out/concepts/SqlQueryComponent__.js.map +1 -1
- package/out/concepts/Start__.js +1 -1
- package/out/concepts/Start__.js.map +1 -1
- package/out/concepts/StringLiteral__.js +2 -9
- package/out/concepts/StringLiteral__.js.map +1 -1
- package/out/concepts/StructureProperty__.js +6 -6
- package/out/concepts/StructureProperty__.js.map +1 -1
- package/out/concepts/Structure__.js +22 -15
- package/out/concepts/Structure__.js.map +1 -1
- package/out/concepts/SwitchCase__.js +6 -6
- package/out/concepts/SwitchCase__.js.map +1 -1
- package/out/concepts/SwitchStatement__.js +1 -1
- package/out/concepts/SwitchStatement__.js.map +1 -1
- package/out/concepts/Theme__.js +1 -1
- package/out/concepts/Theme__.js.map +1 -1
- package/out/concepts/Transactional__.js +1 -1
- package/out/concepts/Transactional__.js.map +1 -1
- package/out/concepts/TypeAnnotation__.d.ts +8 -0
- package/out/concepts/TypeAnnotation__.js +56 -6
- package/out/concepts/TypeAnnotation__.js.map +1 -1
- package/out/concepts/TypeParam__.js +1 -1
- package/out/concepts/TypeParam__.js.map +1 -1
- package/out/concepts/UnaryExpression__.js +1 -1
- package/out/concepts/UnaryExpression__.js.map +1 -1
- package/out/concepts/Unparsed__.js +1 -1
- package/out/concepts/Unparsed__.js.map +1 -1
- package/out/concepts/UseComponent__.js +1 -1
- package/out/concepts/UseComponent__.js.map +1 -1
- package/out/concepts/ValidationRule__.js +1 -1
- package/out/concepts/ValidationRule__.js.map +1 -1
- package/out/concepts/Variable__.d.ts +1 -1
- package/out/concepts/Variable__.js +16 -11
- package/out/concepts/Variable__.js.map +1 -1
- package/out/concepts/ViewComponent__.js +6 -6
- package/out/concepts/ViewComponent__.js.map +1 -1
- package/out/concepts/ViewElement__.js +21 -21
- package/out/concepts/ViewElement__.js.map +1 -1
- package/out/concepts/View__.d.ts +3 -1
- package/out/concepts/View__.js +53 -32
- package/out/concepts/View__.js.map +1 -1
- package/out/concepts/WhileStatement__.js +5 -5
- package/out/concepts/WhileStatement__.js.map +1 -1
- package/out/concepts/basics/stdlib/nasl.configuration.js +1 -1
- package/out/concepts/basics/stdlib/nasl.configuration.js.map +1 -1
- package/out/concepts/basics/stdlib/nasl.interface.d.ts +2 -0
- package/out/concepts/basics/stdlib/nasl.interface.js +4 -4
- package/out/concepts/basics/stdlib/nasl.interface.js.map +1 -1
- package/out/concepts/basics/stdlib/nasl.util.js +268 -6
- package/out/concepts/basics/stdlib/nasl.util.js.map +1 -1
- package/out/concepts/basics/stdlib/reference2TypeAnnotationList.js +1 -1
- package/out/concepts/basics/stdlib/reference2TypeAnnotationList.js.map +1 -1
- package/out/concepts/basics/types/index.d.ts +1 -0
- package/out/concepts/basics/types/index.js +3 -1
- package/out/concepts/basics/types/index.js.map +1 -1
- package/out/concepts/index__.d.ts +1 -0
- package/out/concepts/index__.js +1 -0
- package/out/concepts/index__.js.map +1 -1
- package/out/enums/KEYWORDS.js +0 -9
- package/out/enums/KEYWORDS.js.map +1 -1
- package/out/generator/genBundleFiles.js +8 -3
- package/out/generator/genBundleFiles.js.map +1 -1
- package/out/generator/genMetaData.js +13 -12
- package/out/generator/genMetaData.js.map +1 -1
- package/out/manager/diagnostic.d.ts +1 -1
- package/out/server/createUiTs.js +1 -0
- package/out/server/createUiTs.js.map +1 -1
- package/out/server/extendBaseNode.d.ts +1 -0
- package/out/server/extendBaseNode.js +323 -0
- package/out/server/extendBaseNode.js.map +1 -0
- package/out/server/getLogics.js +31 -2
- package/out/server/getLogics.js.map +1 -1
- package/out/server/getMemberIdentifier.js +47 -2
- package/out/server/getMemberIdentifier.js.map +1 -1
- package/out/server/getProcesses.d.ts +7 -2
- package/out/server/getProcesses.js +220 -20
- package/out/server/getProcesses.js.map +1 -1
- package/out/server/getScope.d.ts +3 -1
- package/out/server/getScope.js +30 -14
- package/out/server/getScope.js.map +1 -1
- package/out/server/index.d.ts +1 -0
- package/out/server/index.js +1 -0
- package/out/server/index.js.map +1 -1
- package/out/server/naslServer.d.ts +7 -5
- package/out/server/naslServer.js +249 -372
- package/out/server/naslServer.js.map +1 -1
- package/out/server/process2LogicNamespace.js +10 -1
- package/out/server/process2LogicNamespace.js.map +1 -1
- package/out/server/translator.d.ts +1 -1
- package/out/server/translator.js +22 -2
- package/out/server/translator.js.map +1 -1
- package/out/service/storage/init.js +32 -11
- package/out/service/storage/init.js.map +1 -1
- package/out/templator/genCreateBlock.js +15 -11
- package/out/templator/genCreateBlock.js.map +1 -1
- package/out/templator/genCurdEditMultipleKeyBlock.js +15 -12
- package/out/templator/genCurdEditMultipleKeyBlock.js.map +1 -1
- package/out/templator/genCurdMultipleKeyBlock.js +25 -21
- package/out/templator/genCurdMultipleKeyBlock.js.map +1 -1
- package/out/templator/genEditTableBlock.js +12 -12
- package/out/templator/genEditTableBlock.js.map +1 -1
- package/out/templator/genGetBlock.js +1 -1
- package/out/templator/genGetBlock.js.map +1 -1
- package/out/templator/genGridViewBlock.js +21 -20
- package/out/templator/genGridViewBlock.js.map +1 -1
- package/out/templator/genListViewBlock.js +6 -3
- package/out/templator/genListViewBlock.js.map +1 -1
- package/out/templator/genQueryComponent.js +11 -8
- package/out/templator/genQueryComponent.js.map +1 -1
- package/out/templator/genSelectBlock.js +13 -22
- package/out/templator/genSelectBlock.js.map +1 -1
- package/out/templator/genTableBlock.js +17 -15
- package/out/templator/genTableBlock.js.map +1 -1
- package/out/templator/genUpdateBlock.js +16 -12
- package/out/templator/genUpdateBlock.js.map +1 -1
- package/out/templator/utils.d.ts +5 -3
- package/out/templator/utils.js +2 -1
- package/out/templator/utils.js.map +1 -1
- package/out/test/integration/connect-file.js +6 -6
- package/out/test/integration/connect-file.js.map +1 -1
- package/out/translator/index.js +1 -1
- package/out/translator/index.js.map +1 -1
- package/out/utils/index.d.ts +4 -0
- package/out/utils/index.js +38 -2
- package/out/utils/index.js.map +1 -1
- package/out/utils/string.d.ts +1 -1
- package/out/utils/string.js +38 -9
- package/out/utils/string.js.map +1 -1
- package/package.json +1 -2
- package/src/automate/engine/index.js +38 -128
- package/src/automate/engine/operators.js +63 -0
- package/src/automate/engine/uniqueName.js +36 -0
- package/src/automate/engine/utils.js +108 -69
- package/src/common/BaseNode.ts +14 -3
- package/src/concepts/App__.ts +138 -101
- package/src/concepts/Argument__.ts +1 -1
- package/src/concepts/Assignee__.ts +32 -2
- package/src/concepts/Assignment__.ts +1 -1
- package/src/concepts/Attribute__.ts +1 -1
- package/src/concepts/BinaryExpression__.ts +1 -1
- package/src/concepts/BindAttribute__.ts +4 -4
- package/src/concepts/BindDirective__.ts +2 -2
- package/src/concepts/BindEvent__.ts +10 -6
- package/src/concepts/BooleanLiteral__.ts +1 -1
- package/src/concepts/CallFunction__.ts +36 -18
- package/src/concepts/CallInterface__.ts +1 -1
- package/src/concepts/CallLogic__.ts +55 -24
- package/src/concepts/CallQueryComponent__.ts +357 -134
- package/src/concepts/Comment__.ts +2 -2
- package/src/concepts/CompletionProperty__.ts +1 -1
- package/src/concepts/ConfigGroup__.ts +5 -3
- package/src/concepts/ConfigPropertyValue__.ts +1 -1
- package/src/concepts/ConfigProperty__.ts +6 -2
- package/src/concepts/Configuration__.ts +5 -2
- package/src/concepts/Constant__.ts +7 -7
- package/src/concepts/DataElement__.ts +1 -1
- package/src/concepts/DataSource__.ts +389 -0
- package/src/concepts/Destination__.ts +28 -10
- package/src/concepts/End__.ts +3 -3
- package/src/concepts/EntityIndex__.ts +12 -3
- package/src/concepts/EntityProperty__.ts +24 -8
- package/src/concepts/Entity__.ts +39 -27
- package/src/concepts/EnumItem__.ts +1 -1
- package/src/concepts/Enum__.ts +16 -5
- package/src/concepts/Event__.ts +2 -2
- package/src/concepts/ForEachStatement__.ts +5 -5
- package/src/concepts/Function__.ts +101 -7
- package/src/concepts/Identifier__.ts +2 -12
- package/src/concepts/IfStatement__.ts +10 -10
- package/src/concepts/InterfaceParam__.ts +10 -5
- package/src/concepts/Interface__.ts +22 -14
- package/src/concepts/JSBlock__.ts +1 -1
- package/src/concepts/LogicItem__.ts +1 -1
- package/src/concepts/Logic__.ts +60 -43
- package/src/concepts/MemberExpression__.ts +1 -2
- package/src/concepts/Module__.ts +16 -211
- package/src/concepts/Namespace__.ts +12 -215
- package/src/concepts/NullLiteral__.ts +1 -1
- package/src/concepts/NumericLiteral__.ts +1 -1
- package/src/concepts/Param__.ts +17 -9
- package/src/concepts/Point__.ts +1 -1
- package/src/concepts/ProcessComponent__.ts +3 -3
- package/src/concepts/ProcessElement__.ts +43 -21
- package/src/concepts/ProcessOutcome__.ts +1 -1
- package/src/concepts/Process__.ts +21 -15
- package/src/concepts/QueryAggregateExpression__.ts +2 -2
- package/src/concepts/QueryFieldExpression__.ts +14 -2
- package/src/concepts/QueryFromExpression__.ts +14 -3
- package/src/concepts/QueryGroupByExpression__.ts +24 -1
- package/src/concepts/QueryJoinExpression__.ts +16 -5
- package/src/concepts/QueryLimitExpression__.ts +9 -0
- package/src/concepts/QueryOrderByExpression__.ts +1 -1
- package/src/concepts/QuerySelectExpression__.ts +2 -2
- package/src/concepts/Rect__.ts +1 -1
- package/src/concepts/Return__.ts +16 -11
- package/src/concepts/Role__.ts +11 -5
- package/src/concepts/Slot__.ts +1 -1
- package/src/concepts/SqlQueryComponent__.ts +30 -11
- package/src/concepts/Start__.ts +1 -1
- package/src/concepts/StringLiteral__.ts +2 -9
- package/src/concepts/StructureProperty__.ts +6 -6
- package/src/concepts/Structure__.ts +22 -14
- package/src/concepts/SwitchCase__.ts +6 -6
- package/src/concepts/SwitchStatement__.ts +1 -1
- package/src/concepts/Theme__.ts +1 -1
- package/src/concepts/Transactional__.ts +1 -1
- package/src/concepts/TypeAnnotation__.ts +55 -25
- package/src/concepts/TypeParam__.ts +1 -1
- package/src/concepts/UnaryExpression__.ts +1 -1
- package/src/concepts/Unparsed__.ts +1 -1
- package/src/concepts/UseComponent__.ts +1 -1
- package/src/concepts/ValidationRule__.ts +1 -1
- package/src/concepts/Variable__.ts +16 -11
- package/src/concepts/ViewComponent__.ts +6 -6
- package/src/concepts/ViewElement__.ts +21 -21
- package/src/concepts/View__.ts +54 -32
- package/src/concepts/WhileStatement__.ts +5 -5
- package/src/concepts/basics/stdlib/nasl.configuration.ts +1 -1
- package/src/concepts/basics/stdlib/nasl.interface.ts +1 -1
- package/src/concepts/basics/stdlib/nasl.util.ts +269 -6
- package/src/concepts/basics/stdlib/reference2TypeAnnotationList.ts +1 -1
- package/src/concepts/basics/types/index.ts +1 -0
- package/src/concepts/index__.ts +1 -0
- package/src/enums/KEYWORDS.ts +0 -9
- package/src/generator/genBundleFiles.ts +8 -3
- package/src/generator/genMetaData.ts +13 -13
- package/src/manager/diagnostic.ts +1 -1
- package/src/server/createUiTs.ts +1 -0
- package/src/server/extendBaseNode.ts +318 -0
- package/src/server/getLogics.ts +33 -4
- package/src/server/getMemberIdentifier.ts +49 -2
- package/src/server/getProcesses.ts +231 -21
- package/src/server/getScope.ts +41 -24
- package/src/server/index.ts +1 -0
- package/src/server/naslServer.ts +248 -366
- package/src/server/process2LogicNamespace.ts +29 -19
- package/src/server/translator.ts +25 -2
- package/src/service/storage/init.ts +32 -12
- package/src/templator/genCreateBlock.ts +16 -13
- package/src/templator/genCurdEditMultipleKeyBlock.ts +16 -13
- package/src/templator/genCurdMultipleKeyBlock.ts +26 -22
- package/src/templator/genEditTableBlock.ts +14 -13
- package/src/templator/genGetBlock.ts +1 -1
- package/src/templator/genGridViewBlock.ts +22 -21
- package/src/templator/genListViewBlock.ts +9 -5
- package/src/templator/genQueryComponent.ts +12 -9
- package/src/templator/genSelectBlock.ts +14 -23
- package/src/templator/genTableBlock.ts +18 -16
- package/src/templator/genUpdateBlock.ts +17 -13
- package/src/templator/utils.ts +5 -2
- package/src/test/integration/connect-file.ts +6 -6
- package/src/translator/index.ts +1 -1
- package/src/utils/index.ts +38 -1
- package/src/utils/string.ts +39 -9
- package/out/concepts/basics/stdlib/nasl.browser copy.d.ts +0 -3
- package/out/concepts/basics/stdlib/nasl.browser copy.js +0 -70
- package/out/concepts/basics/stdlib/nasl.browser copy.js.map +0 -1
- package/out/terms/LEVEL_NAME_MAP.d.ts +0 -26
- package/out/terms/LEVEL_NAME_MAP.js +0 -30
- package/out/terms/LEVEL_NAME_MAP.js.map +0 -1
|
@@ -32,7 +32,7 @@ const utils_1 = require("./utils");
|
|
|
32
32
|
* @param property 实体属性
|
|
33
33
|
*/
|
|
34
34
|
function genEditTableColumnTemplate(entity, property, nameGroup, selectNameGroupMap) {
|
|
35
|
-
const
|
|
35
|
+
const dataSource = entity.parentNode;
|
|
36
36
|
const lowerEntityName = utils.firstLowerCase(entity.name);
|
|
37
37
|
const valueExpression = `scope.item.${lowerEntityName}.${property.name}`;
|
|
38
38
|
const title = property.label || property.name;
|
|
@@ -58,7 +58,7 @@ function genEditTableColumnTemplate(entity, property, nameGroup, selectNameGroup
|
|
|
58
58
|
const propertyTypeName = property.typeAnnotation.typeName;
|
|
59
59
|
if (property.relationEntity && selectNameGroupMap) {
|
|
60
60
|
// 有外键关联
|
|
61
|
-
const relationEntity =
|
|
61
|
+
const relationEntity = dataSource?.findEntityByName(property.relationEntity);
|
|
62
62
|
if (relationEntity) {
|
|
63
63
|
const relationProperty = relationEntity.properties.find((prop) => prop.name === property.relationProperty);
|
|
64
64
|
const displayedProperty = (0, _1.getFirstDisplayedProperty)(relationEntity);
|
|
@@ -156,8 +156,8 @@ exports.genEditTableTemplate = genEditTableTemplate;
|
|
|
156
156
|
* @param entity 实体
|
|
157
157
|
*/
|
|
158
158
|
function genEditTableLoadLogic(entity, nameGroup, newLogic, supportFilter) {
|
|
159
|
-
const
|
|
160
|
-
const
|
|
159
|
+
const moduleNode = utils.findClosestModule(entity);
|
|
160
|
+
const moduleNamespace = moduleNode?.getNamespace();
|
|
161
161
|
const params = [
|
|
162
162
|
(0, _1.genLogicParam)(`${newLogic.params[0].name}`, 'params.page'),
|
|
163
163
|
(0, _1.genLogicParam)(`${newLogic.params[1].name}`, 'params.size'),
|
|
@@ -179,7 +179,7 @@ function genEditTableLoadLogic(entity, nameGroup, newLogic, supportFilter) {
|
|
|
179
179
|
name: 'result',
|
|
180
180
|
typeAnnotation: utils_1.NaslCollectionTypeAnnotation.PageOf([
|
|
181
181
|
utils_1.NaslTypeAnnotation.Reference({
|
|
182
|
-
typeNamespace: `${
|
|
182
|
+
typeNamespace: `${moduleNamespace}.structures`,
|
|
183
183
|
typeName: nameGroup.structure,
|
|
184
184
|
}),
|
|
185
185
|
]),
|
|
@@ -193,7 +193,7 @@ function genEditTableLoadLogic(entity, nameGroup, newLogic, supportFilter) {
|
|
|
193
193
|
name: 'result',
|
|
194
194
|
}),
|
|
195
195
|
right: utils_1.NaslLogicItem.CallLogic({
|
|
196
|
-
calleeNamespace: `${
|
|
196
|
+
calleeNamespace: `${moduleNamespace}.logics`,
|
|
197
197
|
calleeName: newLogic.name,
|
|
198
198
|
arguments: params,
|
|
199
199
|
}),
|
|
@@ -209,8 +209,8 @@ exports.genEditTableLoadLogic = genEditTableLoadLogic;
|
|
|
209
209
|
*/
|
|
210
210
|
function genEditTableRemoveLogic(entity, nameGroup) {
|
|
211
211
|
const lowerEntityName = utils.firstLowerCase(entity.name);
|
|
212
|
-
const
|
|
213
|
-
const
|
|
212
|
+
const moduleNode = utils.findClosestModule(entity);
|
|
213
|
+
const moduleNamespace = moduleNode?.getNamespace();
|
|
214
214
|
const ns = entity.ns;
|
|
215
215
|
const deleteLogic = ns?.logics?.find((logic) => logic.name === `delete`);
|
|
216
216
|
const idPropertys = entity.properties.filter((property) => property.primaryKey || property.name === 'id');
|
|
@@ -225,7 +225,7 @@ function genEditTableRemoveLogic(entity, nameGroup) {
|
|
|
225
225
|
name: 'scope',
|
|
226
226
|
typeAnnotation: utils_1.NaslUITypeAnnotation.ScopeOf([
|
|
227
227
|
utils_1.NaslTypeAnnotation.Reference({
|
|
228
|
-
typeNamespace: `${
|
|
228
|
+
typeNamespace: `${moduleNamespace}.structures`,
|
|
229
229
|
typeName: nameGroup.structure,
|
|
230
230
|
}),
|
|
231
231
|
]),
|
|
@@ -255,8 +255,8 @@ function genEditTableRemoveLogic(entity, nameGroup) {
|
|
|
255
255
|
exports.genEditTableRemoveLogic = genEditTableRemoveLogic;
|
|
256
256
|
function genBlurUpdateLogic(entity, nameGroup) {
|
|
257
257
|
const lowerEntityName = utils.firstLowerCase(entity.name);
|
|
258
|
-
const
|
|
259
|
-
const
|
|
258
|
+
const moduleNode = utils.findClosestModule(entity);
|
|
259
|
+
const moduleNamespace = moduleNode?.getNamespace();
|
|
260
260
|
const ns = entity.ns;
|
|
261
261
|
const updateLogic = ns?.logics?.find((logic) => logic.name === `update`);
|
|
262
262
|
return utils_1.NaslNode.Logic({
|
|
@@ -270,7 +270,7 @@ function genBlurUpdateLogic(entity, nameGroup) {
|
|
|
270
270
|
name: 'scope',
|
|
271
271
|
typeAnnotation: utils_1.NaslUITypeAnnotation.ScopeOf([
|
|
272
272
|
utils_1.NaslTypeAnnotation.Reference({
|
|
273
|
-
typeNamespace: `${
|
|
273
|
+
typeNamespace: `${moduleNamespace}.structures`,
|
|
274
274
|
typeName: nameGroup.structure,
|
|
275
275
|
}),
|
|
276
276
|
]),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"genEditTableBlock.js","sourceRoot":"","sources":["../../src/templator/genEditTableBlock.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAkC;AAElC,wBAIW;AACX,mCAGiB;AAEjB;;;GAGG;AACH,SAAgB,0BAA0B,CAAC,MAAc,EAAE,QAAwB,EAAE,SAAoB,EAAE,kBAA2C;IAClJ,MAAM,UAAU,GAAG,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"genEditTableBlock.js","sourceRoot":"","sources":["../../src/templator/genEditTableBlock.ts"],"names":[],"mappings":"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"}
|
|
@@ -45,7 +45,7 @@ function genGetTemplate(entity, nameGroup) {
|
|
|
45
45
|
}
|
|
46
46
|
exports.genGetTemplate = genGetTemplate;
|
|
47
47
|
function genLoadLogic(getLogic, nameGroup) {
|
|
48
|
-
const params = [(0, _1.genLogicParam)(`${getLogic.params[0].name}`,
|
|
48
|
+
const params = [(0, _1.genLogicParam)(`${getLogic.params[0].name}`, nameGroup.viewParamId)];
|
|
49
49
|
return utils_1.NaslNode.Logic({
|
|
50
50
|
name: nameGroup.viewLogicLoad,
|
|
51
51
|
description: '',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"genGetBlock.js","sourceRoot":"","sources":["../../src/templator/genGetBlock.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sCAAmC;AACnC,gDAAkC;AAElC,mCAA8F;AAC9F,wBAA4E;AAE5E,SAAgB,cAAc,CAAC,MAAc,EAAE,SAAoB;IAC/D,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,IAAA,iBAAc,EAAC,UAAU,CAAC,CAAC,CAAC;IAExE,OAAO;;MAEL,UAAU;SACP,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;QACd,IAAI,QAAQ,GAAG,wCAAwC,QAAQ,CAAC,KAAK,IAAI,QAAQ,CAAC,IAAI,IAAI,CAAC;QAE3F,QAAQ,IAAI,iBAAiB,GAAG,IAAA,gBAAa,EAAC,QAAQ,EAAE,GAAG,SAAS,CAAC,kBAAkB,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC,GAAG,aAAa,CAAC;QAE5H,QAAQ,IAAI,mCAAmC,CAAC;QAChD,OAAO,QAAQ,CAAC;IACpB,CAAC,CAAC;SACD,IAAI,CAAC,EAAE,CAAC;;eAEF,CAAC;AAChB,CAAC;AAjBD,wCAiBC;AAED,SAAS,YAAY,CAAC,QAAe,EAAE,SAAoB;IACvD,MAAM,MAAM,GAAG,CAAC,IAAA,gBAAa,EAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"genGetBlock.js","sourceRoot":"","sources":["../../src/templator/genGetBlock.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,13 +34,13 @@ const utils_1 = require("./utils");
|
|
|
34
34
|
*/
|
|
35
35
|
function genGridViewCardTemplate(property) {
|
|
36
36
|
const entity = property.entity;
|
|
37
|
-
const
|
|
37
|
+
const dataSource = entity.parentNode;
|
|
38
38
|
const lowerEntityName = utils.firstLowerCase(entity.name);
|
|
39
39
|
let expression = `scope.item.${lowerEntityName}.${property.name}`;
|
|
40
40
|
const title = property.label || property.name;
|
|
41
41
|
if (property.relationEntity) {
|
|
42
42
|
// 有外键关联
|
|
43
|
-
const relationEntity =
|
|
43
|
+
const relationEntity = dataSource?.findEntityByName(property.relationEntity);
|
|
44
44
|
if (relationEntity) {
|
|
45
45
|
const displayedProperty = (0, _1.getFirstDisplayedProperty)(relationEntity);
|
|
46
46
|
if (displayedProperty) {
|
|
@@ -74,13 +74,12 @@ function genGridViewCardTemplate(property) {
|
|
|
74
74
|
exports.genGridViewCardTemplate = genGridViewCardTemplate;
|
|
75
75
|
function genH5GridViewCardTemplate(property) {
|
|
76
76
|
const entity = property.entity;
|
|
77
|
-
const
|
|
77
|
+
const dataSource = entity.parentNode;
|
|
78
78
|
const lowerEntityName = utils.firstLowerCase(entity.name);
|
|
79
79
|
let expression = `scope.item.${lowerEntityName}.${property.name}`;
|
|
80
|
-
const title = property.label || property.name;
|
|
81
80
|
if (property.relationEntity) {
|
|
82
81
|
// 有外键关联
|
|
83
|
-
const relationEntity =
|
|
82
|
+
const relationEntity = dataSource?.findEntityByName(property.relationEntity);
|
|
84
83
|
if (relationEntity) {
|
|
85
84
|
const displayedProperty = (0, _1.getFirstDisplayedProperty)(relationEntity);
|
|
86
85
|
if (displayedProperty) {
|
|
@@ -164,8 +163,8 @@ exports.genH5GridViewTemplate = genH5GridViewTemplate;
|
|
|
164
163
|
* @param entity 实体
|
|
165
164
|
*/
|
|
166
165
|
function genGridViewLoadLogic(entity, nameGroup, newLogic, supportFilter) {
|
|
167
|
-
const
|
|
168
|
-
const
|
|
166
|
+
const moduleNode = utils.findClosestModule(entity);
|
|
167
|
+
const moduleNamespace = moduleNode?.getNamespace();
|
|
169
168
|
const params = [
|
|
170
169
|
(0, _1.genLogicParam)(`${newLogic.params[0].name}`, 'params.page'),
|
|
171
170
|
(0, _1.genLogicParam)(`${newLogic.params[1].name}`, 'params.size'),
|
|
@@ -187,7 +186,7 @@ function genGridViewLoadLogic(entity, nameGroup, newLogic, supportFilter) {
|
|
|
187
186
|
name: 'result',
|
|
188
187
|
typeAnnotation: utils_1.NaslCollectionTypeAnnotation.PageOf([
|
|
189
188
|
utils_1.NaslTypeAnnotation.Reference({
|
|
190
|
-
typeNamespace: `${
|
|
189
|
+
typeNamespace: `${moduleNamespace}.structures`,
|
|
191
190
|
typeName: nameGroup.structure,
|
|
192
191
|
}),
|
|
193
192
|
]),
|
|
@@ -201,7 +200,7 @@ function genGridViewLoadLogic(entity, nameGroup, newLogic, supportFilter) {
|
|
|
201
200
|
name: 'result',
|
|
202
201
|
}),
|
|
203
202
|
right: utils_1.NaslLogicItem.CallLogic({
|
|
204
|
-
calleeNamespace: `${
|
|
203
|
+
calleeNamespace: `${moduleNamespace}.logics`,
|
|
205
204
|
calleeName: newLogic.name,
|
|
206
205
|
arguments: params,
|
|
207
206
|
}),
|
|
@@ -217,8 +216,8 @@ exports.genGridViewLoadLogic = genGridViewLoadLogic;
|
|
|
217
216
|
*/
|
|
218
217
|
function genGridViewRemoveLogic(entity, nameGroup) {
|
|
219
218
|
const lowerEntityName = utils.firstLowerCase(entity.name);
|
|
220
|
-
const
|
|
221
|
-
const
|
|
219
|
+
const moduleNode = utils.findClosestModule(entity);
|
|
220
|
+
const moduleNamespace = moduleNode?.getNamespace();
|
|
222
221
|
const ns = entity.ns;
|
|
223
222
|
const deleteLogic = ns?.logics?.find((logic) => logic.name === `delete`);
|
|
224
223
|
const idPropertys = entity.properties.filter((property) => property.primaryKey || property.name === 'id');
|
|
@@ -233,7 +232,7 @@ function genGridViewRemoveLogic(entity, nameGroup) {
|
|
|
233
232
|
name: 'scope',
|
|
234
233
|
typeAnnotation: utils_1.NaslUITypeAnnotation.ScopeOf([
|
|
235
234
|
utils_1.NaslTypeAnnotation.Reference({
|
|
236
|
-
typeNamespace: `${
|
|
235
|
+
typeNamespace: `${moduleNamespace}.structures`,
|
|
237
236
|
typeName: nameGroup.structure,
|
|
238
237
|
}),
|
|
239
238
|
]),
|
|
@@ -272,9 +271,10 @@ exports.genGridViewRemoveLogic = genGridViewRemoveLogic;
|
|
|
272
271
|
*/
|
|
273
272
|
// 数据网格（简）
|
|
274
273
|
function genGridViewBlock(entity, view) {
|
|
275
|
-
const
|
|
274
|
+
const dataSource = entity.parentNode;
|
|
275
|
+
const module = dataSource.parentNode;
|
|
276
276
|
const viewElementMainView = view.getViewElementUniqueName('gridView');
|
|
277
|
-
const nameGroup = (0, _1.genUniqueQueryNameGroup)(
|
|
277
|
+
const nameGroup = (0, _1.genUniqueQueryNameGroup)(module, view, viewElementMainView);
|
|
278
278
|
nameGroup.viewElementMainView = viewElementMainView;
|
|
279
279
|
nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
|
|
280
280
|
nameGroup.viewLogicRemove = view.getLogicUniqueName('remove');
|
|
@@ -285,7 +285,7 @@ function genGridViewBlock(entity, view) {
|
|
|
285
285
|
entity.properties.forEach((property) => {
|
|
286
286
|
if (property.relationEntity) {
|
|
287
287
|
// 有外键关联
|
|
288
|
-
const relationEntity =
|
|
288
|
+
const relationEntity = dataSource?.findEntityByName(property.relationEntity);
|
|
289
289
|
if (relationEntity) {
|
|
290
290
|
const displayedProperty = (0, _1.getFirstDisplayedProperty)(relationEntity);
|
|
291
291
|
if (displayedProperty)
|
|
@@ -295,7 +295,7 @@ function genGridViewBlock(entity, view) {
|
|
|
295
295
|
});
|
|
296
296
|
const entityStructure = (0, _1.genQueryStructure)(allEntities, nameGroup);
|
|
297
297
|
newStructures.push(entityStructure);
|
|
298
|
-
const entityLogic = (0, _1.genQueryLogic)(allEntities, nameGroup, false, true,
|
|
298
|
+
const entityLogic = (0, _1.genQueryLogic)(allEntities, nameGroup, false, true, module);
|
|
299
299
|
newLogics.push(entityLogic);
|
|
300
300
|
return `
|
|
301
301
|
<template>
|
|
@@ -317,9 +317,10 @@ function genGridViewBlock(entity, view) {
|
|
|
317
317
|
exports.genGridViewBlock = genGridViewBlock;
|
|
318
318
|
function genGridViewCardBlock(property, view) {
|
|
319
319
|
const entity = property.entity;
|
|
320
|
-
const
|
|
320
|
+
const dataSource = entity.parentNode;
|
|
321
|
+
const module = dataSource.parentNode;
|
|
321
322
|
const viewElementMainView = view.getViewElementUniqueName('gridView');
|
|
322
|
-
const nameGroup = (0, _1.genUniqueQueryNameGroup)(
|
|
323
|
+
const nameGroup = (0, _1.genUniqueQueryNameGroup)(module, view, viewElementMainView);
|
|
323
324
|
nameGroup.viewElementMainView = viewElementMainView;
|
|
324
325
|
nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
|
|
325
326
|
nameGroup.viewLogicRemove = view.getLogicUniqueName('remove');
|
|
@@ -330,7 +331,7 @@ function genGridViewCardBlock(property, view) {
|
|
|
330
331
|
entity.properties.forEach((property) => {
|
|
331
332
|
if (property.relationEntity) {
|
|
332
333
|
// 有外键关联
|
|
333
|
-
const relationEntity =
|
|
334
|
+
const relationEntity = dataSource?.findEntityByName(property.relationEntity);
|
|
334
335
|
if (relationEntity) {
|
|
335
336
|
const displayedProperty = (0, _1.getFirstDisplayedProperty)(relationEntity);
|
|
336
337
|
if (displayedProperty)
|
|
@@ -340,7 +341,7 @@ function genGridViewCardBlock(property, view) {
|
|
|
340
341
|
});
|
|
341
342
|
const entityStructure = (0, _1.genQueryStructure)(allEntities, nameGroup);
|
|
342
343
|
newStructures.push(entityStructure);
|
|
343
|
-
const entityLogic = (0, _1.genQueryLogic)(allEntities, nameGroup, true, true,
|
|
344
|
+
const entityLogic = (0, _1.genQueryLogic)(allEntities, nameGroup, true, true, module);
|
|
344
345
|
newLogics.push(entityLogic);
|
|
345
346
|
return `
|
|
346
347
|
<template>
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"genGridViewBlock.js","sourceRoot":"","sources":["../../src/templator/genGridViewBlock.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sCAAmC;AACnC,gDAAkC;AAElC,wBAWW;AACX,mCAAkJ;AAElJ;;;GAGG;AACH,SAAgB,uBAAuB,CAAC,QAAwB;IAC5D,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC;IAC/B,MAAM,UAAU,GAAG,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"genGridViewBlock.js","sourceRoot":"","sources":["../../src/templator/genGridViewBlock.ts"],"names":[],"mappings":"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"}
|
|
@@ -61,6 +61,8 @@ exports.genH5ListViewTemplate = genH5ListViewTemplate;
|
|
|
61
61
|
function genLoadListViewLogic(entity, nameGroup, newStructures, newLogics) {
|
|
62
62
|
const parentNode = entity.parentNode;
|
|
63
63
|
const parentNamespace = parentNode?.getNamespace();
|
|
64
|
+
const moduleNode = utils.findClosestModule(entity);
|
|
65
|
+
const moduleNamespace = moduleNode?.getNamespace();
|
|
64
66
|
// Select 和 table 不一样，直接在内部产生了
|
|
65
67
|
const entityStructure = (0, _1.genQueryStructure)([entity], nameGroup);
|
|
66
68
|
const entityLogic = (0, _1.genQueryLogic)([entity], nameGroup, false, false, parentNode);
|
|
@@ -79,7 +81,7 @@ function genLoadListViewLogic(entity, nameGroup, newStructures, newLogics) {
|
|
|
79
81
|
name: 'result',
|
|
80
82
|
typeAnnotation: utils_1.NaslCollectionTypeAnnotation.PageOf([
|
|
81
83
|
utils_1.NaslTypeAnnotation.Reference({
|
|
82
|
-
typeNamespace: `${
|
|
84
|
+
typeNamespace: `${moduleNamespace}.structures`,
|
|
83
85
|
typeName: nameGroup.structure,
|
|
84
86
|
}),
|
|
85
87
|
]),
|
|
@@ -110,9 +112,10 @@ exports.genLoadListViewLogic = genLoadListViewLogic;
|
|
|
110
112
|
* 生成实体选择框区块
|
|
111
113
|
*/
|
|
112
114
|
function genListViewBlock(entity, view, property) {
|
|
113
|
-
const
|
|
115
|
+
const dataSource = entity.parentNode;
|
|
116
|
+
const module = dataSource.parentNode;
|
|
114
117
|
const viewElementMainView = view.getViewElementUniqueName('listView');
|
|
115
|
-
const nameGroup = (0, _1.genUniqueQueryNameGroup)(
|
|
118
|
+
const nameGroup = (0, _1.genUniqueQueryNameGroup)(module, view, viewElementMainView, false);
|
|
116
119
|
nameGroup.viewElementMainView = viewElementMainView;
|
|
117
120
|
nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
|
|
118
121
|
const displayedProperty = property || (0, _1.getFirstDisplayedProperty)(entity);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"genListViewBlock.js","sourceRoot":"","sources":["../../src/templator/genListViewBlock.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sCAAmC;AACnC,gDAAkC;AAElC,wBAAuI;AACvI,mCAGiB;AAEjB,SAAgB,mBAAmB,CAAC,QAAwB,EAAE,SAAoB;IAC9E,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC;IAC/B,MAAM,eAAe,GAAG,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC1D,MAAM,UAAU,GAAG,IAAA,gBAAa,EAAC,QAAQ,EAAE,cAAc,eAAe,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;IAC7F,OAAO,qBAAqB,SAAS,CAAC,mBAAmB,mBAAmB,SAAS,CAAC,aAAa,kBAAkB,SAAS,CAAC,SAAS;kBAC1H,SAAS,CAAC,kBAAkB,IAAI,QAAQ,CAAC,IAAI;mBAC5C,SAAS,CAAC,kBAAkB;;;6BAGlB,UAAU;;;eAGxB,CAAC;AAChB,CAAC;AAbD,kDAaC;AAED,SAAgB,qBAAqB,CAAC,QAAwB,EAAE,SAAoB;IAChF,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC;IAC/B,MAAM,eAAe,GAAG,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC1D,MAAM,UAAU,GAAG,IAAA,gBAAa,EAAC,QAAQ,EAAE,cAAc,eAAe,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;IAE7F,OAAO,uBAAuB,SAAS,CAAC,mBAAmB,mBAAmB,SAAS,CAAC,aAAa,kBAAkB,SAAS,CAAC,SAAS;kBAC5H,SAAS,CAAC,kBAAkB,IAAI,QAAQ,CAAC,IAAI;mBAC5C,SAAS,CAAC,kBAAkB;;4BAEnB,UAAU;kCACJ,UAAU;;;iBAG3B,CAAC;AAClB,CAAC;AAdD,sDAcC;AAED,SAAgB,oBAAoB,CAAC,MAAc,EAAE,SAAoB,EAAE,aAAyB,EAAE,SAAqB;IACvH,MAAM,UAAU,GAAG,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"genListViewBlock.js","sourceRoot":"","sources":["../../src/templator/genListViewBlock.ts"],"names":[],"mappings":"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"}
|
|
@@ -87,8 +87,8 @@ function genWhereExpression(entity) {
|
|
|
87
87
|
function genQueryAssignment(allEntities, nameGroup, supportFilter, supportSort) {
|
|
88
88
|
allEntities = Array.from(allEntities);
|
|
89
89
|
const entity = allEntities.shift();
|
|
90
|
-
const
|
|
91
|
-
const
|
|
90
|
+
const moduleNode = utils.findClosestModule(entity);
|
|
91
|
+
const moduleNamespace = moduleNode?.getNamespace();
|
|
92
92
|
const from = utils_1.NaslQueryExpression.QueryFromExpression({
|
|
93
93
|
entityNamespace: entity.getNamespace(),
|
|
94
94
|
entityName: entity.name,
|
|
@@ -126,10 +126,13 @@ function genQueryAssignment(allEntities, nameGroup, supportFilter, supportSort)
|
|
|
126
126
|
}),
|
|
127
127
|
right: utils_1.NaslQueryExpression.CallQueryComponent({
|
|
128
128
|
label: '数据查询',
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
129
|
+
ideVersion: '2.11',
|
|
130
|
+
typeAnnotation: utils_1.NaslCollectionTypeAnnotation.PageOf([
|
|
131
|
+
utils_1.NaslTypeAnnotation.Reference({
|
|
132
|
+
typeNamespace: `${moduleNamespace}.structures`,
|
|
133
|
+
typeName: nameGroup.structure,
|
|
134
|
+
}),
|
|
135
|
+
]),
|
|
133
136
|
select: utils_1.NaslQueryExpression.QuerySelectExpression({
|
|
134
137
|
label: '查询组件Select子句',
|
|
135
138
|
distinct: false,
|
|
@@ -219,11 +222,11 @@ function genQueryLogic(allEntities, nameGroup, supportFilter, supportSort, paren
|
|
|
219
222
|
}
|
|
220
223
|
exports.genQueryLogic = genQueryLogic;
|
|
221
224
|
async function joinEntity(callQueryComponent, entity, recordStructure) {
|
|
222
|
-
const
|
|
225
|
+
const dataSource = entity.parentNode;
|
|
223
226
|
const from = callQueryComponent.from;
|
|
224
227
|
let joinInfo;
|
|
225
228
|
// 无法判断用户行为，优先加有关系的
|
|
226
|
-
const lastEntity =
|
|
229
|
+
const lastEntity = dataSource.findEntityByName(from.entityName);
|
|
227
230
|
// lastEntity 和 entity Join
|
|
228
231
|
// 判断要不要自动关联 onExpression
|
|
229
232
|
// 一般左联是自动有的了
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"genQueryComponent.js","sourceRoot":"","sources":["../../src/templator/genQueryComponent.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAkC;AAClC,
|
|
1
|
+
{"version":3,"file":"genQueryComponent.js","sourceRoot":"","sources":["../../src/templator/genQueryComponent.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,8 +36,8 @@ const utils_1 = require("./utils");
|
|
|
36
36
|
*/
|
|
37
37
|
function genSelectTemplate(property, nameGroup) {
|
|
38
38
|
return `<u-select clearable placeholder="请选择" ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
|
|
39
|
-
text-field="${nameGroup.
|
|
40
|
-
value-field="${nameGroup.
|
|
39
|
+
text-field="${nameGroup.lowerEntity}.${property.name}"
|
|
40
|
+
value-field="${nameGroup.lowerEntity}.id" :pageable="true" :remote-paging="true">
|
|
41
41
|
</u-select>`;
|
|
42
42
|
}
|
|
43
43
|
exports.genSelectTemplate = genSelectTemplate;
|
|
@@ -50,14 +50,14 @@ exports.genSelectTemplate = genSelectTemplate;
|
|
|
50
50
|
function genH5SelectTemplate(property, nameGroup) {
|
|
51
51
|
const label = property.label || property.name;
|
|
52
52
|
return `<van-cascader title="请选择" placeholder="请选择" ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
|
|
53
|
-
text-field="${nameGroup.
|
|
54
|
-
value-field="${nameGroup.
|
|
53
|
+
text-field="${nameGroup.lowerEntity}.${property.name}"
|
|
54
|
+
value-field="${nameGroup.lowerEntity}.id" :pageable="true" :remote-paging="true" labelField="${label}">
|
|
55
55
|
</van-cascader>`;
|
|
56
56
|
}
|
|
57
57
|
exports.genH5SelectTemplate = genH5SelectTemplate;
|
|
58
58
|
function genLoadSelectLogic(entity, nameGroup, newLogic) {
|
|
59
|
-
const
|
|
60
|
-
const
|
|
59
|
+
const moduleNode = utils.findClosestModule(entity);
|
|
60
|
+
const moduleNamespace = moduleNode?.getNamespace();
|
|
61
61
|
const params = [
|
|
62
62
|
(0, _1.genLogicParam)(`${newLogic.params[0].name}`, 'params.page'),
|
|
63
63
|
(0, _1.genLogicParam)(`${newLogic.params[1].name}`, 'params.size'),
|
|
@@ -75,7 +75,7 @@ function genLoadSelectLogic(entity, nameGroup, newLogic) {
|
|
|
75
75
|
name: 'result',
|
|
76
76
|
typeAnnotation: utils_1.NaslCollectionTypeAnnotation.PageOf([
|
|
77
77
|
utils_1.NaslTypeAnnotation.Reference({
|
|
78
|
-
typeNamespace: `${
|
|
78
|
+
typeNamespace: `${moduleNamespace}.structures`,
|
|
79
79
|
typeName: nameGroup.structure,
|
|
80
80
|
}),
|
|
81
81
|
]),
|
|
@@ -89,7 +89,7 @@ function genLoadSelectLogic(entity, nameGroup, newLogic) {
|
|
|
89
89
|
name: 'result',
|
|
90
90
|
}),
|
|
91
91
|
right: utils_1.NaslLogicItem.CallLogic({
|
|
92
|
-
calleeNamespace: `${
|
|
92
|
+
calleeNamespace: `${moduleNamespace}.logics`,
|
|
93
93
|
calleeName: newLogic.name,
|
|
94
94
|
arguments: params,
|
|
95
95
|
}),
|
|
@@ -106,11 +106,12 @@ exports.genLoadSelectLogic = genLoadSelectLogic;
|
|
|
106
106
|
* @returns
|
|
107
107
|
*/
|
|
108
108
|
function genSelectBlock(entity, view) {
|
|
109
|
-
const
|
|
109
|
+
const dataSource = entity.parentNode;
|
|
110
|
+
const module = dataSource.parentNode;
|
|
110
111
|
const viewElementMainView = view.getViewElementUniqueName('select');
|
|
111
|
-
const nameGroup = (0, _1.genUniqueQueryNameGroup)(
|
|
112
|
+
const nameGroup = (0, _1.genUniqueQueryNameGroup)(module, view, viewElementMainView, false);
|
|
112
113
|
nameGroup.viewElementMainView = viewElementMainView;
|
|
113
|
-
nameGroup.
|
|
114
|
+
nameGroup.lowerEntity = utils.firstLowerCase(entity.name);
|
|
114
115
|
const displayedProperty = (0, _1.getFirstDisplayedProperty)(entity);
|
|
115
116
|
const allEntities = [
|
|
116
117
|
entity,
|
|
@@ -118,7 +119,7 @@ function genSelectBlock(entity, view) {
|
|
|
118
119
|
const newStructures = [
|
|
119
120
|
(0, _1.genQueryStructure)(allEntities, nameGroup),
|
|
120
121
|
];
|
|
121
|
-
const newLogic = (0, _1.genQueryLogic)(allEntities, nameGroup, false, false,
|
|
122
|
+
const newLogic = (0, _1.genQueryLogic)(allEntities, nameGroup, false, false, module);
|
|
122
123
|
const newLogics = [
|
|
123
124
|
newLogic,
|
|
124
125
|
];
|
|
@@ -131,16 +132,6 @@ function genSelectBlock(entity, view) {
|
|
|
131
132
|
"viewLogics": [
|
|
132
133
|
${JSON.stringify(genLoadSelectLogic(entity, nameGroup, newLogic))}
|
|
133
134
|
],
|
|
134
|
-
"viewVariables": [
|
|
135
|
-
{
|
|
136
|
-
"concept": "Variable",
|
|
137
|
-
"name": "${nameGroup.viewVariableEntity}",
|
|
138
|
-
"typeAnnotation": ${JSON.stringify(utils_1.NaslTypeAnnotation.Reference({
|
|
139
|
-
typeNamespace: entity.getNamespace(),
|
|
140
|
-
typeName: entity.name,
|
|
141
|
-
}))}
|
|
142
|
-
}
|
|
143
|
-
],
|
|
144
135
|
"logics": ${JSON.stringify(newLogics)},
|
|
145
136
|
"structures": ${JSON.stringify(newStructures)}
|
|
146
137
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"genSelectBlock.js","sourceRoot":"","sources":["../../src/templator/genSelectBlock.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sCAAmC;AACnC,gDAAkC;AAElC,wBAAmI;AACnI,mCAGiB;AAEjB;;;;;GAKG;AACH,SAAgB,iBAAiB,CAAC,QAAwB,EAAE,SAAoB;IAC5E,OAAO,8CAA8C,SAAS,CAAC,mBAAmB,mBAAmB,SAAS,CAAC,aAAa,kBAAkB,SAAS,CAAC,SAAS;kBACnJ,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"genSelectBlock.js","sourceRoot":"","sources":["../../src/templator/genSelectBlock.ts"],"names":[],"mappings":"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"}
|