@lcap/nasl 1.0.2 → 2.12.0
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.d.ts +1 -0
- package/out/automate/engine/index.js +34 -12
- package/out/automate/engine/index.js.map +1 -1
- package/out/automate/engine/operators.d.ts +10 -2
- package/out/automate/engine/operators.js +105 -7
- package/out/automate/engine/operators.js.map +1 -1
- package/out/automate/engine/uniqueName.d.ts +8 -2
- package/out/automate/engine/uniqueName.js +72 -4
- package/out/automate/engine/uniqueName.js.map +1 -1
- package/out/automate/engine/utils.d.ts +1 -0
- package/out/automate/engine/utils.js +92 -67
- package/out/automate/engine/utils.js.map +1 -1
- package/out/automate/template/process.d.ts +9 -0
- package/out/automate/template/process.js +10976 -0
- package/out/automate/template/process.js.map +1 -0
- package/out/bak/translator.js +1 -0
- package/out/bak/translator.js.map +1 -1
- package/out/common/BaseNode.d.ts +5 -0
- package/out/common/BaseNode.js +24 -3
- package/out/common/BaseNode.js.map +1 -1
- package/out/concepts/App__.d.ts +51 -49
- package/out/concepts/App__.js +86 -53
- package/out/concepts/App__.js.map +1 -1
- package/out/concepts/BindAttribute__.js +2 -2
- package/out/concepts/BindAttribute__.js.map +1 -1
- package/out/concepts/BindDirective__.js +10 -3
- package/out/concepts/BindDirective__.js.map +1 -1
- package/out/concepts/BindEvent__.js +15 -6
- package/out/concepts/BindEvent__.js.map +1 -1
- package/out/concepts/BooleanLiteral__.d.ts +4 -0
- package/out/concepts/BooleanLiteral__.js +11 -0
- package/out/concepts/BooleanLiteral__.js.map +1 -1
- package/out/concepts/CallFunction__.js +8 -2
- package/out/concepts/CallFunction__.js.map +1 -1
- package/out/concepts/CallLogic__.js +48 -30
- package/out/concepts/CallLogic__.js.map +1 -1
- package/out/concepts/CallQueryComponent__.d.ts +8 -7
- package/out/concepts/CallQueryComponent__.js +86 -76
- package/out/concepts/CallQueryComponent__.js.map +1 -1
- package/out/concepts/Comment__.js +1 -1
- package/out/concepts/Comment__.js.map +1 -1
- package/out/concepts/ConfigGroup__.d.ts +1 -0
- package/out/concepts/ConfigGroup__.js +7 -0
- package/out/concepts/ConfigGroup__.js.map +1 -1
- package/out/concepts/ConfigProperty__.d.ts +1 -0
- package/out/concepts/ConfigProperty__.js +3 -0
- package/out/concepts/ConfigProperty__.js.map +1 -1
- package/out/concepts/Configuration__.d.ts +1 -0
- package/out/concepts/Configuration__.js +3 -0
- package/out/concepts/Configuration__.js.map +1 -1
- package/out/concepts/DataSource__.d.ts +143 -0
- package/out/concepts/DataSource__.js +318 -0
- package/out/concepts/DataSource__.js.map +1 -0
- package/out/concepts/Destination__.js +8 -8
- package/out/concepts/Destination__.js.map +1 -1
- package/out/concepts/End__.js +2 -2
- package/out/concepts/End__.js.map +1 -1
- package/out/concepts/EntityIndex__.d.ts +5 -0
- package/out/concepts/EntityIndex__.js +6 -0
- package/out/concepts/EntityIndex__.js.map +1 -1
- package/out/concepts/EntityProperty__.d.ts +9 -0
- package/out/concepts/EntityProperty__.js +19 -2
- package/out/concepts/EntityProperty__.js.map +1 -1
- package/out/concepts/Entity__.d.ts +5 -0
- package/out/concepts/Entity__.js +20 -10
- package/out/concepts/Entity__.js.map +1 -1
- package/out/concepts/Enum__.js +12 -6
- package/out/concepts/Enum__.js.map +1 -1
- package/out/concepts/ForEachStatement__.js +2 -2
- package/out/concepts/ForEachStatement__.js.map +1 -1
- package/out/concepts/Function__.d.ts +18 -0
- package/out/concepts/Function__.js +96 -1
- package/out/concepts/Function__.js.map +1 -1
- package/out/concepts/Identifier__.js +6 -15
- package/out/concepts/Identifier__.js.map +1 -1
- package/out/concepts/IfStatement__.js +8 -8
- package/out/concepts/IfStatement__.js.map +1 -1
- package/out/concepts/Interface__.js +19 -12
- package/out/concepts/Interface__.js.map +1 -1
- package/out/concepts/JSBlock__.js +3 -5
- package/out/concepts/JSBlock__.js.map +1 -1
- package/out/concepts/Logic__.js +44 -44
- package/out/concepts/Logic__.js.map +1 -1
- package/out/concepts/Module__.d.ts +116 -194
- package/out/concepts/Module__.js +31 -114
- package/out/concepts/Module__.js.map +1 -1
- package/out/concepts/Namespace__.d.ts +0 -86
- package/out/concepts/Namespace__.js +1 -108
- package/out/concepts/Namespace__.js.map +1 -1
- package/out/concepts/Param__.d.ts +2 -1
- package/out/concepts/Param__.js +1 -1
- package/out/concepts/Param__.js.map +1 -1
- package/out/concepts/ProcessElement__.js +30 -10
- package/out/concepts/ProcessElement__.js.map +1 -1
- package/out/concepts/Process__.d.ts +1 -1
- package/out/concepts/Process__.js +17 -10
- package/out/concepts/Process__.js.map +1 -1
- package/out/concepts/QueryFieldExpression__.js +8 -1
- package/out/concepts/QueryFieldExpression__.js.map +1 -1
- package/out/concepts/QueryFromExpression__.d.ts +4 -0
- package/out/concepts/QueryFromExpression__.js +13 -2
- package/out/concepts/QueryFromExpression__.js.map +1 -1
- package/out/concepts/QueryJoinExpression__.d.ts +4 -0
- package/out/concepts/QueryJoinExpression__.js +14 -3
- package/out/concepts/QueryJoinExpression__.js.map +1 -1
- package/out/concepts/Return__.js +1 -1
- package/out/concepts/Return__.js.map +1 -1
- package/out/concepts/Role__.js +10 -3
- package/out/concepts/Role__.js.map +1 -1
- package/out/concepts/SqlQueryComponent__.d.ts +14 -0
- package/out/concepts/SqlQueryComponent__.js +48 -5
- package/out/concepts/SqlQueryComponent__.js.map +1 -1
- package/out/concepts/StringLiteral__.d.ts +1 -1
- package/out/concepts/StringLiteral__.js +1 -1
- package/out/concepts/StructureProperty__.js +6 -5
- package/out/concepts/StructureProperty__.js.map +1 -1
- package/out/concepts/Structure__.js +19 -12
- package/out/concepts/Structure__.js.map +1 -1
- package/out/concepts/SwitchCase__.d.ts +1 -1
- package/out/concepts/SwitchCase__.js +23 -25
- package/out/concepts/SwitchCase__.js.map +1 -1
- package/out/concepts/SwitchStatement__.js +1 -6
- package/out/concepts/SwitchStatement__.js.map +1 -1
- package/out/concepts/TypeAnnotation__.d.ts +8 -0
- package/out/concepts/TypeAnnotation__.js +44 -2
- package/out/concepts/TypeAnnotation__.js.map +1 -1
- package/out/concepts/Variable__.js +1 -1
- package/out/concepts/Variable__.js.map +1 -1
- package/out/concepts/ViewElement__.js +25 -20
- package/out/concepts/ViewElement__.js.map +1 -1
- package/out/concepts/View__.d.ts +0 -2
- package/out/concepts/View__.js +27 -32
- package/out/concepts/View__.js.map +1 -1
- package/out/concepts/WhileStatement__.js +4 -4
- package/out/concepts/WhileStatement__.js.map +1 -1
- package/out/concepts/basics/stdlib/nasl.auth.js +20 -0
- package/out/concepts/basics/stdlib/nasl.auth.js.map +1 -1
- package/out/concepts/basics/stdlib/nasl.process.d.ts +4 -0
- package/out/concepts/basics/stdlib/nasl.process.js +410 -0
- package/out/concepts/basics/stdlib/nasl.process.js.map +1 -1
- package/out/concepts/basics/stdlib/nasl.ui.js +1 -11
- package/out/concepts/basics/stdlib/nasl.ui.js.map +1 -1
- package/out/concepts/basics/stdlib/nasl.util.js +280 -2
- package/out/concepts/basics/stdlib/nasl.util.js.map +1 -1
- package/out/concepts/basics/types/index.d.ts +1 -0
- package/out/concepts/basics/types/index.js +4 -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/generator/genBundleFiles.d.ts +3 -1
- package/out/generator/genBundleFiles.js +23 -5
- package/out/generator/genBundleFiles.js.map +1 -1
- package/out/generator/genMetaData.d.ts +1 -0
- package/out/generator/genMetaData.js +20 -12
- package/out/generator/genMetaData.js.map +1 -1
- package/out/index.d.ts +1 -1
- package/out/index.js +2 -1
- package/out/index.js.map +1 -1
- package/out/server/createUiTs.js +1 -0
- package/out/server/createUiTs.js.map +1 -1
- package/out/server/getLogics.js +27 -1
- package/out/server/getLogics.js.map +1 -1
- package/out/server/getMemberIdentifier.js +5 -0
- package/out/server/getMemberIdentifier.js.map +1 -1
- package/out/server/getProcesses.d.ts +4 -0
- package/out/server/getProcesses.js +69 -1
- package/out/server/getProcesses.js.map +1 -1
- package/out/server/naslServer.d.ts +1 -0
- package/out/server/naslServer.js +223 -26
- 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.js +37 -1
- package/out/server/translator.js.map +1 -1
- package/out/service/creator/errHandles.js +5 -0
- package/out/service/creator/errHandles.js.map +1 -1
- package/out/service/storage/init.d.ts +1 -0
- package/out/service/storage/init.js +95 -84
- package/out/service/storage/init.js.map +1 -1
- package/out/templator/genCreateBlock.js +34 -24
- package/out/templator/genCreateBlock.js.map +1 -1
- package/out/templator/genCurdEditMultipleKeyBlock.js +28 -18
- package/out/templator/genCurdEditMultipleKeyBlock.js.map +1 -1
- package/out/templator/genCurdMultipleKeyBlock.js +45 -29
- package/out/templator/genCurdMultipleKeyBlock.js.map +1 -1
- package/out/templator/genEditTableBlock.js +15 -13
- package/out/templator/genEditTableBlock.js.map +1 -1
- package/out/templator/genEnumSelectBlock.js +1 -1
- package/out/templator/genEnumSelectBlock.js.map +1 -1
- package/out/templator/genGridViewBlock.js +29 -24
- package/out/templator/genGridViewBlock.js.map +1 -1
- package/out/templator/genListViewBlock.js +7 -5
- package/out/templator/genListViewBlock.js.map +1 -1
- package/out/templator/genQueryComponent.js +25 -26
- package/out/templator/genQueryComponent.js.map +1 -1
- package/out/templator/genSelectBlock.js +8 -7
- package/out/templator/genSelectBlock.js.map +1 -1
- package/out/templator/genTableBlock.js +31 -21
- package/out/templator/genTableBlock.js.map +1 -1
- package/out/templator/genUpdateBlock.js +34 -24
- package/out/templator/genUpdateBlock.js.map +1 -1
- package/out/templator/utils.d.ts +2 -2
- 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 +5 -0
- package/out/utils/index.js +50 -1
- package/out/utils/index.js.map +1 -1
- package/package.json +1 -1
- package/src/automate/engine/index.js +33 -8
- package/src/automate/engine/operators.js +114 -17
- package/src/automate/engine/uniqueName.js +77 -9
- package/src/automate/engine/utils.js +95 -68
- package/src/automate/template/process.js +10999 -0
- package/src/bak/translator.js +1 -0
- package/src/common/BaseNode.ts +21 -4
- package/src/concepts/App__.ts +128 -94
- package/src/concepts/BindAttribute__.ts +2 -2
- package/src/concepts/BindDirective__.ts +9 -7
- package/src/concepts/BindEvent__.ts +14 -6
- package/src/concepts/BooleanLiteral__.ts +12 -0
- package/src/concepts/CallFunction__.ts +6 -2
- package/src/concepts/CallLogic__.ts +47 -32
- package/src/concepts/CallQueryComponent__.ts +92 -81
- package/src/concepts/Comment__.ts +1 -1
- package/src/concepts/ConfigGroup__.ts +3 -1
- package/src/concepts/ConfigProperty__.ts +4 -0
- package/src/concepts/Configuration__.ts +3 -0
- package/src/concepts/DataSource__.ts +391 -0
- package/src/concepts/Destination__.ts +24 -8
- package/src/concepts/End__.ts +2 -2
- package/src/concepts/EntityIndex__.ts +7 -0
- package/src/concepts/EntityProperty__.ts +20 -2
- package/src/concepts/Entity__.ts +23 -11
- package/src/concepts/Enum__.ts +25 -6
- package/src/concepts/ForEachStatement__.ts +2 -2
- package/src/concepts/Function__.ts +95 -1
- package/src/concepts/Identifier__.ts +15 -15
- package/src/concepts/IfStatement__.ts +9 -9
- package/src/concepts/Interface__.ts +20 -12
- package/src/concepts/JSBlock__.ts +3 -12
- package/src/concepts/Logic__.ts +45 -79
- package/src/concepts/Module__.ts +141 -342
- package/src/concepts/Namespace__.ts +1 -204
- package/src/concepts/Param__.ts +3 -2
- package/src/concepts/ProcessElement__.ts +33 -12
- package/src/concepts/Process__.ts +18 -12
- package/src/concepts/QueryFieldExpression__.ts +9 -1
- package/src/concepts/QueryFromExpression__.ts +13 -2
- package/src/concepts/QueryJoinExpression__.ts +14 -3
- package/src/concepts/Return__.ts +1 -1
- package/src/concepts/Role__.ts +10 -4
- package/src/concepts/SqlQueryComponent__.ts +47 -11
- package/src/concepts/StringLiteral__.ts +1 -1
- package/src/concepts/StructureProperty__.ts +6 -9
- package/src/concepts/Structure__.ts +19 -11
- package/src/concepts/SwitchCase__.ts +23 -27
- package/src/concepts/SwitchStatement__.ts +1 -5
- package/src/concepts/TypeAnnotation__.ts +43 -2
- package/src/concepts/Variable__.ts +1 -1
- package/src/concepts/ViewElement__.ts +26 -39
- package/src/concepts/View__.ts +29 -34
- package/src/concepts/WhileStatement__.ts +4 -4
- package/src/concepts/basics/stdlib/nasl.auth.ts +20 -0
- package/src/concepts/basics/stdlib/nasl.process.ts +406 -0
- package/src/concepts/basics/stdlib/nasl.ui.ts +1 -11
- package/src/concepts/basics/stdlib/nasl.util.ts +281 -2
- package/src/concepts/basics/types/index.ts +1 -0
- package/src/concepts/index__.ts +1 -0
- package/src/generator/genBundleFiles.ts +28 -7
- package/src/generator/genMetaData.ts +22 -13
- package/src/index.ts +1 -1
- package/src/server/createUiTs.ts +1 -0
- package/src/server/getLogics.ts +29 -4
- package/src/server/getMemberIdentifier.ts +4 -0
- package/src/server/getProcesses.ts +68 -0
- package/src/server/naslServer.ts +227 -30
- package/src/server/process2LogicNamespace.ts +29 -19
- package/src/server/translator.ts +39 -1
- package/src/service/creator/errHandles.js +6 -0
- package/src/service/storage/init.ts +97 -86
- package/src/templator/genCreateBlock.ts +35 -26
- package/src/templator/genCurdEditMultipleKeyBlock.ts +29 -21
- package/src/templator/genCurdMultipleKeyBlock.ts +46 -31
- package/src/templator/genEditTableBlock.ts +17 -14
- package/src/templator/genEnumSelectBlock.ts +1 -1
- package/src/templator/genGridViewBlock.ts +30 -25
- package/src/templator/genListViewBlock.ts +10 -7
- package/src/templator/genQueryComponent.ts +28 -27
- package/src/templator/genSelectBlock.ts +9 -8
- package/src/templator/genTableBlock.ts +32 -23
- package/src/templator/genUpdateBlock.ts +35 -25
- package/src/templator/utils.ts +2 -2
- package/src/test/integration/connect-file.ts +6 -6
- package/src/translator/index.ts +1 -1
- package/src/utils/index.ts +51 -0
|
@@ -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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"}
|
|
@@ -60,7 +60,8 @@ function genH5ListViewTemplate(property, nameGroup) {
|
|
|
60
60
|
exports.genH5ListViewTemplate = genH5ListViewTemplate;
|
|
61
61
|
function genLoadListViewLogic(entity, nameGroup, newStructures, newLogics) {
|
|
62
62
|
const parentNode = entity.parentNode;
|
|
63
|
-
const
|
|
63
|
+
const moduleNode = utils.findClosestModule(entity);
|
|
64
|
+
const moduleNamespace = moduleNode?.getNamespace();
|
|
64
65
|
// Select 和 table 不一样，直接在内部产生了
|
|
65
66
|
const entityStructure = (0, _1.genQueryStructure)([entity], nameGroup);
|
|
66
67
|
const entityLogic = (0, _1.genQueryLogic)([entity], nameGroup, false, false, parentNode);
|
|
@@ -79,7 +80,7 @@ function genLoadListViewLogic(entity, nameGroup, newStructures, newLogics) {
|
|
|
79
80
|
name: 'result',
|
|
80
81
|
typeAnnotation: utils_1.NaslCollectionTypeAnnotation.PageOf([
|
|
81
82
|
utils_1.NaslTypeAnnotation.Reference({
|
|
82
|
-
typeNamespace: `${
|
|
83
|
+
typeNamespace: `${moduleNamespace}.structures`,
|
|
83
84
|
typeName: nameGroup.structure,
|
|
84
85
|
}),
|
|
85
86
|
]),
|
|
@@ -93,7 +94,7 @@ function genLoadListViewLogic(entity, nameGroup, newStructures, newLogics) {
|
|
|
93
94
|
name: 'result',
|
|
94
95
|
}),
|
|
95
96
|
right: utils_1.NaslLogicItem.CallLogic({
|
|
96
|
-
calleeNamespace: `${
|
|
97
|
+
calleeNamespace: `${moduleNamespace}.logics`,
|
|
97
98
|
calleeName: entityLogic.name,
|
|
98
99
|
arguments: [
|
|
99
100
|
(0, _1.genLogicParam)(`${entityLogic.params[0].name}`, 'params.page'),
|
|
@@ -110,9 +111,10 @@ exports.genLoadListViewLogic = genLoadListViewLogic;
|
|
|
110
111
|
* 生成实体选择框区块
|
|
111
112
|
*/
|
|
112
113
|
function genListViewBlock(entity, view, property) {
|
|
113
|
-
const
|
|
114
|
+
const dataSource = entity.parentNode;
|
|
115
|
+
const module = dataSource.parentNode;
|
|
114
116
|
const viewElementMainView = view.getViewElementUniqueName('listView');
|
|
115
|
-
const nameGroup = (0, _1.genUniqueQueryNameGroup)(
|
|
117
|
+
const nameGroup = (0, _1.genUniqueQueryNameGroup)(module, view, viewElementMainView, false);
|
|
116
118
|
nameGroup.viewElementMainView = viewElementMainView;
|
|
117
119
|
nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
|
|
118
120
|
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":";;;;;;;;;;;;;;;;;;;;;;;;;;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,UAAsC,CAAC;IAEjE,MAAM,UAAU,GAAG,KAAK,CAAC,iBAAiB,CAAC,MAAM,CAAiB,CAAC;IACnE,MAAM,eAAe,GAAG,UAAU,EAAE,YAAY,EAAE,CAAC;IAEnD,8BAA8B;IAC9B,MAAM,eAAe,GAAG,IAAA,oBAAiB,EAAC,CAAC,MAAM,CAAC,EAAE,SAAS,CAAC,CAAC;IAC/D,MAAM,WAAW,GAAG,IAAA,gBAAa,EAAC,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;IACjF,aAAa,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IACpC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAE5B,OAAO,gBAAQ,CAAC,KAAK,CAAC;QAClB,IAAI,EAAE,SAAS,CAAC,aAAa;QAC7B,MAAM,EAAE;YACJ,gBAAQ,CAAC,KAAK,CAAC;gBACX,IAAI,EAAE,QAAQ;gBACd,cAAc,EAAE,4BAAoB,CAAC,gBAAgB;aACxD,CAAC;SACL;QACD,OAAO,EAAE;YACL,gBAAQ,CAAC,MAAM,CAAC;gBACZ,IAAI,EAAE,QAAQ;gBACd,cAAc,EAAE,oCAA4B,CAAC,MAAM,CAAC;oBAChD,0BAAkB,CAAC,SAAS,CAAC;wBACzB,aAAa,EAAE,GAAG,eAAe,aAAa;wBAC9C,QAAQ,EAAE,SAAS,CAAC,SAAS;qBAChC,CAAC;iBACL,CAAC;aACL,CAAC;SACL;QACD,SAAS,EAAE,EAAgB;QAC3B,IAAI,EAAE;YACF,qBAAa,CAAC,KAAK;YACnB,qBAAa,CAAC,UAAU,CAAC;gBACrB,IAAI,EAAE,qBAAa,CAAC,UAAU,CAAC;oBAC3B,IAAI,EAAE,QAAQ;iBACjB,CAAC;gBACF,KAAK,EAAE,qBAAa,CAAC,SAAS,CAAC;oBAC3B,eAAe,EAAE,GAAG,eAAe,SAAS;oBAC5C,UAAU,EAAE,WAAW,CAAC,IAAI;oBAC5B,SAAS,EAAE;wBACP,IAAA,gBAAa,EAAC,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,aAAa,CAAC;wBAC7D,IAAA,gBAAa,EAAC,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,aAAa,CAAC;qBAChE;iBACJ,CAAC;aACL,CAAC;YACF,qBAAa,CAAC,GAAG;SACpB;KACJ,CAAC,CAAC;AACP,CAAC;AAlDD,oDAkDC;AAED;;GAEG;AACH,SAAgB,gBAAgB,CAAC,MAAc,EAAE,IAAU,EAAE,QAAwB;IACjF,MAAM,UAAU,GAAG,MAAM,CAAC,UAAwB,CAAC;IACnD,MAAM,MAAM,GAAG,UAAU,CAAC,UAAsC,CAAC;IAEjE,MAAM,mBAAmB,GAAG,IAAI,CAAC,wBAAwB,CAAC,UAAU,CAAC,CAAC;IACtE,MAAM,SAAS,GAAG,IAAA,0BAAuB,EAAC,MAAM,EAAE,IAAI,EAAE,mBAAmB,EAAE,KAAK,CAAC,CAAC;IACpF,SAAS,CAAC,mBAAmB,GAAG,mBAAmB,CAAC;IACpD,SAAS,CAAC,kBAAkB,GAAG,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAE7F,MAAM,iBAAiB,GAAG,QAAQ,IAAI,IAAA,4BAAyB,EAAC,MAAM,CAAC,CAAC;IAExE,MAAM,aAAa,GAAe,EAAE,CAAC;IACrC,MAAM,SAAS,GAAe,EAAE,CAAC;IAEjC,OAAO;MACL,eAAM,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,qBAAqB,CAAC,iBAAiB,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,iBAAiB,EAAE,SAAS,CAAC;;;;;;UAM3H,IAAI,CAAC,SAAS,CAAC,oBAAoB,CAAC,MAAM,EAAE,SAAS,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC;;;gBAG3E,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC;oBACrB,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC;;;CAGhD,CAAC;AACF,CAAC;AA7BD,4CA6BC;AAED,kBAAe,gBAAgB,CAAC"}
|
|
@@ -87,34 +87,32 @@ 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,
|
|
95
95
|
joinParts: allEntities.map((relationEntity) => {
|
|
96
|
-
const
|
|
96
|
+
const onExpressions = entity.properties?.filter((property) => property.relationEntity === relationEntity.name).map((leftProperty) => utils_1.NaslLogicItem.BinaryExpression({
|
|
97
|
+
operator: '==',
|
|
98
|
+
left: utils_1.NaslQueryExpression.QueryFieldExpression({
|
|
99
|
+
label: '查询组件实体属性',
|
|
100
|
+
isDotStar: false,
|
|
101
|
+
entityAsName: entity.name,
|
|
102
|
+
propertyName: leftProperty.name,
|
|
103
|
+
}),
|
|
104
|
+
right: utils_1.NaslQueryExpression.QueryFieldExpression({
|
|
105
|
+
label: '查询组件实体属性',
|
|
106
|
+
isDotStar: false,
|
|
107
|
+
entityAsName: relationEntity.name,
|
|
108
|
+
propertyName: leftProperty.relationProperty,
|
|
109
|
+
}),
|
|
110
|
+
}));
|
|
97
111
|
return utils_1.NaslQueryExpression.QueryJoinExpression({
|
|
98
112
|
entityNamespace: relationEntity.getNamespace(),
|
|
99
113
|
entityName: relationEntity.name,
|
|
100
114
|
joinType: 'LEFT',
|
|
101
|
-
onExpressions
|
|
102
|
-
utils_1.NaslLogicItem.BinaryExpression({
|
|
103
|
-
operator: '==',
|
|
104
|
-
left: utils_1.NaslQueryExpression.QueryFieldExpression({
|
|
105
|
-
label: '查询组件实体属性',
|
|
106
|
-
isDotStar: false,
|
|
107
|
-
entityAsName: entity.name,
|
|
108
|
-
propertyName: leftProperty.name,
|
|
109
|
-
}),
|
|
110
|
-
right: utils_1.NaslQueryExpression.QueryFieldExpression({
|
|
111
|
-
label: '查询组件实体属性',
|
|
112
|
-
isDotStar: false,
|
|
113
|
-
entityAsName: relationEntity.name,
|
|
114
|
-
propertyName: leftProperty.relationProperty,
|
|
115
|
-
}),
|
|
116
|
-
}),
|
|
117
|
-
],
|
|
115
|
+
onExpressions,
|
|
118
116
|
joinParts: [],
|
|
119
117
|
});
|
|
120
118
|
}),
|
|
@@ -129,7 +127,7 @@ function genQueryAssignment(allEntities, nameGroup, supportFilter, supportSort)
|
|
|
129
127
|
ideVersion: '2.11',
|
|
130
128
|
typeAnnotation: utils_1.NaslCollectionTypeAnnotation.PageOf([
|
|
131
129
|
utils_1.NaslTypeAnnotation.Reference({
|
|
132
|
-
typeNamespace: `${
|
|
130
|
+
typeNamespace: `${moduleNamespace}.structures`,
|
|
133
131
|
typeName: nameGroup.structure,
|
|
134
132
|
}),
|
|
135
133
|
]),
|
|
@@ -170,7 +168,9 @@ function genQueryAssignment(allEntities, nameGroup, supportFilter, supportSort)
|
|
|
170
168
|
}
|
|
171
169
|
exports.genQueryAssignment = genQueryAssignment;
|
|
172
170
|
function genQueryLogic(allEntities, nameGroup, supportFilter, supportSort, parentNode) {
|
|
173
|
-
const
|
|
171
|
+
const entity = allEntities?.[0];
|
|
172
|
+
const moduleNode = utils.findClosestModule(entity);
|
|
173
|
+
const moduleNamespace = moduleNode?.getNamespace();
|
|
174
174
|
const logic = utils_1.NaslNode.Logic({
|
|
175
175
|
name: nameGroup.logic,
|
|
176
176
|
description: '',
|
|
@@ -189,7 +189,7 @@ function genQueryLogic(allEntities, nameGroup, supportFilter, supportSort, paren
|
|
|
189
189
|
name: 'result',
|
|
190
190
|
typeAnnotation: utils_1.NaslCollectionTypeAnnotation.PageOf([
|
|
191
191
|
utils_1.NaslTypeAnnotation.Reference({
|
|
192
|
-
typeNamespace: `${
|
|
192
|
+
typeNamespace: `${moduleNamespace}.structures`,
|
|
193
193
|
typeName: nameGroup.structure,
|
|
194
194
|
}),
|
|
195
195
|
]),
|
|
@@ -208,7 +208,6 @@ function genQueryLogic(allEntities, nameGroup, supportFilter, supportSort, paren
|
|
|
208
208
|
typeAnnotation: utils_1.NaslCoreTypeAnnotation.String,
|
|
209
209
|
}));
|
|
210
210
|
}
|
|
211
|
-
const entity = allEntities?.[0];
|
|
212
211
|
if (supportFilter && entity) {
|
|
213
212
|
logic.params.push(utils_1.NaslNode.Param({
|
|
214
213
|
name: 'filter',
|
|
@@ -222,11 +221,11 @@ function genQueryLogic(allEntities, nameGroup, supportFilter, supportSort, paren
|
|
|
222
221
|
}
|
|
223
222
|
exports.genQueryLogic = genQueryLogic;
|
|
224
223
|
async function joinEntity(callQueryComponent, entity, recordStructure) {
|
|
225
|
-
const
|
|
224
|
+
const dataSource = entity.parentNode;
|
|
226
225
|
const from = callQueryComponent.from;
|
|
227
226
|
let joinInfo;
|
|
228
227
|
// 无法判断用户行为，优先加有关系的
|
|
229
|
-
const lastEntity =
|
|
228
|
+
const lastEntity = dataSource.findEntityByName(from.entityName);
|
|
230
229
|
// lastEntity 和 entity Join
|
|
231
230
|
// 判断要不要自动关联 onExpression
|
|
232
231
|
// 一般左联是自动有的了
|
|
@@ -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":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAkC;AAClC,0CAAgJ;AAChJ,mCAA4J;AAE5J,SAAgB,iBAAiB,CAAC,WAA0B,EAAE,SAAoB;IAC9E,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC;IAC/C,OAAO,gBAAQ,CAAC,SAAS,CAAC;QACtB,IAAI,EAAE,SAAS,CAAC,SAAS;QACzB,MAAM,EAAE,oBAAoB;QAC5B,UAAU,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CACnC,gBAAQ,CAAC,iBAAiB,CAAC;YACvB,IAAI,EAAE,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC;YACvC,cAAc,EAAE,0BAAkB,CAAC,SAAS,CAAC;gBACzC,aAAa,EAAE,MAAM,CAAC,YAAY,EAAE;gBACpC,QAAQ,EAAE,MAAM,CAAC,IAAI;aACxB,CAAC;SACL,CAAC,CAAC;KACV,CAAC,CAAC;AACP,CAAC;AAdD,8CAcC;AAED,SAAS,kBAAkB,CAAC,MAAc;IACtC,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IACtF,MAAM,WAAW,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;QAC5C,MAAM,GAAG,GAAG,qBAAa,CAAC,gBAAgB,CAAC;YACvC,IAAI,EAAE,2BAAmB,CAAC,oBAAoB,CAAC;gBAC3C,KAAK,EAAE,UAAU;gBACjB,SAAS,EAAE,KAAK;gBAChB,YAAY,EAAE,MAAM,CAAC,IAAI;gBACzB,YAAY,EAAE,QAAQ,CAAC,IAAI;aAC9B,CAAC;YACF,KAAK,EAAE,qBAAa,CAAC,gBAAgB,CAAC;gBAClC,MAAM,EAAE,qBAAa,CAAC,UAAU,CAAC;oBAC7B,IAAI,EAAE,QAAQ;iBACjB,CAAC;gBACF,QAAQ,EAAE,qBAAa,CAAC,UAAU,CAAC;oBAC/B,IAAI,EAAE,QAAQ,CAAC,IAAI;iBACtB,CAAC;aACL,CAAC;YACF,QAAQ,EAAE,IAAI;SACjB,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,CAAC,cAAc,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE;YAC3F,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE;gBACf,QAAQ,EAAE,MAAM;aACnB,CAAC,CAAC;SACN;QACD,OAAO,GAAG,CAAC;IACf,CAAC,CAAC,CAAC;IAEH,SAAS,cAAc,CAAC,GAAkB;QACtC,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC;YACf,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC;QAElB,MAAM,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC;QACvB,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,CAAC;QACrB,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;QAC/B,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC7B,OAAO,qBAAa,CAAC,gBAAgB,CAAC;YAClC,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,cAAc,CAAC,IAAI,CAAC;YAC1B,KAAK,EAAE,cAAc,CAAC,KAAK,CAAC;SAC/B,CAAC,CAAC;IACP,CAAC;IACD,OAAO,cAAc,CAAC,WAAW,CAAC,CAAC;AACvC,CAAC;AAED,SAAgB,kBAAkB,CAAC,WAA0B,EAAE,SAAoB,EAAE,aAAsB,EAAE,WAAoB;IAC7H,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACtC,MAAM,MAAM,GAAG,WAAW,CAAC,KAAK,EAAE,CAAC;IACnC,MAAM,UAAU,GAAG,KAAK,CAAC,iBAAiB,CAAC,MAAM,CAAiB,CAAC;IACnE,MAAM,eAAe,GAAG,UAAU,EAAE,YAAY,EAAE,CAAC;IAEnD,MAAM,IAAI,GAAG,2BAAmB,CAAC,mBAAmB,CAAC;QACjD,eAAe,EAAE,MAAM,CAAC,YAAY,EAAE;QACtC,UAAU,EAAE,MAAM,CAAC,IAAI;QACvB,SAAS,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,cAAc,EAAE,EAAE;YAC1C,MAAM,aAAa,GAAG,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,cAAc,KAAK,cAAc,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,qBAAa,CAAC,gBAAgB,CAAC;gBAChK,QAAQ,EAAE,IAAI;gBACd,IAAI,EAAE,2BAAmB,CAAC,oBAAoB,CAAC;oBAC3C,KAAK,EAAE,UAAU;oBACjB,SAAS,EAAE,KAAK;oBAChB,YAAY,EAAE,MAAM,CAAC,IAAI;oBACzB,YAAY,EAAE,YAAY,CAAC,IAAI;iBAClC,CAAC;gBACF,KAAK,EAAE,2BAAmB,CAAC,oBAAoB,CAAC;oBAC5C,KAAK,EAAE,UAAU;oBACjB,SAAS,EAAE,KAAK;oBAChB,YAAY,EAAE,cAAc,CAAC,IAAI;oBACjC,YAAY,EAAE,YAAY,CAAC,gBAAgB;iBAC9C,CAAC;aACL,CAAC,CAAC,CAAC;YACJ,OAAO,2BAAmB,CAAC,mBAAmB,CAAC;gBAC3C,eAAe,EAAE,cAAc,CAAC,YAAY,EAAE;gBAC9C,UAAU,EAAE,cAAc,CAAC,IAAI;gBAC/B,QAAQ,EAAE,MAAM;gBAChB,aAAa;gBACb,SAAS,EAAE,EAAE;aAChB,CAAC,CAAC;QACP,CAAC,CAAC;KACL,CAAC,CAAC;IACH,MAAM,KAAK,GAAQ,aAAa,CAAC,CAAC,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC1E,OAAO,qBAAa,CAAC,UAAU,CAAC;QAC5B,IAAI,EAAE,qBAAa,CAAC,UAAU,CAAC;YAC3B,IAAI,EAAE,QAAQ;SACjB,CAAC;QACF,KAAK,EAAE,2BAAmB,CAAC,kBAAkB,CAAC;YAC1C,KAAK,EAAE,MAAM;YACb,UAAU,EAAE,MAAM;YAClB,cAAc,EAAE,oCAA4B,CAAC,MAAM,CAAC;gBAChD,0BAAkB,CAAC,SAAS,CAAC;oBACzB,aAAa,EAAE,GAAG,eAAe,aAAa;oBAC9C,QAAQ,EAAE,SAAS,CAAC,SAAS;iBAChC,CAAC;aACL,CAAC;YACF,MAAM,EAAE,2BAAmB,CAAC,qBAAqB,CAAC;gBAC9C,KAAK,EAAE,cAAc;gBACrB,QAAQ,EAAE,KAAK;gBACf,IAAI,EAAE,IAAI;gBACV,cAAc,EAAE,EAAE;aACrB,CAAC;YACF,IAAI;YACJ,KAAK;YACL,OAAO,EAAE,EAAE;YACX,MAAM,EAAE,IAAI;YACZ,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC;gBACnB,2BAAmB,CAAC,sBAAsB,CAAC;oBACvC,KAAK,EAAE,eAAe;oBACtB,KAAK,EAAE,qBAAa,CAAC,UAAU,CAAC;wBAC5B,IAAI,EAAE,OAAO;qBAChB,CAAC;oBACF,YAAY,EAAE,qBAAa,CAAC,UAAU,CAAC;wBACnC,IAAI,EAAE,MAAM;qBACf,CAAC;iBACL,CAAC;aACL,CAAC,CAAC,CAAC,EAAE;YACN,SAAS,EAAE,SAAS,CAAC,KAAK;YAC1B,aAAa,EAAE,SAAS,CAAC,SAAS;YAClC,KAAK,EAAE,2BAAmB,CAAC,oBAAoB,CAAC;gBAC5C,KAAK,EAAE,eAAe;gBACtB,WAAW,EAAE,qBAAa,CAAC,UAAU,CAAC;oBAClC,IAAI,EAAE,MAAM;iBACf,CAAC;gBACF,eAAe,EAAE,qBAAa,CAAC,UAAU,CAAC;oBACtC,IAAI,EAAE,MAAM;iBACf,CAAC;aACL,CAAC;SACL,CAAC;KACL,CAAC,CAAC;AACP,CAAC;AAlFD,gDAkFC;AAED,SAAgB,aAAa,CAAC,WAA0B,EAAE,SAAoB,EAAE,aAAsB,EAAE,WAAoB,EAAE,UAAe;IACzI,MAAM,MAAM,GAAG,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC;IAChC,MAAM,UAAU,GAAG,KAAK,CAAC,iBAAiB,CAAC,MAAM,CAAiB,CAAC;IACnE,MAAM,eAAe,GAAG,UAAU,EAAE,YAAY,EAAE,CAAC;IAEnD,MAAM,KAAK,GAAG,gBAAQ,CAAC,KAAK,CAAC;QACzB,IAAI,EAAE,SAAS,CAAC,KAAK;QACrB,WAAW,EAAE,EAAE;QACf,MAAM,EAAE;YACJ,gBAAQ,CAAC,KAAK,CAAC;gBACX,IAAI,EAAE,MAAM;gBACZ,cAAc,EAAE,8BAAsB,CAAC,OAAO;aACjD,CAAC;YACF,gBAAQ,CAAC,KAAK,CAAC;gBACX,IAAI,EAAE,MAAM;gBACZ,cAAc,EAAE,8BAAsB,CAAC,OAAO;aACjD,CAAC;SACL;QACD,OAAO,EAAE;YACL,gBAAQ,CAAC,MAAM,CAAC;gBACZ,IAAI,EAAE,QAAQ;gBACd,cAAc,EAAE,oCAA4B,CAAC,MAAM,CAAC;oBAChD,0BAAkB,CAAC,SAAS,CAAC;wBACzB,aAAa,EAAE,GAAG,eAAe,aAAa;wBAC9C,QAAQ,EAAE,SAAS,CAAC,SAAS;qBAChC,CAAC;iBACL,CAAC;aACL,CAAC;SACL;QACD,SAAS,EAAE,EAAgB;QAC3B,IAAI,EAAE,CAAC,qBAAa,CAAC,KAAK,EAAE,kBAAkB,CAAC,WAAW,EAAE,SAAS,EAAE,aAAa,EAAE,WAAW,CAAC,EAAE,qBAAa,CAAC,GAAG,CAAC;QACtH,UAAU,EAAE,EAAgB;KAC/B,CAAC,CAAC;IACH,IAAI,WAAW,EAAE;QACb,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAQ,CAAC,KAAK,CAAC;YAC7B,IAAI,EAAE,MAAM;YACZ,cAAc,EAAE,8BAAsB,CAAC,MAAM;SAChD,CAAC,EAAE,gBAAQ,CAAC,KAAK,CAAC;YACf,IAAI,EAAE,OAAO;YACb,cAAc,EAAE,8BAAsB,CAAC,MAAM;SAChD,CAAC,CAAC,CAAC;KACP;IAED,IAAI,aAAa,IAAI,MAAM,EAAE;QACzB,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAQ,CAAC,KAAK,CAAC;YAC7B,IAAI,EAAE,QAAQ;YACd,cAAc,EAAE,0BAAkB,CAAC,SAAS,CAAC;gBACzC,aAAa,EAAE,MAAM,CAAC,YAAY,EAAE;gBACpC,QAAQ,EAAE,MAAM,CAAC,IAAI;aACxB,CAAC;SACL,CAAQ,CAAC,CAAC;KACd;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AArDD,sCAqDC;AAEM,KAAK,UAAU,UAAU,CAAC,kBAAsC,EAAE,MAAc,EAAE,eAA0B;IAC/G,MAAM,UAAU,GAAG,MAAM,CAAC,UAAwB,CAAC;IACnD,MAAM,IAAI,GAAG,kBAAkB,CAAC,IAAI,CAAC;IACrC,IAAI,QAAQ,CAAC;IACb,mBAAmB;IACnB,MAAM,UAAU,GAAG,UAAU,CAAC,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAChE,2BAA2B;IAC3B,yBAAyB;IACzB,aAAa;IACb,MAAM,aAAa,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,cAAc,KAAK,UAAU,CAAC,IAAI,CAAC,CAAC;IACxG,IAAI,aAAa,EAAE;QACf,MAAM,YAAY,GAAG,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,KAAK,aAAa,CAAC,gBAAgB,CAAC,CAAC;QAChH,QAAQ,GAAG;YACP,YAAY;YACZ,aAAa;SAChB,CAAC;KACL;SAAM;QACH,MAAM,YAAY,GAAG,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,cAAc,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC;QACvG,IAAI,YAAY,EAAE;YACd,MAAM,aAAa,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,KAAK,YAAY,CAAC,gBAAgB,CAAC,CAAC;YAC5G,QAAQ,GAAG;gBACP,YAAY;gBACZ,aAAa;aAChB,CAAC;SACL;KACJ;IACD,MAAM,mBAAmB,GAAG,2BAAmB,CAAC,mBAAmB,CAAC;QAChE,QAAQ,EAAE,MAAM;QAChB,eAAe,EAAE,MAAM,CAAC,YAAY,EAAE;QACtC,UAAU,EAAE,MAAM,CAAC,IAAI;QACvB,SAAS,EAAE,EAAE;QACb,aAAa,EAAE,EAAE;KACpB,CAAC,CAAC;IACH,IAAI,QAAQ,EAAE;QACV,mBAAmB,CAAC,aAAa,CAAC,IAAI,CAAC,qBAAa,CAAC,gBAAgB,CAAC;YAClE,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,2BAAmB,CAAC,oBAAoB,CAAC;gBAC3C,KAAK,EAAE,UAAU;gBACjB,SAAS,EAAE,KAAK;gBAChB,YAAY,EAAE,QAAQ,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI;gBAC/C,YAAY,EAAE,QAAQ,CAAC,YAAY,CAAC,IAAI;aAC3C,CAAC;YACF,KAAK,EAAE,2BAAmB,CAAC,oBAAoB,CAAC;gBAC5C,KAAK,EAAE,UAAU;gBACjB,SAAS,EAAE,KAAK;gBAChB,YAAY,EAAE,QAAQ,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI;gBAChD,YAAY,EAAE,QAAQ,CAAC,aAAa,CAAC,IAAI;aAC5C,CAAC;SACL,CAAC,CAAC,CAAC;QACJ,MAAM,iBAAiB,GAAG,4BAAiB,CAAC,IAAI,CAAC,gBAAQ,CAAC,iBAAiB,CAAC;YACxE,IAAI,EAAE,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC;YACvC,cAAc,EAAE,0BAAkB,CAAC,SAAS,CAAC;gBACzC,aAAa,EAAE,MAAM,CAAC,YAAY,EAAE;gBACpC,QAAQ,EAAE,MAAM,CAAC,IAAI;aACxB,CAAC;SACL,CAAC,EAAE,eAAe,EAAE,YAAY,CAAC,CAAC;QACnC,eAAe,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC;KAClD;SAAM;QACH,mBAAmB,CAAC,aAAa,CAAC,IAAI,CAAC,qBAAa,CAAC,gBAAgB,CAAC;YAClE,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,2BAAmB,CAAC,oBAAoB,CAAC;gBAC3C,KAAK,EAAE,UAAU;gBACjB,SAAS,EAAE,KAAK;gBAChB,YAAY,EAAE,UAAU,CAAC,IAAI;aAChC,CAAC;YACF,KAAK,EAAE,2BAAmB,CAAC,oBAAoB,CAAC;gBAC5C,KAAK,EAAE,UAAU;gBACjB,SAAS,EAAE,KAAK;gBAChB,YAAY,EAAE,MAAM,CAAC,IAAI;aAC5B,CAAC;SACL,CAAC,CAAC,CAAC;KACP;IACD,MAAM,oBAAoB,GAAG,8BAAmB,CAAC,IAAI,CAAC,mBAAmB,EAAE,kBAAkB,EAAE,WAAW,CAAC,CAAC;IAC5G,IAAI,CAAC,WAAW,CAAC,oBAAoB,CAAC,CAAC;IACvC,kBAAkB,CAAC,aAAa,EAAE,CAAC;AACvC,CAAC;AA3ED,gCA2EC;AAED,kBAAe,kBAAkB,CAAC;AAElC,SAAgB,qBAAqB,CAAC,WAA0B,EAAE,SAAoB;IAClF,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC;IAC/C,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAC1C,gBAAQ,CAAC,iBAAiB,CAAC;QACvB,IAAI,EAAE,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC;QACvC,cAAc,EAAE,0BAAkB,CAAC,SAAS,CAAC;YACzC,aAAa,EAAE,MAAM,CAAC,YAAY,EAAE;YACpC,QAAQ,EAAE,MAAM,CAAC,IAAI;SACxB,CAAC;KACL,CAAC,CAAC,CAAC;IACR,UAAU,CAAC,IAAI,CAAC,gBAAQ,CAAC,iBAAiB,CAAC;QACvC,IAAI,EAAE,SAAS;QACf,cAAc,EAAE,8BAAsB,CAAC,MAAM;KAChD,CAAC,CAAC,CAAC;IACJ,OAAO,gBAAQ,CAAC,SAAS,CAAC;QACtB,IAAI,EAAE,SAAS,CAAC,SAAS;QACzB,UAAU;KACb,CAAC,CAAC;AACP,CAAC;AAlBD,sDAkBC"}
|
|
@@ -56,8 +56,8 @@ function genH5SelectTemplate(property, nameGroup) {
|
|
|
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,9 +106,10 @@ 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
114
|
nameGroup.lowerEntity = utils.firstLowerCase(entity.name);
|
|
114
115
|
const displayedProperty = (0, _1.getFirstDisplayedProperty)(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
|
];
|
|
@@ -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,WAAW,IAAI,QAAQ,CAAC,IAAI;mBACrC,SAAS,CAAC,WAAW;YAC5B,CAAC;AACb,CAAC;AALD,8CAKC;AAED;;;;;GAKG;AACH,SAAgB,mBAAmB,CAAC,QAAwB,EAAE,SAAoB;IAC9E,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,IAAI,QAAQ,CAAC,IAAI,CAAC;IAC9C,OAAO,oDAAoD,SAAS,CAAC,mBAAmB,mBAAmB,SAAS,CAAC,aAAa,kBAAkB,SAAS,CAAC,SAAS;kBACzJ,SAAS,CAAC,WAAW,IAAI,QAAQ,CAAC,IAAI;mBACrC,SAAS,CAAC,WAAW,2DAA2D,KAAK;gBACxF,CAAC;AACjB,CAAC;AAND,kDAMC;AAED,SAAgB,kBAAkB,CAAC,MAAc,EAAE,SAAoB,EAAE,QAAa;IAClF,MAAM,UAAU,GAAG,
|
|
1
|
+
{"version":3,"file":"genSelectBlock.js","sourceRoot":"","sources":["../../src/templator/genSelectBlock.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,16 +33,20 @@ const utils_1 = require("./utils");
|
|
|
33
33
|
*/
|
|
34
34
|
function genTableColumnTemplate(property) {
|
|
35
35
|
const entity = property.entity;
|
|
36
|
+
const dataSource = entity.parentNode;
|
|
36
37
|
const lowerEntityName = utils.firstLowerCase(entity.name);
|
|
37
38
|
let expression = `scope.item.${lowerEntityName}.${property.name}`;
|
|
38
39
|
const title = property.label || property.name;
|
|
39
40
|
if (property.relationEntity) {
|
|
40
41
|
const relationLowerEntityName = utils.firstLowerCase(property.relationEntity);
|
|
42
|
+
const relationEntity = dataSource?.findEntityByName(property.relationEntity);
|
|
43
|
+
const displayedProperty = (0, _1.getFirstDisplayedProperty)(relationEntity);
|
|
41
44
|
// 有外键关联
|
|
42
|
-
expression = (0, _1.getExpression)(property, `scope.item.${relationLowerEntityName}.${property.relationProperty}`);
|
|
45
|
+
expression = (0, _1.getExpression)(property, `scope.item.${relationLowerEntityName}.${displayedProperty?.name || property.relationProperty}`);
|
|
43
46
|
}
|
|
44
|
-
else
|
|
47
|
+
else {
|
|
45
48
|
expression = (0, _1.getExpression)(property, `scope.item.${lowerEntityName}.${property.name}`);
|
|
49
|
+
}
|
|
46
50
|
const getText = (property) => {
|
|
47
51
|
if (property.typeAnnotation.typeName === 'Boolean') {
|
|
48
52
|
return `
|
|
@@ -94,8 +98,8 @@ exports.genTableTemplate = genTableTemplate;
|
|
|
94
98
|
* @param entity 实体
|
|
95
99
|
*/
|
|
96
100
|
function genTableLoadLogic(entity, nameGroup, newLogic, supportFilter) {
|
|
97
|
-
const
|
|
98
|
-
const
|
|
101
|
+
const moduleNode = utils.findClosestModule(entity);
|
|
102
|
+
const moduleNamespace = moduleNode?.getNamespace();
|
|
99
103
|
const params = [
|
|
100
104
|
(0, _1.genLogicParam)(`${newLogic.params[0].name}`, 'params.page'),
|
|
101
105
|
(0, _1.genLogicParam)(`${newLogic.params[1].name}`, 'params.size'),
|
|
@@ -117,7 +121,7 @@ function genTableLoadLogic(entity, nameGroup, newLogic, supportFilter) {
|
|
|
117
121
|
name: 'result',
|
|
118
122
|
typeAnnotation: utils_1.NaslCollectionTypeAnnotation.PageOf([
|
|
119
123
|
utils_1.NaslTypeAnnotation.Reference({
|
|
120
|
-
typeNamespace: `${
|
|
124
|
+
typeNamespace: `${moduleNamespace}.structures`,
|
|
121
125
|
typeName: nameGroup.structure,
|
|
122
126
|
}),
|
|
123
127
|
]),
|
|
@@ -131,7 +135,7 @@ function genTableLoadLogic(entity, nameGroup, newLogic, supportFilter) {
|
|
|
131
135
|
name: 'result',
|
|
132
136
|
}),
|
|
133
137
|
right: utils_1.NaslLogicItem.CallLogic({
|
|
134
|
-
calleeNamespace: `${
|
|
138
|
+
calleeNamespace: `${moduleNamespace}.logics`,
|
|
135
139
|
calleeName: newLogic.name,
|
|
136
140
|
arguments: params,
|
|
137
141
|
}),
|
|
@@ -147,8 +151,8 @@ exports.genTableLoadLogic = genTableLoadLogic;
|
|
|
147
151
|
*/
|
|
148
152
|
function genTableRemoveLogic(entity, nameGroup) {
|
|
149
153
|
const lowerEntityName = utils.firstLowerCase(entity.name);
|
|
150
|
-
const
|
|
151
|
-
const
|
|
154
|
+
const moduleNode = utils.findClosestModule(entity);
|
|
155
|
+
const moduleNamespace = moduleNode?.getNamespace();
|
|
152
156
|
const ns = entity.ns;
|
|
153
157
|
const deleteLogic = ns?.logics?.find((logic) => logic.name === 'delete');
|
|
154
158
|
const idPropertys = entity.properties.filter((property) => property.primaryKey);
|
|
@@ -163,7 +167,7 @@ function genTableRemoveLogic(entity, nameGroup) {
|
|
|
163
167
|
name: 'scope',
|
|
164
168
|
typeAnnotation: utils_1.NaslUITypeAnnotation.ScopeOf([
|
|
165
169
|
utils_1.NaslTypeAnnotation.Reference({
|
|
166
|
-
typeNamespace: `${
|
|
170
|
+
typeNamespace: `${moduleNamespace}.structures`,
|
|
167
171
|
typeName: nameGroup.structure,
|
|
168
172
|
}),
|
|
169
173
|
]),
|
|
@@ -201,30 +205,33 @@ exports.genTableRemoveLogic = genTableRemoveLogic;
|
|
|
201
205
|
* load_select_student -> load_someView_select_student
|
|
202
206
|
*/
|
|
203
207
|
function genTableBlock(entity, view) {
|
|
204
|
-
const
|
|
208
|
+
const dataSource = entity.parentNode;
|
|
209
|
+
const module = dataSource.parentNode;
|
|
205
210
|
const viewElementMainView = view.getViewElementUniqueName('tableView');
|
|
206
|
-
const nameGroup = (0, _1.genUniqueQueryNameGroup)(
|
|
211
|
+
const nameGroup = (0, _1.genUniqueQueryNameGroup)(module, view, viewElementMainView);
|
|
207
212
|
nameGroup.viewElementMainView = viewElementMainView;
|
|
208
213
|
nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
|
|
209
214
|
nameGroup.viewLogicRemove = view.getLogicUniqueName('remove');
|
|
210
215
|
// 收集所有和本实体关联的实体
|
|
211
|
-
const
|
|
216
|
+
const entitySet = new Set();
|
|
217
|
+
entitySet.add(entity);
|
|
212
218
|
const newStructures = [];
|
|
213
219
|
const newLogics = [];
|
|
214
220
|
entity.properties.forEach((property) => {
|
|
215
221
|
if (property.relationEntity) {
|
|
216
222
|
// 有外键关联
|
|
217
|
-
const relationEntity =
|
|
223
|
+
const relationEntity = dataSource?.findEntityByName(property.relationEntity);
|
|
218
224
|
if (relationEntity) {
|
|
219
225
|
const displayedProperty = (0, _1.getFirstDisplayedProperty)(relationEntity);
|
|
220
226
|
if (displayedProperty)
|
|
221
|
-
|
|
227
|
+
entitySet.add(relationEntity);
|
|
222
228
|
}
|
|
223
229
|
}
|
|
224
230
|
});
|
|
231
|
+
const allEntities = [...entitySet];
|
|
225
232
|
const entityStructure = (0, _1.genQueryStructure)(allEntities, nameGroup);
|
|
226
233
|
newStructures.push(entityStructure);
|
|
227
|
-
const entityLogic = (0, _1.genQueryLogic)(allEntities, nameGroup, false, true,
|
|
234
|
+
const entityLogic = (0, _1.genQueryLogic)(allEntities, nameGroup, false, true, module);
|
|
228
235
|
newLogics.push(entityLogic);
|
|
229
236
|
return `
|
|
230
237
|
<template>
|
|
@@ -246,31 +253,34 @@ function genTableBlock(entity, view) {
|
|
|
246
253
|
exports.genTableBlock = genTableBlock;
|
|
247
254
|
function genTableColumnBlock(property, view) {
|
|
248
255
|
const entity = property.entity;
|
|
249
|
-
const
|
|
256
|
+
const dataSource = entity.parentNode;
|
|
257
|
+
const module = dataSource.parentNode;
|
|
250
258
|
const viewElementMainView = view.getViewElementUniqueName('tableView');
|
|
251
|
-
const nameGroup = (0, _1.genUniqueQueryNameGroup)(
|
|
259
|
+
const nameGroup = (0, _1.genUniqueQueryNameGroup)(module, view, viewElementMainView);
|
|
252
260
|
nameGroup.viewElementMainView = viewElementMainView;
|
|
253
261
|
nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
|
|
254
262
|
nameGroup.viewLogicRemove = view.getLogicUniqueName('remove');
|
|
255
263
|
// 收集所有和本实体关联的实体
|
|
256
|
-
const
|
|
264
|
+
const entitySet = new Set();
|
|
265
|
+
entitySet.add(entity);
|
|
257
266
|
const newStructures = [];
|
|
258
267
|
const newLogics = [];
|
|
259
268
|
const properties = [property];
|
|
260
269
|
properties.forEach((property) => {
|
|
261
270
|
if (property.relationEntity) {
|
|
262
271
|
// 有外键关联
|
|
263
|
-
const relationEntity =
|
|
272
|
+
const relationEntity = dataSource?.findEntityByName(property.relationEntity);
|
|
264
273
|
if (relationEntity) {
|
|
265
274
|
const displayedProperty = (0, _1.getFirstDisplayedProperty)(relationEntity);
|
|
266
275
|
if (displayedProperty)
|
|
267
|
-
|
|
276
|
+
entitySet.add(relationEntity);
|
|
268
277
|
}
|
|
269
278
|
}
|
|
270
279
|
});
|
|
280
|
+
const allEntities = [...entitySet];
|
|
271
281
|
const entityStructure = (0, _1.genQueryStructure)(allEntities, nameGroup);
|
|
272
282
|
newStructures.push(entityStructure);
|
|
273
|
-
const entityLogic = (0, _1.genQueryLogic)(allEntities, nameGroup, false, true,
|
|
283
|
+
const entityLogic = (0, _1.genQueryLogic)(allEntities, nameGroup, false, true, module);
|
|
274
284
|
newLogics.push(entityLogic);
|
|
275
285
|
return `
|
|
276
286
|
<template>
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"genTableBlock.js","sourceRoot":"","sources":["../../src/templator/genTableBlock.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAkC;AAElC,wBAWW;AACX,mCAAkJ;AAElJ;;;GAGG;AACH,SAAgB,sBAAsB,CAAC,QAAwB;IAC3D,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC;IAC/B,MAAM,eAAe,GAAG,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC1D,IAAI,UAAU,GAAG,cAAc,eAAe,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;IAClE,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,IAAI,QAAQ,CAAC,IAAI,CAAC;IAE9C,IAAI,QAAQ,CAAC,cAAc,EAAE;QACzB,MAAM,uBAAuB,GAAG,KAAK,CAAC,cAAc,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;QAC9E,QAAQ;QACR,UAAU,GAAG,IAAA,gBAAa,EAAC,QAAQ,EAAE,cAAc,uBAAuB,IAAI,QAAQ,CAAC,gBAAgB,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"genTableBlock.js","sourceRoot":"","sources":["../../src/templator/genTableBlock.ts"],"names":[],"mappings":"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"}
|