@lcap/nasl 3.4.0-beta.3 → 3.4.0-beta.4

package/out/templator/genCurdMultipleKeyBlock.js

@@ -1,122 +1,122 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.genReloadLogic = exports.genGridViewMultipleKeyBlock = exports.genCurdMultipleKeyBlock = exports.genUpdateSubmitLogic = exports.genSubmitLogic = void 0;
-/**
- * 1. 从genCurdBlock组件复制，算是工行的定制化需求多主键(联合主键的支持)
- * 2. 改动了原来判断id的逻辑
- * 3. 先简单做后续在看如何优化，
- * 4. 主键目前支持 Long String Double 类型接口所以只禁用了对应的三个类型
- */
-const utils = __importStar(require("../utils"));
-const utils_1 = require("./utils");
-const _1 = require(".");
-function genFilterTemplate(entity, nameGroup, selectNameGroupMap) {
-    const dataSource = entity.parentNode;
-    const properties = entity.properties.filter((0, _1.filterProperty)('inFilter'));
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.genReloadLogic = exports.genGridViewMultipleKeyBlock = exports.genCurdMultipleKeyBlock = exports.genUpdateSubmitLogic = exports.genSubmitLogic = void 0;
+/**
+ * 1. 从genCurdBlock组件复制，算是工行的定制化需求多主键(联合主键的支持)
+ * 2. 改动了原来判断id的逻辑
+ * 3. 先简单做后续在看如何优化，
+ * 4. 主键目前支持 Long String Double 类型接口所以只禁用了对应的三个类型
+ */
+const utils = __importStar(require("../utils"));
+const utils_1 = require("./utils");
+const _1 = require(".");
+function genFilterTemplate(entity, nameGroup, selectNameGroupMap) {
+    const dataSource = entity.parentNode;
+    const properties = entity.properties.filter((0, _1.filterProperty)('inFilter'));
     return `
 <u-linear-layout justify="space-between">
     <u-form layout="inline">
-    ${properties
-        .map((property) => {
-        const vModel = `${nameGroup.viewVariableFilter}.${property.name}`;
-        const label = (property.label || property.name).replace(/"/g, '&quot;');
-        let formItem = `<u-form-item layout="center"><template #label><u-text text="${label}"></u-text></template>`;
-        const { typeAnnotation } = property || {};
-        const { typeName: propertyTypeName, typeNamespace: propertyTypeNamespace } = typeAnnotation || {};
-        const propertyTypeMaxLength = Number(property.rules
-            .find((item) => item.indexOf('max') > -1)
-            ?.split('(')[1]
-            .slice(0, -1)) || 0;
-        if (property.relationEntity) {
-            // 有外键关联
-            const relationEntity = dataSource?.findEntityByName(property.relationEntity);
-            if (relationEntity) {
-                const relationProperty = relationEntity.properties.find((prop) => prop.name === property.relationProperty);
-                const displayedProperty = (0, _1.getFirstDisplayedProperty)(relationEntity);
-                if (displayedProperty) {
-                    const lowerEntityName = utils.firstLowerCase(relationEntity.name);
-                    // 存在多个属性关联同一个实体的情况，因此加上属性名用以唯一标识
-                    const key = [property.name, relationEntity.name].join('-');
-                    const selectNameGroup = selectNameGroupMap.get(key);
-                    let dataSourceValue = `(params) => ${selectNameGroup.logic}(elements.$ce.page, elements.$ce.size)`;
+    ${properties
+        .map((property) => {
+        const vModel = `${nameGroup.viewVariableFilter}.${property.name}`;
+        const label = (property.label || property.name).replace(/"/g, '&quot;');
+        let formItem = `<u-form-item layout="center"><template #label><u-text text="${label}"></u-text></template>`;
+        const { typeAnnotation } = property || {};
+        const { typeName: propertyTypeName, typeNamespace: propertyTypeNamespace } = typeAnnotation || {};
+        const propertyTypeMaxLength = Number(property.rules
+            .find((item) => item.indexOf('max') > -1)
+            ?.split('(')[1]
+            .slice(0, -1)) || 0;
+        if (property.relationEntity) {
+            // 有外键关联
+            const relationEntity = dataSource?.findEntityByName(property.relationEntity);
+            if (relationEntity) {
+                const relationProperty = relationEntity.properties.find((prop) => prop.name === property.relationProperty);
+                const displayedProperty = (0, _1.getFirstDisplayedProperty)(relationEntity);
+                if (displayedProperty) {
+                    const lowerEntityName = utils.firstLowerCase(relationEntity.name);
+                    // 存在多个属性关联同一个实体的情况，因此加上属性名用以唯一标识
+                    const key = [property.name, relationEntity.name].join('-');
+                    const selectNameGroup = selectNameGroupMap.get(key);
+                    let dataSourceValue = `(params) => ${selectNameGroup.logic}(elements.$ce.page, elements.$ce.size)`;
                     formItem += `
                         <u-select clearable placeholder="请选择${label}" :data-source="${dataSourceValue}" :page-size="50"
                             text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pagination="true" v-model="${vModel}">
                         </u-select>
-                    `;
-                }
-                else
-                    return '';
-            }
-            else
-                return '';
-        }
-        else if (propertyTypeName === 'Boolean') {
+                    `;
+                }
+                else
+                    return '';
+            }
+            else
+                return '';
+        }
+        else if (propertyTypeName === 'Boolean') {
             formItem += `
                         <u-select clearable v-model="${vModel}" placeholder="请输入${label}">
                             <u-select-item :value="true" text="是">是</u-select-item>
                             <u-select-item :value="false" text="否">否</u-select-item>
                         </u-select>
-                    `;
-        }
-        else if (propertyTypeName === 'Integer' || propertyTypeName === 'Long') {
-            formItem += `<u-number-input v-model="${vModel}" placeholder="请输入${label}"></u-number-input>`;
-        }
-        else if (propertyTypeName === 'Double') {
-            formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
-        }
-        else if (propertyTypeName === 'Decimal') {
-            formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
-        }
-        else if (propertyTypeName === 'String' && propertyTypeMaxLength > 256) {
-            formItem += `<u-textarea v-model="${vModel}" placeholder="请输入${label}"></u-textarea>`;
-        }
-        else if (propertyTypeName === 'Date') {
-            formItem += `<u-date-picker clearable :value.sync="${vModel}" placeholder="请输入${label}"></u-date-picker>`;
-        }
-        else if (propertyTypeName === 'Time') {
-            formItem += `<u-time-picker :value.sync="${vModel}" placeholder="请输入${label}"></u-time-picker>`;
-        }
-        else if (propertyTypeName === 'DateTime') {
-            formItem += `<u-date-time-picker clearable :value.sync="${vModel}" placeholder="请输入${label}"></u-date-time-picker>`;
-        }
-        else {
-            const namespaceArr = propertyTypeNamespace.split('.');
-            const type = namespaceArr.pop();
-            if (type === 'enums') {
-                const Enum = dataSource.app.findNodeByCompleteName(`${propertyTypeNamespace}.${propertyTypeName}`);
-                formItem += (0, _1.genEnumSelectBlock)(Enum, `${vModel}`, '', `请选择${label}`, true);
-            }
-            else {
-                formItem += `<u-input v-model="${vModel}" placeholder="请输入${label}"></u-input>`;
-            }
-        }
-        formItem += `</u-form-item>`;
-        return formItem;
-    })
+                    `;
+        }
+        else if (propertyTypeName === 'Integer' || propertyTypeName === 'Long') {
+            formItem += `<u-number-input v-model="${vModel}" placeholder="请输入${label}"></u-number-input>`;
+        }
+        else if (propertyTypeName === 'Double') {
+            formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
+        }
+        else if (propertyTypeName === 'Decimal') {
+            formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
+        }
+        else if (propertyTypeName === 'String' && propertyTypeMaxLength > 256) {
+            formItem += `<u-textarea v-model="${vModel}" placeholder="请输入${label}"></u-textarea>`;
+        }
+        else if (propertyTypeName === 'Date') {
+            formItem += `<u-date-picker clearable :value.sync="${vModel}" placeholder="请输入${label}"></u-date-picker>`;
+        }
+        else if (propertyTypeName === 'Time') {
+            formItem += `<u-time-picker :value.sync="${vModel}" placeholder="请输入${label}"></u-time-picker>`;
+        }
+        else if (propertyTypeName === 'DateTime') {
+            formItem += `<u-date-time-picker clearable :value.sync="${vModel}" placeholder="请输入${label}"></u-date-time-picker>`;
+        }
+        else {
+            const namespaceArr = propertyTypeNamespace.split('.');
+            const type = namespaceArr.pop();
+            if (type === 'enums') {
+                const Enum = dataSource.app.findNodeByCompleteName(`${propertyTypeNamespace}.${propertyTypeName}`);
+                formItem += (0, _1.genEnumSelectBlock)(Enum, `${vModel}`, '', `请选择${label}`, true);
+            }
+            else {
+                formItem += `<u-input v-model="${vModel}" placeholder="请输入${label}"></u-input>`;
+            }
+        }
+        formItem += `</u-form-item>`;
+        return formItem;
+    })
         .join('')}
 
         <u-form-item layout="center" label-size="auto">
@@ -126,11 +126,11 @@ function genFilterTemplate(entity, nameGroup, selectNameGroupMap) {
 
     <u-linear-layout><u-button color="primary" @click="${nameGroup.viewLogicCreate}">创 建</u-button></u-linear-layout>
 </u-linear-layout>
-    `;
-}
-function genSaveModalTemplate(entity, nameGroup, selectNameGroupMap) {
-    const dataSource = entity.parentNode;
-    const properties = entity.properties.filter((0, _1.filterProperty)('inForm'));
+    `;
+}
+function genSaveModalTemplate(entity, nameGroup, selectNameGroupMap) {
+    const dataSource = entity.parentNode;
+    const properties = entity.properties.filter((0, _1.filterProperty)('inForm'));
     return `
     <u-modal ref="${nameGroup.viewElementSaveModal}">
         <template #title>
@@ -139,37 +139,37 @@ function genSaveModalTemplate(entity, nameGroup, selectNameGroupMap) {
         </template>
         <template #body>
             <u-form ref="${nameGroup.viewElementSaveModalForm}">
-    ${properties
-        .map((property) => {
-        const vModel = `${nameGroup.viewVariableInput}.${property.name}`;
-        const label = (property.label || property.name).replace(/"/g, '&quot;');
-        const required = !!property.required;
-        const rules = [];
-        if (property.rules && property.rules.length) {
-            property.rules.forEach((rule) => rules.push(rule));
-        }
-        if (required)
-            rules.push('required');
-        const rulesStr = rules.join(' | ');
-        let formItem = `<u-form-item ${required ? 'required' : ''}  ${rulesStr.length ? `rules="${rulesStr}"` : ''} layout="center"><template #label><u-text text="${label}"></u-text></template>`;
-        const { typeAnnotation } = property || {};
-        const { typeName: propertyTypeName, typeNamespace: propertyTypeNamespace } = typeAnnotation || {};
-        const propertyTypeMaxLength = Number(property.rules
-            .find((item) => item.indexOf('max') > -1)
-            ?.split('(')[1]
-            .slice(0, -1)) || 0;
-        if (property.relationEntity) {
-            // 有外键关联
-            const relationEntity = dataSource?.findEntityByName(property.relationEntity);
-            if (relationEntity) {
-                const relationProperty = relationEntity.properties.find((prop) => prop.name === property.relationProperty);
-                const displayedProperty = (0, _1.getFirstDisplayedProperty)(relationEntity);
-                if (displayedProperty) {
-                    const lowerEntityName = utils.firstLowerCase(relationEntity.name);
-                    // 存在多个属性关联同一个实体的情况，因此加上属性名用以唯一标识
-                    const key = [property.name, relationEntity.name].join('-');
-                    const selectNameGroup = selectNameGroupMap.get(key);
-                    let dataSourceValue = `(params) => ${selectNameGroup.logic}(elements.$ce.page, elements.$ce.size)`;
+    ${properties
+        .map((property) => {
+        const vModel = `${nameGroup.viewVariableInput}.${property.name}`;
+        const label = (property.label || property.name).replace(/"/g, '&quot;');
+        const required = !!property.required;
+        const rules = [];
+        if (property.rules && property.rules.length) {
+            property.rules.forEach((rule) => rules.push(rule));
+        }
+        if (required)
+            rules.push('required');
+        const rulesStr = rules.join(' | ');
+        let formItem = `<u-form-item ${required ? 'required' : ''}  ${rulesStr.length ? `rules="${rulesStr}"` : ''} layout="center"><template #label><u-text text="${label}"></u-text></template>`;
+        const { typeAnnotation } = property || {};
+        const { typeName: propertyTypeName, typeNamespace: propertyTypeNamespace } = typeAnnotation || {};
+        const propertyTypeMaxLength = Number(property.rules
+            .find((item) => item.indexOf('max') > -1)
+            ?.split('(')[1]
+            .slice(0, -1)) || 0;
+        if (property.relationEntity) {
+            // 有外键关联
+            const relationEntity = dataSource?.findEntityByName(property.relationEntity);
+            if (relationEntity) {
+                const relationProperty = relationEntity.properties.find((prop) => prop.name === property.relationProperty);
+                const displayedProperty = (0, _1.getFirstDisplayedProperty)(relationEntity);
+                if (displayedProperty) {
+                    const lowerEntityName = utils.firstLowerCase(relationEntity.name);
+                    // 存在多个属性关联同一个实体的情况，因此加上属性名用以唯一标识
+                    const key = [property.name, relationEntity.name].join('-');
+                    const selectNameGroup = selectNameGroupMap.get(key);
+                    let dataSourceValue = `(params) => ${selectNameGroup.logic}(elements.$ce.page, elements.$ce.size)`;
                     formItem += `
                         <u-select clearable placeholder="请选择${label}"
                             text-field="${lowerEntityName}.${displayedProperty.name}"
@@ -179,56 +179,56 @@ function genSaveModalTemplate(entity, nameGroup, selectNameGroupMap) {
                             ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''}
                             v-model="${vModel}">
                         </u-select>
-                    `;
-                }
-                else
-                    return '';
-            }
-            else
-                return '';
-        }
-        else if (propertyTypeName === 'Boolean') {
+                    `;
+                }
+                else
+                    return '';
+            }
+            else
+                return '';
+        }
+        else if (propertyTypeName === 'Boolean') {
             formItem += `
                         <u-select clearable v-model="${vModel}" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''}>
                             <u-select-item :value="true" text="是"><u-text text="是"></u-text></u-select-item>
                             <u-select-item :value="false" text="否"><u-text text="否"></u-text></u-select-item>
-                        </u-select>`;
-        }
-        else if (propertyTypeName === 'Integer' || propertyTypeName === 'Long') {
-            formItem += `<u-number-input v-model="${vModel}" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''}></u-number-input>`;
-        }
-        else if (propertyTypeName === 'Double') {
-            formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''}></u-number-input>`;
-        }
-        else if (propertyTypeName === 'Decimal') {
-            formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''}></u-number-input>`;
-        }
-        else if (propertyTypeName === 'String' && propertyTypeMaxLength > 256) {
-            formItem += `<u-textarea v-model="${vModel}" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''}></u-textarea>`;
-        }
-        else if (propertyTypeName === 'Date') {
-            formItem += `<u-date-picker clearable :value.sync="${vModel}" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''}></u-date-picker>`;
-        }
-        else if (propertyTypeName === 'Time') {
-            formItem += `<u-time-picker :value.sync="${vModel}" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''}></u-time-picker>`;
-        }
-        else if (propertyTypeName === 'DateTime') {
-            formItem += `<u-date-time-picker clearable :value.sync="${vModel}" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''}></u-date-time-picker>`;
-        }
-        else {
-            const namespaceArr = propertyTypeNamespace.split('.');
-            const type = namespaceArr.pop();
-            if (type === 'enums') {
-                const Enum = dataSource.app.findNodeByCompleteName(`${propertyTypeNamespace}.${propertyTypeName}`);
-                formItem += (0, _1.genEnumSelectBlock)(Enum, `${vModel}`, '', `请选择${label}`, true);
-            }
-            else {
-                formItem += `<u-input v-model="${vModel}" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''}></u-input>`;
-            }
-        }
-        formItem += `</u-form-item>\n`;
-        return formItem;
-    })
+                        </u-select>`;
+        }
+        else if (propertyTypeName === 'Integer' || propertyTypeName === 'Long') {
+            formItem += `<u-number-input v-model="${vModel}" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''}></u-number-input>`;
+        }
+        else if (propertyTypeName === 'Double') {
+            formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''}></u-number-input>`;
+        }
+        else if (propertyTypeName === 'Decimal') {
+            formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''}></u-number-input>`;
+        }
+        else if (propertyTypeName === 'String' && propertyTypeMaxLength > 256) {
+            formItem += `<u-textarea v-model="${vModel}" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''}></u-textarea>`;
+        }
+        else if (propertyTypeName === 'Date') {
+            formItem += `<u-date-picker clearable :value.sync="${vModel}" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''}></u-date-picker>`;
+        }
+        else if (propertyTypeName === 'Time') {
+            formItem += `<u-time-picker :value.sync="${vModel}" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''}></u-time-picker>`;
+        }
+        else if (propertyTypeName === 'DateTime') {
+            formItem += `<u-date-time-picker clearable :value.sync="${vModel}" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''}></u-date-time-picker>`;
+        }
+        else {
+            const namespaceArr = propertyTypeNamespace.split('.');
+            const type = namespaceArr.pop();
+            if (type === 'enums') {
+                const Enum = dataSource.app.findNodeByCompleteName(`${propertyTypeNamespace}.${propertyTypeName}`);
+                formItem += (0, _1.genEnumSelectBlock)(Enum, `${vModel}`, '', `请选择${label}`, true);
+            }
+            else {
+                formItem += `<u-input v-model="${vModel}" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''}></u-input>`;
+            }
+        }
+        formItem += `</u-form-item>\n`;
+        return formItem;
+    })
         .join('')}
             </u-form>
         </template>
@@ -238,267 +238,267 @@ function genSaveModalTemplate(entity, nameGroup, selectNameGroupMap) {
                 <u-button color="primary" @click="${nameGroup.viewLogicSubmit}()" v-if="!${nameGroup.viewVariableIsUpdate}">立即创建</u-button>
             </u-linear-layout>
         </template>
-    </u-modal>`;
-}
-function genInitLogic(nameGroup) {
-    return utils_1.NaslNode.Logic({
-        name: nameGroup.viewLogicInit,
-        description: '',
-        params: [],
-        returns: [],
-        variables: [],
-        body: [
-            utils_1.NaslLogicItem.Start,
-            utils_1.NaslLogicItem.CallFunction({
-                calleeName: 'Clear',
-                arguments: [
-                    utils_1.NaslLogicItem.Argument({
-                        keyword: 'struct',
-                        expression: utils_1.NaslLogicItem.Identifier({
-                            name: nameGroup.viewVariableFilter,
-                        }),
-                    }),
-                ],
-            }),
-            utils_1.NaslLogicItem.End,
-        ],
-        playground: [],
-    });
-}
-function genCreateLogic(nameGroup) {
-    return utils_1.NaslNode.Logic({
-        name: nameGroup.viewLogicCreate,
-        description: '',
-        params: [],
-        returns: [],
-        variables: [],
-        body: [
-            utils_1.NaslLogicItem.Start,
-            utils_1.NaslLogicItem.Assignment({
-                left: utils_1.NaslLogicItem.Identifier({
-                    name: nameGroup.viewVariableIsUpdate,
-                }),
-                right: utils_1.NaslLogicItem.Identifier({
-                    name: 'false',
-                }),
-            }),
-            utils_1.NaslLogicItem.Assignment({
-                left: utils_1.NaslLogicItem.Identifier({
-                    name: nameGroup.viewVariableInput,
-                }),
-                right: utils_1.NaslLogicItem.CallFunction({
-                    calleeName: 'Clone',
-                    arguments: [
-                        utils_1.NaslLogicItem.Argument({
-                            keyword: 'obj',
-                            expression: utils_1.NaslLogicItem.Identifier({
-                                name: nameGroup.viewVariableEntity,
-                            }),
-                        }),
-                    ],
-                }),
-            }),
-            (0, _1.genCallComponentLogic)(nameGroup.viewElementSaveModal, 'open'),
-            utils_1.NaslLogicItem.End,
-        ],
-        playground: [],
-    });
-}
-function genSubmitLogic(entity, nameGroup) {
-    const { ns } = entity;
-    const createLogic = ns?.logics?.find((logic) => logic.name === `create`);
-    return utils_1.NaslNode.Logic({
-        name: nameGroup.viewLogicSubmit,
-        params: [],
-        returns: [],
-        variables: [
-            utils_1.NaslNode.Variable({
-                name: 'validateResult',
-                typeAnnotation: utils_1.NaslUITypeAnnotation.ValidateEvent,
-            }),
-        ],
-        body: [
-            utils_1.NaslLogicItem.Start,
-            utils_1.NaslLogicItem.Assignment({
-                left: utils_1.NaslLogicItem.Identifier({
-                    name: 'validateResult',
-                }),
-                right: (0, _1.genCallComponentLogic)(nameGroup.viewElementSaveModalForm, 'validate'),
-            }),
-            utils_1.NaslLogicItem.IfStatement({
-                test: utils_1.NaslLogicItem.MemberExpression({
-                    object: utils_1.NaslLogicItem.Identifier({
-                        name: 'validateResult',
-                    }),
-                    property: utils_1.NaslLogicItem.Identifier({
-                        name: 'valid',
-                    }),
-                }),
-                consequent: [
-                    utils_1.NaslLogicItem.CallLogic({
-                        calleeNamespace: createLogic.getNamespace(),
-                        calleeName: createLogic.name,
-                        arguments: [(0, _1.genLogicParam)(`${createLogic.params[0].name}`, nameGroup.viewVariableInput)],
-                    }),
-                    (0, _1.genCallComponentLogic)(nameGroup.viewElementSaveModal, 'close'),
-                    (0, _1.genCallComponentLogic)(nameGroup.viewElementMainView, 'reload'),
-                ],
-                alternate: [],
-            }),
-            utils_1.NaslLogicItem.End,
-        ],
-        playground: [],
-    });
-}
-exports.genSubmitLogic = genSubmitLogic;
-function genUpdateSubmitLogic(entity, nameGroup) {
-    const { ns } = entity;
-    const updateLogic = ns?.logics?.find((logic) => logic.name === `update`);
-    return utils_1.NaslNode.Logic({
-        name: nameGroup.viewLogicUpdateSubmit,
-        params: [],
-        returns: [],
-        variables: [
-            utils_1.NaslNode.Variable({
-                name: 'validateResult',
-                typeAnnotation: utils_1.NaslUITypeAnnotation.ValidateEvent,
-            }),
-        ],
-        body: [
-            utils_1.NaslLogicItem.Start,
-            utils_1.NaslLogicItem.Assignment({
-                left: utils_1.NaslLogicItem.Identifier({
-                    name: 'validateResult',
-                }),
-                right: (0, _1.genCallComponentLogic)(nameGroup.viewElementSaveModalForm, 'validate'),
-            }),
-            utils_1.NaslLogicItem.IfStatement({
-                test: utils_1.NaslLogicItem.MemberExpression({
-                    object: utils_1.NaslLogicItem.Identifier({
-                        name: 'validateResult',
-                    }),
-                    property: utils_1.NaslLogicItem.Identifier({
-                        name: 'valid',
-                    }),
-                }),
-                consequent: [
-                    utils_1.NaslLogicItem.CallLogic({
-                        calleeNamespace: updateLogic.getNamespace(),
-                        calleeName: updateLogic.name,
-                        arguments: [(0, _1.genLogicParam)(`${updateLogic.params[0].name}`, nameGroup.viewVariableInput)],
-                    }),
-                    (0, _1.genCallComponentLogic)(nameGroup.viewElementSaveModal, 'close'),
-                    (0, _1.genCallComponentLogic)(nameGroup.viewElementMainView, 'reload'),
-                ],
-                alternate: [],
-            }),
-            utils_1.NaslLogicItem.End,
-        ],
-        playground: [],
-    });
-}
-exports.genUpdateSubmitLogic = genUpdateSubmitLogic;
-function genModifyLogic(entity, nameGroup) {
-    const lowerEntityName = utils.firstLowerCase(entity.name);
-    return utils_1.NaslNode.Logic({
-        name: nameGroup.viewLogicModify,
-        description: '',
-        params: [],
-        returns: [],
-        variables: [],
-        body: [
-            utils_1.NaslLogicItem.Start,
-            utils_1.NaslLogicItem.Assignment({
-                left: utils_1.NaslLogicItem.Identifier({
-                    name: nameGroup.viewVariableIsUpdate,
-                }),
-                right: utils_1.NaslLogicItem.Identifier({
-                    name: 'true',
-                }),
-            }),
-            utils_1.NaslLogicItem.Assignment({
-                left: utils_1.NaslLogicItem.Identifier({
-                    name: nameGroup.viewVariableInput,
-                }),
-                right: utils_1.NaslLogicItem.CallFunction({
-                    calleeName: 'Clone',
-                    arguments: [
-                        utils_1.NaslLogicItem.Argument({
-                            keyword: 'obj',
-                            expression: utils_1.NaslLogicItem.MemberExpression({
-                                object: utils_1.NaslLogicItem.MemberExpression({
-                                    object: utils_1.NaslLogicItem.Identifier({
-                                        name: 'current',
-                                    }),
-                                    property: utils_1.NaslLogicItem.Identifier({
-                                        name: 'item',
-                                    }),
-                                }),
-                                property: utils_1.NaslLogicItem.Identifier({
-                                    name: lowerEntityName,
-                                }),
-                            }),
-                        }),
-                    ],
-                }),
-            }),
-            (0, _1.genCallComponentLogic)(nameGroup.viewElementSaveModal, 'open'),
-            utils_1.NaslLogicItem.End,
-        ],
-        playground: [],
-    });
-}
-// 列表（全）
-function genCurdMultipleKeyBlock(entity, oldNode) {
-    const { view } = oldNode;
-    const dataSource = entity.parentNode;
-    const module = dataSource.app;
-    const viewElementMainView = view.getViewElementUniqueName('tableView');
-    const nameGroup = (0, _1.genUniqueQueryNameGroup)(module, view, viewElementMainView);
-    nameGroup.viewElementMainView = viewElementMainView;
-    nameGroup.viewElementSaveModal = view.getViewElementUniqueName('saveModal');
-    nameGroup.viewElementSaveModalForm = view.getViewElementUniqueName('saveModalForm');
-    nameGroup.viewLogicRemove = view.getLogicUniqueName('remove');
-    nameGroup.viewLogicInit = view.getLogicUniqueName('init');
-    nameGroup.viewLogicCreate = view.getLogicUniqueName('create');
-    nameGroup.viewLogicModify = view.getLogicUniqueName('modify');
-    nameGroup.viewLogicSubmit = view.getLogicUniqueName('submit');
-    nameGroup.viewLogicUpdateSubmit = view.getLogicUniqueName('updateSubmit');
-    nameGroup.viewLogicReload = view.getLogicUniqueName('reload');
-    nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
-    nameGroup.viewVariableInput = view.getVariableUniqueName('input');
-    nameGroup.viewVariableFilter = view.getVariableUniqueName('filter');
-    nameGroup.viewVariableIsUpdate = view.getVariableUniqueName('isUpdate');
-    // 收集所有和本实体关联的实体
-    const entitySet = new Set();
-    entitySet.add(entity);
-    const selectNameGroupMap = new Map();
-    const newLogics = [];
-    const newLoadSelectLogics = [];
-    entity.properties.forEach((property) => {
-        // 有外键关联
-        if (property.relationEntity) {
-            const relationEntity = dataSource?.findEntityByName(property.relationEntity);
-            if (relationEntity) {
-                const displayedProperty = (0, _1.getFirstDisplayedProperty)(relationEntity);
-                if (displayedProperty) {
-                    entitySet.add(relationEntity);
-                    const viewElementSelect = view.getViewElementUniqueName('select');
-                    const selectNameGroup = (0, _1.genUniqueQueryNameGroup)(module, view, viewElementSelect, false, relationEntity.name);
-                    selectNameGroup.viewElementSelect = viewElementSelect;
-                    // 存在多个属性关联同一个实体的情况，因此加上属性名用以唯一标识
-                    const key = [property.name, relationEntity.name].join('-');
-                    selectNameGroupMap.set(key, selectNameGroup);
-                    const newLogic = (0, _1.genQueryLogic)([relationEntity], selectNameGroup, false, false, module);
-                    newLogics.push(newLogic);
-                    newLoadSelectLogics.push((0, _1.genLoadSelectLogic)(relationEntity, selectNameGroup, newLogic));
-                }
-            }
-        }
-    });
-    const allEntities = [...entitySet];
-    const entityLogic = (0, _1.genQueryLogic)(allEntities, nameGroup, true, true, module);
-    newLogics.push(entityLogic);
+    </u-modal>`;
+}
+function genInitLogic(nameGroup) {
+    return utils_1.NaslNode.Logic({
+        name: nameGroup.viewLogicInit,
+        description: '',
+        params: [],
+        returns: [],
+        variables: [],
+        body: [
+            utils_1.NaslLogicItem.Start,
+            utils_1.NaslLogicItem.CallFunction({
+                calleeName: 'Clear',
+                arguments: [
+                    utils_1.NaslLogicItem.Argument({
+                        keyword: 'struct',
+                        expression: utils_1.NaslLogicItem.Identifier({
+                            name: nameGroup.viewVariableFilter,
+                        }),
+                    }),
+                ],
+            }),
+            utils_1.NaslLogicItem.End,
+        ],
+        playground: [],
+    });
+}
+function genCreateLogic(nameGroup) {
+    return utils_1.NaslNode.Logic({
+        name: nameGroup.viewLogicCreate,
+        description: '',
+        params: [],
+        returns: [],
+        variables: [],
+        body: [
+            utils_1.NaslLogicItem.Start,
+            utils_1.NaslLogicItem.Assignment({
+                left: utils_1.NaslLogicItem.Identifier({
+                    name: nameGroup.viewVariableIsUpdate,
+                }),
+                right: utils_1.NaslLogicItem.Identifier({
+                    name: 'false',
+                }),
+            }),
+            utils_1.NaslLogicItem.Assignment({
+                left: utils_1.NaslLogicItem.Identifier({
+                    name: nameGroup.viewVariableInput,
+                }),
+                right: utils_1.NaslLogicItem.CallFunction({
+                    calleeName: 'Clone',
+                    arguments: [
+                        utils_1.NaslLogicItem.Argument({
+                            keyword: 'obj',
+                            expression: utils_1.NaslLogicItem.Identifier({
+                                name: nameGroup.viewVariableEntity,
+                            }),
+                        }),
+                    ],
+                }),
+            }),
+            (0, _1.genCallComponentLogic)(nameGroup.viewElementSaveModal, 'open'),
+            utils_1.NaslLogicItem.End,
+        ],
+        playground: [],
+    });
+}
+function genSubmitLogic(entity, nameGroup) {
+    const { ns } = entity;
+    const createLogic = ns?.logics?.find((logic) => logic.name === `create`);
+    return utils_1.NaslNode.Logic({
+        name: nameGroup.viewLogicSubmit,
+        params: [],
+        returns: [],
+        variables: [
+            utils_1.NaslNode.Variable({
+                name: 'validateResult',
+                typeAnnotation: utils_1.NaslUITypeAnnotation.ValidateEvent,
+            }),
+        ],
+        body: [
+            utils_1.NaslLogicItem.Start,
+            utils_1.NaslLogicItem.Assignment({
+                left: utils_1.NaslLogicItem.Identifier({
+                    name: 'validateResult',
+                }),
+                right: (0, _1.genCallComponentLogic)(nameGroup.viewElementSaveModalForm, 'validate'),
+            }),
+            utils_1.NaslLogicItem.IfStatement({
+                test: utils_1.NaslLogicItem.MemberExpression({
+                    object: utils_1.NaslLogicItem.Identifier({
+                        name: 'validateResult',
+                    }),
+                    property: utils_1.NaslLogicItem.Identifier({
+                        name: 'valid',
+                    }),
+                }),
+                consequent: [
+                    utils_1.NaslLogicItem.CallLogic({
+                        calleeNamespace: createLogic.getNamespace(),
+                        calleeName: createLogic.name,
+                        arguments: [(0, _1.genLogicParam)(`${createLogic.params[0].name}`, nameGroup.viewVariableInput)],
+                    }),
+                    (0, _1.genCallComponentLogic)(nameGroup.viewElementSaveModal, 'close'),
+                    (0, _1.genCallComponentLogic)(nameGroup.viewElementMainView, 'reload'),
+                ],
+                alternate: [],
+            }),
+            utils_1.NaslLogicItem.End,
+        ],
+        playground: [],
+    });
+}
+exports.genSubmitLogic = genSubmitLogic;
+function genUpdateSubmitLogic(entity, nameGroup) {
+    const { ns } = entity;
+    const updateLogic = ns?.logics?.find((logic) => logic.name === `update`);
+    return utils_1.NaslNode.Logic({
+        name: nameGroup.viewLogicUpdateSubmit,
+        params: [],
+        returns: [],
+        variables: [
+            utils_1.NaslNode.Variable({
+                name: 'validateResult',
+                typeAnnotation: utils_1.NaslUITypeAnnotation.ValidateEvent,
+            }),
+        ],
+        body: [
+            utils_1.NaslLogicItem.Start,
+            utils_1.NaslLogicItem.Assignment({
+                left: utils_1.NaslLogicItem.Identifier({
+                    name: 'validateResult',
+                }),
+                right: (0, _1.genCallComponentLogic)(nameGroup.viewElementSaveModalForm, 'validate'),
+            }),
+            utils_1.NaslLogicItem.IfStatement({
+                test: utils_1.NaslLogicItem.MemberExpression({
+                    object: utils_1.NaslLogicItem.Identifier({
+                        name: 'validateResult',
+                    }),
+                    property: utils_1.NaslLogicItem.Identifier({
+                        name: 'valid',
+                    }),
+                }),
+                consequent: [
+                    utils_1.NaslLogicItem.CallLogic({
+                        calleeNamespace: updateLogic.getNamespace(),
+                        calleeName: updateLogic.name,
+                        arguments: [(0, _1.genLogicParam)(`${updateLogic.params[0].name}`, nameGroup.viewVariableInput)],
+                    }),
+                    (0, _1.genCallComponentLogic)(nameGroup.viewElementSaveModal, 'close'),
+                    (0, _1.genCallComponentLogic)(nameGroup.viewElementMainView, 'reload'),
+                ],
+                alternate: [],
+            }),
+            utils_1.NaslLogicItem.End,
+        ],
+        playground: [],
+    });
+}
+exports.genUpdateSubmitLogic = genUpdateSubmitLogic;
+function genModifyLogic(entity, nameGroup) {
+    const lowerEntityName = utils.firstLowerCase(entity.name);
+    return utils_1.NaslNode.Logic({
+        name: nameGroup.viewLogicModify,
+        description: '',
+        params: [],
+        returns: [],
+        variables: [],
+        body: [
+            utils_1.NaslLogicItem.Start,
+            utils_1.NaslLogicItem.Assignment({
+                left: utils_1.NaslLogicItem.Identifier({
+                    name: nameGroup.viewVariableIsUpdate,
+                }),
+                right: utils_1.NaslLogicItem.Identifier({
+                    name: 'true',
+                }),
+            }),
+            utils_1.NaslLogicItem.Assignment({
+                left: utils_1.NaslLogicItem.Identifier({
+                    name: nameGroup.viewVariableInput,
+                }),
+                right: utils_1.NaslLogicItem.CallFunction({
+                    calleeName: 'Clone',
+                    arguments: [
+                        utils_1.NaslLogicItem.Argument({
+                            keyword: 'obj',
+                            expression: utils_1.NaslLogicItem.MemberExpression({
+                                object: utils_1.NaslLogicItem.MemberExpression({
+                                    object: utils_1.NaslLogicItem.Identifier({
+                                        name: 'current',
+                                    }),
+                                    property: utils_1.NaslLogicItem.Identifier({
+                                        name: 'item',
+                                    }),
+                                }),
+                                property: utils_1.NaslLogicItem.Identifier({
+                                    name: lowerEntityName,
+                                }),
+                            }),
+                        }),
+                    ],
+                }),
+            }),
+            (0, _1.genCallComponentLogic)(nameGroup.viewElementSaveModal, 'open'),
+            utils_1.NaslLogicItem.End,
+        ],
+        playground: [],
+    });
+}
+// 列表（全）
+function genCurdMultipleKeyBlock(entity, oldNode) {
+    const { view } = oldNode;
+    const dataSource = entity.parentNode;
+    const module = dataSource.app;
+    const viewElementMainView = view.getViewElementUniqueName('tableView');
+    const nameGroup = (0, _1.genUniqueQueryNameGroup)(module, view, viewElementMainView);
+    nameGroup.viewElementMainView = viewElementMainView;
+    nameGroup.viewElementSaveModal = view.getViewElementUniqueName('saveModal');
+    nameGroup.viewElementSaveModalForm = view.getViewElementUniqueName('saveModalForm');
+    nameGroup.viewLogicRemove = view.getLogicUniqueName('remove');
+    nameGroup.viewLogicInit = view.getLogicUniqueName('init');
+    nameGroup.viewLogicCreate = view.getLogicUniqueName('create');
+    nameGroup.viewLogicModify = view.getLogicUniqueName('modify');
+    nameGroup.viewLogicSubmit = view.getLogicUniqueName('submit');
+    nameGroup.viewLogicUpdateSubmit = view.getLogicUniqueName('updateSubmit');
+    nameGroup.viewLogicReload = view.getLogicUniqueName('reload');
+    nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
+    nameGroup.viewVariableInput = view.getVariableUniqueName('input');
+    nameGroup.viewVariableFilter = view.getVariableUniqueName('filter');
+    nameGroup.viewVariableIsUpdate = view.getVariableUniqueName('isUpdate');
+    // 收集所有和本实体关联的实体
+    const entitySet = new Set();
+    entitySet.add(entity);
+    const selectNameGroupMap = new Map();
+    const newLogics = [];
+    const newLoadSelectLogics = [];
+    entity.properties.forEach((property) => {
+        // 有外键关联
+        if (property.relationEntity) {
+            const relationEntity = dataSource?.findEntityByName(property.relationEntity);
+            if (relationEntity) {
+                const displayedProperty = (0, _1.getFirstDisplayedProperty)(relationEntity);
+                if (displayedProperty) {
+                    entitySet.add(relationEntity);
+                    const viewElementSelect = view.getViewElementUniqueName('select');
+                    const selectNameGroup = (0, _1.genUniqueQueryNameGroup)(module, view, viewElementSelect, false, relationEntity.name);
+                    selectNameGroup.viewElementSelect = viewElementSelect;
+                    // 存在多个属性关联同一个实体的情况，因此加上属性名用以唯一标识
+                    const key = [property.name, relationEntity.name].join('-');
+                    selectNameGroupMap.set(key, selectNameGroup);
+                    const newLogic = (0, _1.genQueryLogic)([relationEntity], selectNameGroup, false, false, module);
+                    newLogics.push(newLogic);
+                    newLoadSelectLogics.push((0, _1.genLoadSelectLogic)(relationEntity, selectNameGroup, newLogic));
+                }
+            }
+        }
+    });
+    const allEntities = [...entitySet];
+    const entityLogic = (0, _1.genQueryLogic)(allEntities, nameGroup, true, true, module);
+    newLogics.push(entityLogic);
     return `<template>
     <u-linear-layout direction="vertical">
         ${genFilterTemplate(entity, nameGroup, selectNameGroupMap)}
@@ -513,25 +513,25 @@ function genCurdMultipleKeyBlock(entity, oldNode) {
         {
             "concept": "Variable",
             "name": "${nameGroup.viewVariableEntity}",
-            "typeAnnotation": ${JSON.stringify(utils_1.NaslTypeAnnotation.Reference({
-        typeNamespace: entity.getNamespace(),
-        typeName: entity.name,
+            "typeAnnotation": ${JSON.stringify(utils_1.NaslTypeAnnotation.Reference({
+        typeNamespace: entity.getNamespace(),
+        typeName: entity.name,
     }))}
         },
         {
             "concept": "Variable",
             "name": "${nameGroup.viewVariableInput}",
-            "typeAnnotation": ${JSON.stringify(utils_1.NaslTypeAnnotation.Reference({
-        typeNamespace: entity.getNamespace(),
-        typeName: entity.name,
+            "typeAnnotation": ${JSON.stringify(utils_1.NaslTypeAnnotation.Reference({
+        typeNamespace: entity.getNamespace(),
+        typeName: entity.name,
     }))}
         },
         {
             "concept": "Variable",
             "name": "${nameGroup.viewVariableFilter}",
-            "typeAnnotation": ${JSON.stringify(utils_1.NaslTypeAnnotation.Reference({
-        typeNamespace: entity.getNamespace(),
-        typeName: entity.name,
+            "typeAnnotation": ${JSON.stringify(utils_1.NaslTypeAnnotation.Reference({
+        typeNamespace: entity.getNamespace(),
+        typeName: entity.name,
     }))}
         },
         {
@@ -564,60 +564,60 @@ function genCurdMultipleKeyBlock(entity, oldNode) {
     "logics": ${JSON.stringify(newLogics)}
 }
 </definition>
-`;
-}
-exports.genCurdMultipleKeyBlock = genCurdMultipleKeyBlock;
-// 数据网格（全）
-function genGridViewMultipleKeyBlock(entity, oldNode) {
-    const { view } = oldNode;
-    const dataSource = entity.parentNode;
-    const module = dataSource.app;
-    const viewElementMainView = view.getViewElementUniqueName('gridView');
-    const nameGroup = (0, _1.genUniqueQueryNameGroup)(module, view, viewElementMainView);
-    nameGroup.viewElementMainView = viewElementMainView;
-    nameGroup.viewElementSaveModal = view.getViewElementUniqueName('saveModal');
-    nameGroup.viewElementSaveModalForm = view.getViewElementUniqueName('saveModalForm');
-    nameGroup.viewLogicRemove = view.getLogicUniqueName('remove');
-    nameGroup.viewLogicInit = view.getLogicUniqueName('init');
-    nameGroup.viewLogicCreate = view.getLogicUniqueName('create');
-    nameGroup.viewLogicModify = view.getLogicUniqueName('modify');
-    nameGroup.viewLogicSubmit = view.getLogicUniqueName('submit');
-    nameGroup.viewLogicUpdateSubmit = view.getLogicUniqueName('updateSubmit');
-    nameGroup.viewLogicReload = view.getLogicUniqueName('reload');
-    nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
-    nameGroup.viewVariableInput = view.getVariableUniqueName('input');
-    nameGroup.viewVariableFilter = view.getVariableUniqueName('filter');
-    nameGroup.viewVariableIsUpdate = view.getVariableUniqueName('isUpdate');
-    // 收集所有和本实体关联的实体
-    const entitySet = new Set();
-    entitySet.add(entity);
-    const selectNameGroupMap = new Map();
-    const newLogics = [];
-    const newLoadSelectLogics = [];
-    entity.properties.forEach((property) => {
-        // 有外键关联
-        if (property.relationEntity) {
-            const relationEntity = dataSource?.findEntityByName(property.relationEntity);
-            if (relationEntity) {
-                const displayedProperty = (0, _1.getFirstDisplayedProperty)(relationEntity);
-                if (displayedProperty) {
-                    entitySet.add(relationEntity);
-                    const viewElementSelect = view.getViewElementUniqueName('select');
-                    const selectNameGroup = (0, _1.genUniqueQueryNameGroup)(module, view, viewElementSelect, false, relationEntity.name);
-                    selectNameGroup.viewElementSelect = viewElementSelect;
-                    // 存在多个属性关联同一个实体的情况，因此加上属性名用以唯一标识
-                    const key = [property.name, relationEntity.name].join('-');
-                    selectNameGroupMap.set(key, selectNameGroup);
-                    const newLogic = (0, _1.genQueryLogic)([relationEntity], selectNameGroup, false, false, module);
-                    newLogics.push(newLogic);
-                    newLoadSelectLogics.push((0, _1.genLoadSelectLogic)(relationEntity, selectNameGroup, newLogic));
-                }
-            }
-        }
-    });
-    const allEntities = [...entitySet];
-    const entityLogic = (0, _1.genQueryLogic)(allEntities, nameGroup, true, true, module);
-    newLogics.push(entityLogic);
+`;
+}
+exports.genCurdMultipleKeyBlock = genCurdMultipleKeyBlock;
+// 数据网格（全）
+function genGridViewMultipleKeyBlock(entity, oldNode) {
+    const { view } = oldNode;
+    const dataSource = entity.parentNode;
+    const module = dataSource.app;
+    const viewElementMainView = view.getViewElementUniqueName('gridView');
+    const nameGroup = (0, _1.genUniqueQueryNameGroup)(module, view, viewElementMainView);
+    nameGroup.viewElementMainView = viewElementMainView;
+    nameGroup.viewElementSaveModal = view.getViewElementUniqueName('saveModal');
+    nameGroup.viewElementSaveModalForm = view.getViewElementUniqueName('saveModalForm');
+    nameGroup.viewLogicRemove = view.getLogicUniqueName('remove');
+    nameGroup.viewLogicInit = view.getLogicUniqueName('init');
+    nameGroup.viewLogicCreate = view.getLogicUniqueName('create');
+    nameGroup.viewLogicModify = view.getLogicUniqueName('modify');
+    nameGroup.viewLogicSubmit = view.getLogicUniqueName('submit');
+    nameGroup.viewLogicUpdateSubmit = view.getLogicUniqueName('updateSubmit');
+    nameGroup.viewLogicReload = view.getLogicUniqueName('reload');
+    nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
+    nameGroup.viewVariableInput = view.getVariableUniqueName('input');
+    nameGroup.viewVariableFilter = view.getVariableUniqueName('filter');
+    nameGroup.viewVariableIsUpdate = view.getVariableUniqueName('isUpdate');
+    // 收集所有和本实体关联的实体
+    const entitySet = new Set();
+    entitySet.add(entity);
+    const selectNameGroupMap = new Map();
+    const newLogics = [];
+    const newLoadSelectLogics = [];
+    entity.properties.forEach((property) => {
+        // 有外键关联
+        if (property.relationEntity) {
+            const relationEntity = dataSource?.findEntityByName(property.relationEntity);
+            if (relationEntity) {
+                const displayedProperty = (0, _1.getFirstDisplayedProperty)(relationEntity);
+                if (displayedProperty) {
+                    entitySet.add(relationEntity);
+                    const viewElementSelect = view.getViewElementUniqueName('select');
+                    const selectNameGroup = (0, _1.genUniqueQueryNameGroup)(module, view, viewElementSelect, false, relationEntity.name);
+                    selectNameGroup.viewElementSelect = viewElementSelect;
+                    // 存在多个属性关联同一个实体的情况，因此加上属性名用以唯一标识
+                    const key = [property.name, relationEntity.name].join('-');
+                    selectNameGroupMap.set(key, selectNameGroup);
+                    const newLogic = (0, _1.genQueryLogic)([relationEntity], selectNameGroup, false, false, module);
+                    newLogics.push(newLogic);
+                    newLoadSelectLogics.push((0, _1.genLoadSelectLogic)(relationEntity, selectNameGroup, newLogic));
+                }
+            }
+        }
+    });
+    const allEntities = [...entitySet];
+    const entityLogic = (0, _1.genQueryLogic)(allEntities, nameGroup, true, true, module);
+    newLogics.push(entityLogic);
     return `<template>
     <u-linear-layout direction="vertical">
         ${genFilterTemplate(entity, nameGroup, selectNameGroupMap)}
@@ -632,25 +632,25 @@ function genGridViewMultipleKeyBlock(entity, oldNode) {
         {
             "concept": "Variable",
             "name": "${nameGroup.viewVariableEntity}",
-            "typeAnnotation": ${JSON.stringify(utils_1.NaslTypeAnnotation.Reference({
-        typeNamespace: entity.getNamespace(),
-        typeName: entity.name,
+            "typeAnnotation": ${JSON.stringify(utils_1.NaslTypeAnnotation.Reference({
+        typeNamespace: entity.getNamespace(),
+        typeName: entity.name,
     }))}
         },
         {
             "concept": "Variable",
             "name": "${nameGroup.viewVariableInput}",
-            "typeAnnotation": ${JSON.stringify(utils_1.NaslTypeAnnotation.Reference({
-        typeNamespace: entity.getNamespace(),
-        typeName: entity.name,
+            "typeAnnotation": ${JSON.stringify(utils_1.NaslTypeAnnotation.Reference({
+        typeNamespace: entity.getNamespace(),
+        typeName: entity.name,
     }))}
         },
         {
             "concept": "Variable",
             "name": "${nameGroup.viewVariableFilter}",
-            "typeAnnotation": ${JSON.stringify(utils_1.NaslTypeAnnotation.Reference({
-        typeNamespace: entity.getNamespace(),
-        typeName: entity.name,
+            "typeAnnotation": ${JSON.stringify(utils_1.NaslTypeAnnotation.Reference({
+        typeNamespace: entity.getNamespace(),
+        typeName: entity.name,
     }))}
         },
         {
@@ -682,23 +682,23 @@ function genGridViewMultipleKeyBlock(entity, oldNode) {
     "logics": ${JSON.stringify(newLogics)}
 }
 </definition>
-`;
-}
-exports.genGridViewMultipleKeyBlock = genGridViewMultipleKeyBlock;
-function genReloadLogic(nameGroup) {
-    return utils_1.NaslNode.Logic({
-        name: nameGroup.viewLogicReload,
-        params: [],
-        returns: [],
-        variables: [
-            utils_1.NaslNode.Variable({
-                name: 'validateResult',
-                typeAnnotation: utils_1.NaslUITypeAnnotation.ValidateEvent,
-            }),
-        ],
-        body: [utils_1.NaslLogicItem.Start, (0, _1.genCallComponentLogic)(nameGroup.viewElementMainView, 'reload'), utils_1.NaslLogicItem.End],
-        playground: [],
-    });
-}
-exports.genReloadLogic = genReloadLogic;
+`;
+}
+exports.genGridViewMultipleKeyBlock = genGridViewMultipleKeyBlock;
+function genReloadLogic(nameGroup) {
+    return utils_1.NaslNode.Logic({
+        name: nameGroup.viewLogicReload,
+        params: [],
+        returns: [],
+        variables: [
+            utils_1.NaslNode.Variable({
+                name: 'validateResult',
+                typeAnnotation: utils_1.NaslUITypeAnnotation.ValidateEvent,
+            }),
+        ],
+        body: [utils_1.NaslLogicItem.Start, (0, _1.genCallComponentLogic)(nameGroup.viewElementMainView, 'reload'), utils_1.NaslLogicItem.End],
+        playground: [],
+    });
+}
+exports.genReloadLogic = genReloadLogic;
 //# sourceMappingURL=genCurdMultipleKeyBlock.js.map