@lcap/nasl 0.3.12-beta → 0.3.12-beta.3

package/src/types/data/Entity.ts

@@ -334,16 +334,27 @@ export class Entity extends Vertex implements ObjectSchema {
         this.dataNode.service.emit('vertexIdToNameChange', this.id, this.name);
     }
     /**
-     * 设置实体描述
-     * @param description 描述
+     * 设置实体表名
+     * @param tableName 表名
      */
-    @action('设置实体描述')
-    async setDescription(description: string) {
-        this.assign({ description });
+     @action('设置实体表名')
+    async setTableName(tableName: string) {
+        this.assign({ tableName });
         await this.update(undefined, {
-            actionDesc: `设置实体"${this.name}"的描述为"${description}"`,
+            actionDesc: `设置实体"${this.name}"的表名为"${tableName}"`,
         });
     }
+    /**
+     * 设置实体描述
+     * @param description 描述
+     */
+    @action('设置实体描述')
+     async setDescription(description: string) {
+         this.assign({ description });
+         await this.update(undefined, {
+             actionDesc: `设置实体"${this.name}"的描述为"${description}"`,
+         });
+     }
     /**
      * 同步interfaces
      * interface、logic、params、returns、variabes采用plainAssign

package/src/types/data/Enum.ts

@@ -80,6 +80,11 @@ export class Enum extends Vertex {
 
     @excludedInJSON()
     public existingNames: Array<string> = [];
+    /**
+     * 归属的模块
+     */
+        @immutable()
+        public readonly moduleName: string = undefined;
     /**
      * @param source 需要合并的部分参数
      */

package/src/types/data/Module.ts

@@ -0,0 +1,51 @@
+import { immutable, circular } from '../decorators';
+import {
+    LEVEL_ENUM, Vertex,
+    Interface, Structure, Enum, App,
+} from '..';
+
+export interface Category {
+    level: LEVEL_ENUM.category;
+    name: string;
+    categoryInterfaces: Array<Interface>;
+    categoryStructures: Array<Structure>;
+    isLeaf: false;
+    structureExpanded: false;
+    interfaceExpanded: false;
+}
+/**
+ * 数据分类
+ */
+export class Module extends Vertex {
+    /**
+     * 模块名
+     */
+    @immutable()
+    public readonly name: string = '';
+    @immutable()
+    public readonly level: LEVEL_ENUM = LEVEL_ENUM.module;
+
+    @immutable()
+    public globalLogics: Array<Interface> = [];
+    public structures: Array<Structure> = [];
+    public enums: Array<Enum> = [];
+
+    public structureExpanded: Boolean = false;
+    public enumExpanded: Boolean = false;
+    public globalLogicExpanded: Boolean = false;
+    public structureHidden: Boolean = false;
+    public enumHidden: Boolean = false;
+
+    @circular()
+    @immutable()
+    public readonly app: App = undefined;
+    /**
+     * @param source 需要合并的部分参数
+     */
+    constructor(source?: Partial<Module>) {
+        super();
+        source && this.assign(source);
+    }
+}
+
+export default Module;

package/src/types/data/Structure.ts

@@ -86,6 +86,11 @@ export class Structure extends Vertex implements ObjectSchema {
      */
     @excludedInJSON()
     public existingNames: Array<string> = [];
+    /**
+     * 归属的模块
+     */
+    @immutable()
+    public readonly moduleName: string = undefined;
     /**
      * 周边存在的名称
      */

package/src/types/data/genBlock/{genCurdEditTableBlock.ts → genCurdEditMultipleKeyBlock.ts}

@@ -1,6 +1,11 @@
+/**
+ * 1. 从genCurdEditTableBlock组件复制，算是工行的定制化需求多主键(联合主键的支持)
+ * 2. 改动了原来判断id的逻辑
+ * 3. 先简单做后续在看如何优化
+ */
 import { dataTypesMap, vertexsMap, utils, Entity, View, EntityProperty, Enum, LEVEL_ENUM } from '../..';
 import {
-    filterProperty, NameGroup, genUniqueQueryNameGroup, getFirstDisplayedProperty, getParamFromResolver, genGenericTypeSchema, genVariable, genInterParam, genCallComponentLogic, genCallInterface, genQueryInterface, genQueryStructure,
+    filterProperty, NameGroup, genUniqueQueryNameGroup, getFirstDisplayedProperty, getParamFromResolver, genGenericTypeSchema, genVariable, genInterParam, genCallComponentLogic, genCallInterface, genQueryInterface,
     genEnumSelectBlock, genEditTableTemplate, genEditTableLoadLogic, genTableRemoveLogic, genLoadSelectLogic,
     genEditQueryStructure,
     genBlurUpdateLogic,
@@ -77,13 +82,11 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
     const propertyList = entity.propertyList
         .filter(filterProperty('inForm'));
 
-    const idProperty = entity.propertyList.find((item) => item.primaryKey || item.name === 'id');
-
     return `
     <u-modal ref="saveModal">
         <template #title>
-            <div v-if="input.${idProperty.name}">修改</div>
-            <div v-if="input.${idProperty.name} == undefined">创建</div>
+            <div v-if="isUpdate">修改</div>
+            <div v-if="!isUpdate">创建</div>
         </template>
         <template #body>
             <u-form ref="form1">
@@ -152,8 +155,8 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
         </template>
         <template #foot>
             <u-linear-layout>
-                <u-button color="primary" @click="${nameGroup.submit}()" v-if="input.${idProperty.name}">提交修改</u-button>
-                <u-button color="primary" @click="${nameGroup.submit}()" v-if="input.${idProperty.name} == undefined">立即创建</u-button>
+                <u-button color="primary" @click="${nameGroup.submit}()" v-if="isUpdate">提交修改</u-button>
+                <u-button color="primary" @click="${nameGroup.submit}()" v-if="!isUpdate">立即创建</u-button>
             </u-linear-layout>
         </template>
     </u-modal>`;
@@ -228,74 +231,16 @@ function genCreateLogic(entity: Entity, nameGroup: NameGroup) {
                 left: {
                     level: 'expressionNode',
                     type: 'Identifier',
-                    name: 'input',
+                    name: 'isUpdate',
                 },
                 right: {
-                    parentAttr: 'right',
+                    folded: false,
                     level: 'expressionNode',
-                    type: 'BuiltInFunction',
-                    label: '内置函数',
-                    calleeCode: 'Clone',
-                    builtInFuncParams: [
-                        {
-                            parentAttr: 'builtInFuncParams',
-                            level: 'expressionNode',
-                            type: 'BuiltInFuncParam',
-                            name: 'obj',
-                            builtInFuncParamValue: {
-                                parentAttr: 'builtInFuncParamValue',
-                                level: 'expressionNode',
-                                type: 'Identifier',
-                                name: nameGroup.lowerEntity,
-                            },
-                            schema: builtInFunctions.Clone.params[0].schema,
-                        },
-                    ],
-                },
-            },
-            genCallComponentLogic('saveModal', 'open'),
-            {
-                level: 'logicNode',
-                type: 'End',
-                label: '结束',
-            },
-        ],
-        playground: [] as Array<any>,
-    };
-}
-
-function genModifyLogic(entity: Entity, nameGroup: NameGroup) {
-    const scopeStructureSchema = genGenericTypeSchema('ScopeOf', { T: { $ref: nameGroup.structure } });
-
-    return {
-        level: 'logic',
-        expanded: false,
-        name: nameGroup.modify,
-        description: '',
-        params: [
-            {
-                level: 'param',
-                type: 'Identifier',
-                name: 'event',
-                schema: {
-                    type: 'string',
-                    format: '',
+                    parentAttr: 'right',
+                    type: 'BooleanLiteral',
+                    value: false,
                 },
             },
-            {
-                level: 'param',
-                name: 'scope',
-                schema: scopeStructureSchema,
-            },
-        ],
-        returns: [] as Array<any>,
-        variables: [] as Array<any>,
-        body: [
-            {
-                level: 'logicNode',
-                type: 'Start',
-                label: '开始',
-            },
             {
                 level: 'logicNode',
                 type: 'AssignmentExpression',
@@ -321,36 +266,8 @@ function genModifyLogic(entity: Entity, nameGroup: NameGroup) {
                             builtInFuncParamValue: {
                                 parentAttr: 'builtInFuncParamValue',
                                 level: 'expressionNode',
-                                type: 'MemberExpression',
-                                object: {
-                                    parentAttr: 'builtInFuncParamValue',
-                                    level: 'expressionNode',
-                                    type: 'MemberExpression',
-                                    object: {
-                                        parentAttr: 'object',
-                                        level: 'expressionNode',
-                                        type: 'Identifier',
-                                        name: 'scope',
-                                    },
-                                    property: {
-                                        parentAttr: 'property',
-                                        level: 'expressionNode',
-                                        type: 'Identifier',
-                                        name: 'item',
-                                        schemaRef: '',
-                                        code: 'item',
-                                    },
-                                    code: '',
-                                },
-                                property: {
-                                    parentAttr: 'property',
-                                    level: 'expressionNode',
-                                    type: 'Identifier',
-                                    name: nameGroup.lowerEntity,
-                                    schemaRef: `${nameGroup.structure}.${nameGroup.lowerEntity}`,
-                                    code: '',
-                                },
-                                code: '',
+                                type: 'Identifier',
+                                name: nameGroup.lowerEntity,
                             },
                             schema: builtInFunctions.Clone.params[0].schema,
                         },
@@ -374,8 +291,6 @@ function genSubmitLogic(entity: Entity, nameGroup: NameGroup, tableRefName = 'ta
     const updateBodyParam = getParamFromResolver(updateResolver, 'body');
     const createBodyparam = getParamFromResolver(createResolver, 'body');
 
-    const idProperty = entity.propertyList.find((item) => item.primaryKey || item.name === 'id');
-
     return {
         level: 'logic',
         name: nameGroup.submit,
@@ -428,51 +343,25 @@ function genSubmitLogic(entity: Entity, nameGroup: NameGroup, tableRefName = 'ta
                         type: 'IfStatement',
                         label: '条件分支',
                         test: {
-                            parentAttr: 'test',
                             level: 'expressionNode',
-                            type: 'BuiltInFunction',
-                            label: '内置函数',
-                            calleeCode: 'Convert',
-                            builtInFuncParams: [
-                                {
-                                    parentAttr: 'builtInFuncParams',
-                                    level: 'expressionNode',
-                                    type: 'BuiltInFuncParam',
-                                    name: 'value',
-                                    builtInFuncParamValue: {
-                                        level: 'expressionNode',
-                                        type: 'MemberExpression',
-                                        object: {
-                                            level: 'expressionNode',
-                                            type: 'Identifier',
-                                            name: 'input',
-                                        },
-                                        property: {
-                                            level: 'expressionNode',
-                                            type: 'Identifier',
-                                            name: 'id',
-                                            schemaRef: idProperty.id,
-                                            code: `ID_${idProperty.id}`,
-                                        },
-                                    },
-                                    schema: builtInFunctions.Convert.params[0].schema,
-                                },
-                                {
-                                    parentAttr: 'builtInFuncParams',
-                                    level: 'expressionNode',
-                                    type: 'BuiltInFuncParam',
-                                    name: 'convertTo',
-                                    builtInFuncParamValue: {
-                                        level: 'expressionNode',
-                                        type: 'TypeNote',
-                                        schema: {
-                                            format: '',
-                                            type: 'boolean',
-                                        },
-                                    },
-                                    schema: builtInFunctions.Convert.params[1].schema,
-                                },
-                            ],
+                            parentAttr: 'test',
+                            label: '比较运算',
+                            type: 'BinaryExpression',
+                            left: {
+                                level: 'expressionNode',
+                                parentAttr: 'left',
+                                folded: false,
+                                type: 'Identifier',
+                                name: 'isUpdate',
+                            },
+                            right: {
+                                level: 'expressionNode',
+                                parentAttr: 'right',
+                                folded: false,
+                                type: 'BooleanLiteral',
+                                value: true,
+                            },
+                            operator: '==',
                         },
                         consequent: [
                             genCallInterface(updateResolver.interface, [
@@ -501,7 +390,7 @@ function genSubmitLogic(entity: Entity, nameGroup: NameGroup, tableRefName = 'ta
     };
 }
 
-export function genCurdEditTableBlock(entity: Entity, view: View) {
+export function genCurdEditMultipleKeyBlock(entity: Entity, view: View) {
     const existingNameSets = {
         viewLogic: new Set(view.$def.logics.map((logic) => logic.name)),
         interface: new Set(entity.dataNode.service.interfaces.map((itface) => itface.name)),
@@ -512,7 +401,6 @@ export function genCurdEditTableBlock(entity: Entity, view: View) {
     nameGroup.remove = utils.unique('remove', existingNameSets.viewLogic);
     nameGroup.init = utils.unique('init', existingNameSets.viewLogic);
     nameGroup.create = utils.unique('create', existingNameSets.viewLogic);
-    // nameGroup.modify = utils.unique('modify', existingNameSets.viewLogic);
     nameGroup.submit = utils.unique('submit', existingNameSets.viewLogic);
     nameGroup.lowerEntity = utils.firstLowerCase(entity.name);
     nameGroup.blurUpdate = utils.unique('blurUpdate', existingNameSets.viewLogic);
@@ -553,7 +441,8 @@ export function genCurdEditTableBlock(entity: Entity, view: View) {
     "variables": [
         ${JSON.stringify(genVariable(utils.firstLowerCase(entity.name), entity.schemaRef, LEVEL_ENUM.variable))},
         ${JSON.stringify(genVariable('input', entity.schemaRef, LEVEL_ENUM.variable))},
-        ${JSON.stringify(genVariable('filter', entity.schemaRef, LEVEL_ENUM.variable))}
+        ${JSON.stringify(genVariable('filter', entity.schemaRef, LEVEL_ENUM.variable))},
+        ${JSON.stringify(genVariable('isUpdate', { type: 'boolean', format: '' }, LEVEL_ENUM.variable))}
     ],
     "lifecycles": [
         {
@@ -577,5 +466,3 @@ export function genCurdEditTableBlock(entity: Entity, view: View) {
 </definition>
 `;
 }
-
-export default genCurdEditTableBlock;

package/src/types/data/genBlock/{genCurdBlock.ts → genCurdMultipleKeyBlock.ts}

@@ -1,7 +1,14 @@
+/**
+ * 1. 从genCurdBlock组件复制，算是工行的定制化需求多主键(联合主键的支持)
+ * 2. 改动了原来判断id的逻辑
+ * 3. 先简单做后续在看如何优化，
+ * 4. 主键目前支持 Long String Double 类型接口所以只禁用了对应的三个类型
+ */
 import { dataTypesMap, vertexsMap, utils, Entity, View, EntityProperty, Enum, LEVEL_ENUM } from '../..';
 import {
     filterProperty, NameGroup, genUniqueQueryNameGroup, getFirstDisplayedProperty, getParamFromResolver, genGenericTypeSchema, genVariable, genInterParam, genCallComponentLogic, genCallInterface, genQueryInterface, genQueryStructure,
-    genEnumSelectBlock, genTableTemplate, genTableLoadLogic, genTableRemoveLogic, genLoadSelectLogic, genGridViewTemplate, genGridViewLoadLogic, genGridViewRemoveLogic,
+    genEnumSelectBlock, genTableTemplate, genTableLoadLogic, genTableRemoveLogic, genLoadSelectLogic,
+    genGridViewTemplate, genGridViewLoadLogic, genGridViewRemoveLogic,
 } from '.';
 import builtInFunctions = require('./builtInFunctions.json');
 
@@ -75,13 +82,11 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
     const propertyList = entity.propertyList
         .filter(filterProperty('inForm'));
 
-    const idProperty = entity.propertyList.find((item) => item.primaryKey || item.name === 'id');
-
     return `
     <u-modal ref="saveModal">
         <template #title>
-            <div v-if="input.${idProperty.name}">修改</div>
-            <div v-if="input.${idProperty.name} == undefined">创建</div>
+            <div v-if="isUpdate">修改</div>
+            <div v-if="!isUpdate">创建</div>
         </template>
         <template #body>
             <u-form ref="form1">
@@ -95,11 +100,9 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
         if (required)
             rules.push('required');
         const rulesStr = rules.join(' | ');
-
         let formItem = `<u-form-item
                                     label="${label}"
                                     ${required ? 'required' : ''}
-                                    ${rulesStr.length ? `rules="${rulesStr}"` : ''}
                                 >`;
 
         if (property.$relationEntity) { // 有外键关联
@@ -111,7 +114,7 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
                     const lowerEntityName = utils.firstLowerCase(relationEntity.name);
                     formItem += `
                         <u-select clearable placeholder="请选择${label}" :data-source="${selectNameGroupMap.get(relationEntity.id).load}"
-                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pageable="true" :remote-paging="true" v-model="input.${property.name}">
+                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pageable="true" :remote-paging="true" v-model="input.${property.name}" ${property.primaryKey ? ':disabled="isUpdate"' : ''}>
                         </u-select>
                     `;
                 } else
@@ -120,26 +123,26 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
                 return '';
         } else if (property.typeKey === '#/basicTypes/Boolean') {
             formItem += `
-                        <u-select clearable v-model="input.${property.name}" placeholder="请输入${label}">
+                        <u-select clearable v-model="input.${property.name}" placeholder="请输入${label}" ${property.primaryKey ? ':disabled="isUpdate"' : ''}>
                             <u-select-item :value="true">是</u-select-item>
                             <u-select-item :value="false">否</u-select-item>
                         </u-select>`;
         } else if (property.typeKey === '#/basicTypes/Integer' || property.typeKey === '#/basicTypes/Long') {
-            formItem += `<u-number-input v-model="input.${property.name}" placeholder="请输入${label}"></u-number-input>`;
+            formItem += `<u-number-input v-model="input.${property.name}" placeholder="请输入${label}" ${property.primaryKey ? ':disabled="isUpdate"' : ''}></u-number-input>`;
         } else if (property.typeKey === '#/basicTypes/Decimal') {
-            formItem += `<u-number-input v-model="input.${property.name}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
+            formItem += `<u-number-input v-model="input.${property.name}" :precision="0" :step="0" placeholder="请输入${label}" ${property.primaryKey ? ':disabled="isUpdate"' : ''}></u-number-input>`;
         } else if (property.typeKey === '#/basicTypes/Text') {
-            formItem += `<u-textarea v-model="input.${property.name}" placeholder="请输入${label}"></u-textarea>`;
+            formItem += `<u-textarea v-model="input.${property.name}" placeholder="请输入${label}" ${property.primaryKey ? ':disabled="isUpdate"' : ''}></u-textarea>`;
         } else if (property.typeKey === '#/basicTypes/Date') {
-            formItem += `<u-date-picker clearable :date.sync="input.${property.name}" placeholder="请输入${label}"></u-date-picker>`;
+            formItem += `<u-date-picker clearable :date.sync="input.${property.name}" placeholder="请输入${label}" ${property.primaryKey ? ':disabled="isUpdate"' : ''}></u-date-picker>`;
         } else if (property.typeKey === '#/basicTypes/Time') {
-            formItem += `<u-time-picker :time.sync="input.${property.name}" placeholder="请输入${label}"></u-time-picker>`;
+            formItem += `<u-time-picker :time.sync="input.${property.name}" placeholder="请输入${label}" ${property.primaryKey ? ':disabled="isUpdate"' : ''}></u-time-picker>`;
         } else if (property.typeKey === '#/basicTypes/DateTime') {
-            formItem += `<u-date-time-picker clearable :date.sync="input.${property.name}" placeholder="请输入${label}"></u-date-time-picker>`;
+            formItem += `<u-date-time-picker clearable :date.sync="input.${property.name}" placeholder="请输入${label}" ${property.primaryKey ? ':disabled="isUpdate"' : ''}></u-date-time-picker>`;
         } else if (dataTypesMap[property.typeKey].type === 'enum') {
             formItem += genEnumSelectBlock(dataTypesMap[property.typeKey] as Enum, `input.${property.name}`, '', `请选择${label}`, true);
         } else {
-            formItem += `<u-input v-model="input.${property.name}" placeholder="请输入${label}"></u-input>`;
+            formItem += `<u-input v-model="input.${property.name}" placeholder="请输入${label}" ${property.primaryKey ? ':disabled="isUpdate"' : ''}></u-input>`;
         }
 
         formItem += `</u-form-item>\n`;
@@ -150,8 +153,8 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
         </template>
         <template #foot>
             <u-linear-layout>
-                <u-button color="primary" @click="${nameGroup.submit}()" v-if="input.${idProperty.name}">提交修改</u-button>
-                <u-button color="primary" @click="${nameGroup.submit}()" v-if="input.${idProperty.name} == undefined">立即创建</u-button>
+                <u-button color="primary" @click="${nameGroup.submit}()" v-if="isUpdate">提交修改</u-button>
+                <u-button color="primary" @click="${nameGroup.submit}()" v-if="!isUpdate">立即创建</u-button>
             </u-linear-layout>
         </template>
     </u-modal>`;
@@ -218,6 +221,24 @@ function genCreateLogic(entity: Entity, nameGroup: NameGroup) {
                 type: 'Start',
                 label: '开始',
             },
+            {
+                level: 'logicNode',
+                type: 'AssignmentExpression',
+                label: '赋值',
+                operator: '=',
+                left: {
+                    level: 'expressionNode',
+                    type: 'Identifier',
+                    name: 'isUpdate',
+                },
+                right: {
+                    folded: false,
+                    level: 'expressionNode',
+                    parentAttr: 'right',
+                    type: 'BooleanLiteral',
+                    value: false,
+                },
+            },
             {
                 level: 'logicNode',
                 type: 'AssignmentExpression',
@@ -294,6 +315,24 @@ function genModifyLogic(entity: Entity, nameGroup: NameGroup) {
                 type: 'Start',
                 label: '开始',
             },
+            {
+                level: 'logicNode',
+                type: 'AssignmentExpression',
+                label: '赋值',
+                operator: '=',
+                left: {
+                    level: 'expressionNode',
+                    type: 'Identifier',
+                    name: 'isUpdate',
+                },
+                right: {
+                    folded: false,
+                    level: 'expressionNode',
+                    parentAttr: 'right',
+                    type: 'BooleanLiteral',
+                    value: true,
+                },
+            },
             {
                 level: 'logicNode',
                 type: 'AssignmentExpression',
@@ -372,8 +411,6 @@ function genSubmitLogic(entity: Entity, nameGroup: NameGroup, tableRefName = 'ta
     const updateBodyParam = getParamFromResolver(updateResolver, 'body');
     const createBodyparam = getParamFromResolver(createResolver, 'body');
 
-    const idProperty = entity.propertyList.find((item) => item.primaryKey || item.name === 'id');
-
     return {
         level: 'logic',
         name: nameGroup.submit,
@@ -426,51 +463,25 @@ function genSubmitLogic(entity: Entity, nameGroup: NameGroup, tableRefName = 'ta
                         type: 'IfStatement',
                         label: '条件分支',
                         test: {
-                            parentAttr: 'test',
                             level: 'expressionNode',
-                            type: 'BuiltInFunction',
-                            label: '内置函数',
-                            calleeCode: 'Convert',
-                            builtInFuncParams: [
-                                {
-                                    parentAttr: 'builtInFuncParams',
-                                    level: 'expressionNode',
-                                    type: 'BuiltInFuncParam',
-                                    name: 'value',
-                                    builtInFuncParamValue: {
-                                        level: 'expressionNode',
-                                        type: 'MemberExpression',
-                                        object: {
-                                            level: 'expressionNode',
-                                            type: 'Identifier',
-                                            name: 'input',
-                                        },
-                                        property: {
-                                            level: 'expressionNode',
-                                            type: 'Identifier',
-                                            name: 'id',
-                                            schemaRef: idProperty.id,
-                                            code: `ID_${idProperty.id}`,
-                                        },
-                                    },
-                                    schema: builtInFunctions.Convert.params[0].schema,
-                                },
-                                {
-                                    parentAttr: 'builtInFuncParams',
-                                    level: 'expressionNode',
-                                    type: 'BuiltInFuncParam',
-                                    name: 'convertTo',
-                                    builtInFuncParamValue: {
-                                        level: 'expressionNode',
-                                        type: 'TypeNote',
-                                        schema: {
-                                            format: '',
-                                            type: 'boolean',
-                                        },
-                                    },
-                                    schema: builtInFunctions.Convert.params[1].schema,
-                                },
-                            ],
+                            parentAttr: 'test',
+                            label: '比较运算',
+                            type: 'BinaryExpression',
+                            left: {
+                                level: 'expressionNode',
+                                parentAttr: 'left',
+                                folded: false,
+                                type: 'Identifier',
+                                name: 'isUpdate',
+                            },
+                            right: {
+                                level: 'expressionNode',
+                                parentAttr: 'right',
+                                folded: false,
+                                type: 'BooleanLiteral',
+                                value: true,
+                            },
+                            operator: '==',
                         },
                         consequent: [
                             genCallInterface(updateResolver.interface, [
@@ -499,7 +510,7 @@ function genSubmitLogic(entity: Entity, nameGroup: NameGroup, tableRefName = 'ta
     };
 }
 
-export function genCurdBlock(entity: Entity, view: View) {
+export function genCurdMultipleKeyBlock(entity: Entity, view: View) {
     const existingNameSets = {
         viewLogic: new Set(view.$def.logics.map((logic) => logic.name)),
         interface: new Set(entity.dataNode.service.interfaces.map((itface) => itface.name)),
@@ -550,7 +561,8 @@ export function genCurdBlock(entity: Entity, view: View) {
     "variables": [
         ${JSON.stringify(genVariable(utils.firstLowerCase(entity.name), entity.schemaRef, LEVEL_ENUM.variable))},
         ${JSON.stringify(genVariable('input', entity.schemaRef, LEVEL_ENUM.variable))},
-        ${JSON.stringify(genVariable('filter', entity.schemaRef, LEVEL_ENUM.variable))}
+        ${JSON.stringify(genVariable('filter', entity.schemaRef, LEVEL_ENUM.variable))},
+        ${JSON.stringify(genVariable('isUpdate', { type: 'boolean', format: '' }, LEVEL_ENUM.variable))}
     ],
     "lifecycles": [
         {
@@ -575,7 +587,7 @@ export function genCurdBlock(entity: Entity, view: View) {
 `;
 }
 
-export function genCurdGridViewBlock(entity: Entity, view: View) {
+export function genGridViewMultipleKeyBlock(entity: Entity, view: View) {
     const existingNameSets = {
         viewLogic: new Set(view.$def.logics.map((logic) => logic.name)),
         interface: new Set(entity.dataNode.service.interfaces.map((itface) => itface.name)),
@@ -626,7 +638,8 @@ export function genCurdGridViewBlock(entity: Entity, view: View) {
     "variables": [
         ${JSON.stringify(genVariable(utils.firstLowerCase(entity.name), entity.schemaRef, LEVEL_ENUM.variable))},
         ${JSON.stringify(genVariable('input', entity.schemaRef, LEVEL_ENUM.variable))},
-        ${JSON.stringify(genVariable('filter', entity.schemaRef, LEVEL_ENUM.variable))}
+        ${JSON.stringify(genVariable('filter', entity.schemaRef, LEVEL_ENUM.variable))},
+        ${JSON.stringify(genVariable('isUpdate', { type: 'boolean', format: '' }, LEVEL_ENUM.variable))}
     ],
     "lifecycles": [
         {
@@ -650,5 +663,3 @@ export function genCurdGridViewBlock(entity: Entity, view: View) {
 </definition>
 `;
 }
-
-export default genCurdBlock;