@lcap/nasl 1.0.0-alpha.9 → 1.0.0

package/src/service/creator/index.js

@@ -27,12 +27,6 @@ const requester = function (requestInfo) {
             headers.Cookie = aslConfig.cookie;
     }
 
-    headers['request-lcpAppId'] = headers['request-lcpAppId'] || aslConfig.defaultApp?.id;
-    if (aslConfig.defaultApp?.baseVersion)
-        headers['request-appBaseVersion'] = aslConfig.defaultApp.baseVersion;
-    if (aslConfig.defaultApp?.versionChangedTime)
-        headers['request-versionChangedTime'] = aslConfig.defaultApp.versionChangedTime;
-
     let data;
     const method2 = method.toUpperCase();
     if (Object.keys(body).length || ['PUT', 'POST', 'PATCH'].includes(method2)) {

package/src/service/storage/api.js

@@ -0,0 +1,14 @@
+export default {
+    batchQuery: {
+        url: {
+            method: 'post',
+            path: '/proxy/nasl-storage/api/storage/batchQuery',
+        },
+    },
+    batchAction: {
+        url: {
+            method: 'post',
+            path: '/proxy/nasl-storage/api/storage/batchAction',
+        },
+    },
+};

package/src/service/storage/init.ts

@@ -1,43 +1,174 @@
 import { embeddedTSEmitter } from '../../translator';
-import { App } from '../../concepts';
+import { App, LogicItem, Logic, Module, View, ViewElement } from '../../concepts';
 import { getConceptConstructor } from '../../decorators';
 import { config } from '../../config';
 import Vue from 'vue';
 /// #if process.env.NODE_ENV
-import axios from './';
+import storageService from './service';
 /// #else
 import * as fs from 'fs-extra';
 import * as jsoner from './jsoner';
 /// #endif
 
+function getLogic(key: string, app: any, diffLogicList: string[]) {
+    if (!diffLogicList.includes(key)) {
+        diffLogicList.push(key);
+        if (key.startsWith('app')) {
+            const index = key.lastIndexOf('.');
+            const name = key.slice(index + 1);
+            const logic = app.logics.find((item: any) => item.name === name);
+            if (logic && logic.body && logic.body.length > 2) {
+                logic.body.map((item: any) => getStatement(item, app, diffLogicList));
+            }
+        } else if (key.startsWith('extensions')) {
+            const _pathArr = key.split('.');
+            const _name = _pathArr[1];
+            const _path = _pathArr[3];
+            const _list = app.dependencies;
+            const _module = _list.find((it: Module) => {
+                const name = it.name.replace('-', '_');
+                return name === _name;
+            });
+            const logic = _module.logics.find((item: Logic) => item.name === _path);
+            if (logic && logic.body && logic.body.length > 2) {
+                logic.body.map((item: any) => getStatement(item, app, diffLogicList));
+            }
+        }
+    }
+}
+/* 获取LogicITEM */
+function getStatement(state: any, app: any, diffLogicList: string[]) {
+    let logicItems = [];
+    switch (state.concept) {
+        case 'Assignment':
+            logicItems = [state.left, state.right];
+            break;
+        case 'IfStatement':
+            logicItems = [...state.consequent, ...state.alternate];
+            break;
+        case 'ForEachStatement':
+            logicItems = [...state.body, state.each, state.start, state.end];
+            break;
+        case 'SwitchStatement':
+            logicItems = state.cases.map(getStatement);
+            break;
+        case 'SwitchCase':
+            logicItems = [state.test, ...state.consequent];
+            break;
+        case 'WhileStatement':
+            logicItems = [state.test, ...state.body];
+            break;
+        case 'CallLogic':
+            getLogic(state.calleeKey, app, diffLogicList);
+            break;
+        default:
+            break;
+    }
+
+    return logicItems.filter((item: LogicItem) => !!item);
+}
+
 /**
  *  执行更新
  */
 async function doAction(app: any, actionItem: any) {
+    app.emit('saving');
     let hasFrontEnd = false;
     let hasBackEnd = false;
     const actionList: any[] = [];
     const { list, actionMsg, action } = actionItem || {};
+    const loopEle = (view: View | ViewElement, checkAuth: boolean) => {
+        if (view instanceof View) {
+            view?.elements?.forEach((item) => loopEle(item, checkAuth));
+        }
+        view?.children?.forEach((item) => loopEle(item, checkAuth));
+        if (view instanceof ViewElement) {
+            if (view.tag === 'u-uploader') {
+                const bute = view?.bindAttrs.find((item) => item.name === 'url');
+                if (checkAuth) {
+                    if (bute?.value.endsWith('/import') && !view.view.parentAuth) {
+                        hasBackEnd = true;
+                    }
+                } else {
+                    if (bute?.value.endsWith('/import')) {
+                        hasBackEnd = true;
+                    }
+                }
+            }
+        }
+    };
     if (Array.isArray(list)) {
         list.forEach((event) => {
             const emitTarget = event?.originEvent?.target;
-            if (emitTarget.concept === 'View' || emitTarget.view) {
-                hasFrontEnd = true;
-            } else {
+            const _path: string = event.originEvent.path;
+            const _root = _path.split('.')?.[1] || '';
+            if (
+                ['entities', 'processes', 'logics', 'enums', 'structures', 'interfaces', 'interfaceDependencies', 'componentDependencies', 'configuration', 'dependencies'].some((item) =>
+                    _root.startsWith(item))
+            ) {
                 hasBackEnd = true;
             }
+            const itemloop = (_i: LogicItem, app: any, diffArr: string[]) => {
+                const _l = getStatement(_i, app, diffArr);
+                if (_l.length) {
+                    _l.map((_ii: LogicItem) => itemloop(_ii, app, diffArr));
+                }
+            };
+            if (emitTarget.concept === 'Logic') {
+                const diffArr: string[] = [];
+                if (emitTarget.body.length > 2) {
+                    emitTarget.body.forEach((it: LogicItem) => {
+                        itemloop(it, app, diffArr);
+                    });
+                }
+                const result = diffArr.filter((item) => item.startsWith('app') || item.startsWith('extensions'));
+                if (result.length) {
+                    hasBackEnd = true;
+                }
+            }
+            if (emitTarget.view) {
+                hasFrontEnd = true;
+            }
+            if (emitTarget.concept === 'View') {
+                const isDelete = event?.originEvent?.action === 'delete';
+                const isUpdateAuth = event?.originEvent?.action === 'update' && event?.originEvent?.object && 'auth' in event?.originEvent?.object;
+                if (isDelete || isUpdateAuth) {
+                    const app = emitTarget.app;
+                    const diffArr: string[] = [];
+                    emitTarget.logics.forEach((logic: Logic) => {
+                        if (logic.body.length > 2) {
+                            logic.body.forEach((it: LogicItem) => {
+                                itemloop(it, app, diffArr);
+                            });
+                        }
+                    });
+                    const result = diffArr.filter((item) => item.startsWith('app') || item.startsWith('extensions'));
+                    if (result.length) {
+                        hasBackEnd = true;
+                    }
+                    emitTarget.children.forEach((item: View | ViewElement) => loopEle(item, isDelete));
+                    emitTarget.elements.forEach((item: View | ViewElement) => loopEle(item, isDelete));
+                }
+                hasFrontEnd = true;
+            }
+            if (emitTarget.concept === 'ViewElement') {
+                loopEle(emitTarget, true);
+            }
+            if (emitTarget.concept === 'BindAttribute' && emitTarget.name === 'url' && emitTarget.value.endsWith('/import')) {
+                if (!emitTarget.view.parentAuth) {
+                    hasBackEnd = true;
+                }
+            }
             if (emitTarget.concept === 'CallLogic') {
-                hasBackEnd = true;
+                const arrlist: string[] = [];
+                getLogic(emitTarget.calleeKey, emitTarget.app, arrlist);
+                const result = arrlist.filter((item) => item.startsWith('app') || item.startsWith('extensions'));
+                // console.log(result, 'CallLogic');
+                if (result.length) {
+                    hasBackEnd = true;
+                }
             }
-            event.eventList.forEach(({
-                action,
-                path,
-                object: objItem,
-            }: {
-                action: string;
-                path: string;
-                object: any
-            }) => {
+            event.eventList.forEach(({ action, path, object: objItem }: { action: string; path: string; object: any }) => {
                 if (Array.isArray(objItem)) {
                     if (action === 'update') {
                         actionList.push({
@@ -72,13 +203,22 @@ async function doAction(app: any, actionItem: any) {
     } else if (hasBackEnd) {
         ChangedNASLType = 'backend';
     }
+    let err;
     if (config.storage.protocol === 'http') {
-        const res = await axios.post('/api/storage/batchAction', actionList, {
-            headers: {
-                appId: app.id,
-                ChangedNASLType,
-            },
-        });
+        try {
+            await storageService.batchAction({
+                body: actionList,
+                headers: {
+                    appId: app.id,
+                    ChangedNASLType,
+                    'request-appBaseVersion': (window as any).appData?.baseVersion || '',
+                    'request-versionChangedTime': (window as any).appData?.versionChangedTime || '',
+                },
+            });
+        } catch (error) {
+            err = error;
+            app.emit('refresh');
+        }
     } else if (config.storage.protocol === 'mock') {
         // Do nothing
     } else {
@@ -88,7 +228,7 @@ async function doAction(app: any, actionItem: any) {
             spaces: 4,
         });
     }
-
+    app.emit('saved', err);
     if (!app._historying) {
         if (app._historyIndex !== app._historyList.length) {
             app._historyList = app._historyList.splice(0, app._historyIndex);
@@ -129,29 +269,37 @@ function handleApp(app: any) {
      * 开启收集
      */
     app.on('collect:start', (event: any) => {
+        if (!app._isCollectingCount) {
+            app._actionMsg = event?.actionMsg;
+            app._action = event?.action;
+        }
         app._isCollectingCount++;
-        app._actionMsg = event?.actionMsg;
-        app._action = event?.action;
     });
 
     /**
      * 结束收集
      */
     app.on('collect:end', async () => {
-        if (Array.isArray(app._collectingList) && app._collectingList.length) {
-            embeddedTSEmitter.emit('change', {
-                value: app._collectingList,
-            });
-            await doAction(app, {
-                list: app._collectingList,
-                actionMsg: app._actionMsg,
-                action: app._action,
-            });
-        }
         app._isCollectingCount--;
-        app._collectingList = [];
-        app._actionMsg = '';
-        app._action = '';
+        if (app._isCollectingCount === 0) {
+            if (Array.isArray(app._collectingList) && app._collectingList.length) {
+                embeddedTSEmitter.emit('change', {
+                    value: app._collectingList,
+                });
+                await doAction(app, {
+                    list: app._collectingList,
+                    actionMsg: app._actionMsg,
+                    action: app._action,
+                });
+            }
+
+            app._collectingList = [];
+            app._actionMsg = '';
+            app._action = '';
+        } else if (app._isCollectingCount < 0) {
+            app._isCollectingCount = 0;
+            throw Error('关闭收集有问题，请排查');
+        }
     });
 
     /**
@@ -178,7 +326,9 @@ function handleApp(app: any) {
                     break;
             }
             actionMsg += getConceptConstructor(concept).nodeTitle;
-            actionMsg += `“${name}”`;
+            if (name) {
+                actionMsg += `“${name}”`;
+            }
             doAction(app, {
                 list: [event],
                 actionMsg,
@@ -198,17 +348,20 @@ export async function loadApp(appId?: string) {
     let app: App;
     if (config.storage.protocol === 'http') {
         // 请求
-        const res = await axios.post('/api/storage/batchQuery', [
-            {
-                path: 'app',
-                excludes: ['views'],
-            },
-        ], {
+        const data = await storageService.batchQuery({
+            body: [
+                {
+                    path: 'app',
+                    // excludes: ['views'],
+                },
+            ],
             headers: {
                 appId,
+                'request-appBaseVersion': (window as any).appData?.baseVersion || '',
+                'request-versionChangedTime': (window as any).appData?.versionChangedTime || '',
             },
         });
-        const data = res?.data?.result;
+        // const data = res?.data?.result;
         app = new App(Object.assign(data?.[0], { id: appId }));
     } else if (config.storage.protocol === 'mock') {
         app = new App({

package/src/service/storage/service.ts

@@ -0,0 +1,6 @@
+import { createService } from '../creator';
+import api from './api';
+
+const service = createService(api);
+
+export default service;

package/src/service/storage/storagePoint.ts

@@ -1,20 +1,20 @@
 const loadThen = {
-    App: {
-        childNodes: [
-            {
-                field: 'views',
-                concept: 'View',
-            },
-        ],
-    },
-    View: {
-        childNodes: [
-            {
-                field: 'children',
-                concept: 'View',
-            },
-        ],
-    },
+    // App: {
+    //     childNodes: [
+    //         {
+    //             field: 'views',
+    //             concept: 'View',
+    //         },
+    //     ],
+    // },
+    // View: {
+    //     childNodes: [
+    //         {
+    //             field: 'children',
+    //             concept: 'View',
+    //         },
+    //     ],
+    // },
 };
 
 /**

package/src/templator/genCreateBlock.ts

@@ -59,7 +59,7 @@ export function genCreateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
                 formItem += `<u-checkbox v-model="${vModel}"></u-checkbox>`;
             } else if (propertyTypeName === 'Integer' || propertyTypeName === 'Long') {
                 formItem += `<u-number-input v-model="${vModel}" placeholder="请输入${label}"></u-number-input>`;
-            } else if (propertyTypeName === 'Decimal') {
+            } else if (propertyTypeName === 'Double') {
                 formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
             } else if (propertyTypeName === 'Text') {
                 formItem += `<u-textarea v-model="${vModel}" placeholder="请输入${label}"></u-textarea>`;
@@ -122,6 +122,7 @@ export function genH5CreateFormTemplate(entity: Entity, nameGroup: NameGroup, se
                         <template #input><van-cascader title="请选择${label}" placeholder="请选择${label}"
                             v-model="${vModel}" :data-source="${selectNameGroup.viewLogicLoad}"
                             text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}"
+                            :notitleblock="true"
                             :pageable="true" :remote-paging="true"></van-cascader></template>
                     `;
                     } else
@@ -132,13 +133,12 @@ export function genH5CreateFormTemplate(entity: Entity, nameGroup: NameGroup, se
                 formItem += `<template #input><van-switch v-model="${vModel}"></van-switch></template>`;
             } else if (propertyTypeName === 'Integer' || propertyTypeName === 'Long') {
                 formItem += `<template #input><van-stepper v-model="${vModel}" placeholder="请输入${property.label || property.name}"></van-stepper></template>`;
-            } else if (propertyTypeName === 'Decimal') {
+            } else if (propertyTypeName === 'Double') {
                 formItem += `<template #input><van-stepper v-model="${vModel}" placeholder="请输入${property.label || property.name}"></van-stepper></template>`;
             } else if (propertyTypeName === 'Text') {
-                formItem = formItem.replace(/other/g, '');
-                formItem += `<template #input><van-input v-model="${vModel}" placeholder="请输入${property.label || property.name}"></van-input></template>`;
+                formItem += `<template #input><van-fieldtextarea v-model="${vModel}" placeholder="请输入${property.label || property.name}"></van-fieldtextarea></template>`;
             } else if (propertyTypeName === 'Date') {
-                formItem += `<template #input><van-calendar v-model="${vModel}" title="请输入${property.label || property.name}"></van-calendar></template>`;
+                formItem += `<template #input><van-calendar :default-date.sync="${vModel}" title="选择日期"></van-calendar></template>`;
             } else if (propertyTypeName === 'Time') {
                 formItem += `<template #input><van-datetime-picker type="time" v-model="${vModel}" title="请选择${property.label || property.name}" label-field=""></van-datetime-picker></template>`;
             } else if (propertyTypeName === 'DateTime') {
@@ -232,7 +232,7 @@ export function genCreateBlock(entity: Entity, view: View) {
     const createLogic = ns?.logics?.find((logic) => logic.name === `create`);
 
     const nameGroup: NameGroup = {};
-    nameGroup.viewElementMainView = view.getLogicUniqueName('form1');
+    nameGroup.viewElementMainView = view.getViewElementUniqueName('form1');
     nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
     nameGroup.viewLogicSubmit = view.getLogicUniqueName('submit');
 

package/src/templator/genCurdEditMultipleKeyBlock.ts

@@ -5,14 +5,23 @@
  */
 import * as utils from '../utils';
 import { App, Namespace, Entity, View, Enum } from '../concepts';
+import { NaslCoreTypeAnnotation, NaslUITypeAnnotation, NaslTypeAnnotation, NaslLogicItem, NaslNode } from './utils';
 import {
-    NaslCoreTypeAnnotation, NaslUITypeAnnotation, NaslTypeAnnotation,
-    NaslLogicItem, NaslNode,
-} from './utils';
-import {
-    filterProperty, NameGroup, genUniqueQueryNameGroup, getFirstDisplayedProperty, genCallComponentLogic,
-    genQueryLogic, genEditTableTemplate, genEditTableLoadLogic, genTableRemoveLogic, genEnumSelectBlock,
-    genLoadSelectLogic, genBlurUpdateLogic, genEditQueryStructure, genQueryStructure, genLogicParam,
+    filterProperty,
+    NameGroup,
+    genUniqueQueryNameGroup,
+    getFirstDisplayedProperty,
+    genCallComponentLogic,
+    genQueryLogic,
+    genEditTableTemplate,
+    genEditTableLoadLogic,
+    genTableRemoveLogic,
+    genEnumSelectBlock,
+    genLoadSelectLogic,
+    genBlurUpdateLogic,
+    genEditQueryStructure,
+    genQueryStructure,
+    genLogicParam,
 } from '.';
 
 function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroupMap: Map<string, NameGroup>) {
@@ -29,10 +38,7 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
             let formItem = `<u-form-item label="${label}">`;
 
             const { typeAnnotation } = property || {};
-            const {
-                typeName: propertyTypeName,
-                typeNamespace: propertyTypeNamespace,
-            } = typeAnnotation || {};
+            const { typeName: propertyTypeName, typeNamespace: propertyTypeNamespace } = typeAnnotation || {};
             if (property.relationEntity) {
                 // 有外键关联
                 const relationEntity = parentNode?.findEntityByName(property.relationEntity);
@@ -54,13 +60,13 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
             } else if (propertyTypeName === 'Boolean') {
                 formItem += `
                         <u-select clearable v-model="${vModel}" placeholder="请输入${label}">
-                            <u-select-item :value="true">是</u-select-item>
-                            <u-select-item :value="false">否</u-select-item>
+                            <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 === 'Decimal') {
+            } else if (propertyTypeName === 'Double') {
                 formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
             } else if (propertyTypeName === 'Text') {
                 formItem += `<u-textarea v-model="${vModel}" placeholder="请输入${label}"></u-textarea>`;
@@ -90,7 +96,7 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
         </u-form-item>
     </u-form>
 
-    <u-button color="primary" @click="${nameGroup.viewLogicCreate}($event)">创建</u-button>
+    <u-button color="primary" @click="${nameGroup.viewLogicCreate}">创建</u-button>
 </u-linear-layout>
     `;
 }
@@ -127,10 +133,7 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
                                 >`;
 
             const { typeAnnotation } = property || {};
-            const {
-                typeName: propertyTypeName,
-                typeNamespace: propertyTypeNamespace,
-            } = typeAnnotation || {};
+            const { typeName: propertyTypeName, typeNamespace: propertyTypeNamespace } = typeAnnotation || {};
             if (property.relationEntity) {
                 // 有外键关联
                 const relationEntity = parentNode?.findEntityByName(property.relationEntity);
@@ -152,12 +155,12 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
             } else if (propertyTypeName === 'Boolean') {
                 formItem += `
                         <u-select clearable v-model="${vModel}" placeholder="请输入${label}">
-                            <u-select-item :value="true">是</u-select-item>
-                            <u-select-item :value="false">否</u-select-item>
+                            <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 === 'Decimal') {
+            } else if (propertyTypeName === 'Double') {
                 formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
             } else if (propertyTypeName === 'Text') {
                 formItem += `<u-textarea v-model="${vModel}" placeholder="请输入${label}"></u-textarea>`;
@@ -306,18 +309,14 @@ function genSubmitLogic(entity: Entity, nameGroup: NameGroup) {
                             NaslLogicItem.CallLogic({
                                 calleeNamespace: updateLogic.getNamespace(),
                                 calleeName: updateLogic.name,
-                                arguments: [
-                                    genLogicParam(`${updateLogic.params[0].name}`, nameGroup.viewVariableInput),
-                                ],
+                                arguments: [genLogicParam(`${updateLogic.params[0].name}`, nameGroup.viewVariableInput)],
                             }),
                         ],
                         alternate: [
                             NaslLogicItem.CallLogic({
                                 calleeNamespace: createLogic.getNamespace(),
                                 calleeName: createLogic.name,
-                                arguments: [
-                                    genLogicParam(`${createLogic.params[0].name}`, nameGroup.viewVariableInput),
-                                ],
+                                arguments: [genLogicParam(`${createLogic.params[0].name}`, nameGroup.viewVariableInput)],
                             }),
                         ],
                     }),
@@ -382,7 +381,7 @@ export function genCurdEditMultipleKeyBlock(entity: Entity, view: View) {
     const entityLogic = genQueryLogic(allEntities, nameGroup, true, true, parentNode);
     newLogics.push(entityLogic);
 
-    console.log(entityStructure);
+    // console.log(entityStructure);
 
     return `<template>
     <u-linear-layout direction="vertical">
@@ -439,7 +438,7 @@ export function genCurdEditMultipleKeyBlock(entity: Entity, view: View) {
             "concept": "BindEvent",
             "arguments": [],
             "name": "created",
-            "calleeNamespace": "${view.getNamespace()}.views.${view.name}.logics",
+            "calleeNamespace": "",
             "calleeName": "${nameGroup.viewLogicInit}"
         }
     ],

package/src/templator/genCurdMultipleKeyBlock.ts

@@ -55,13 +55,13 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
             } else if (propertyTypeName === 'Boolean') {
                 formItem += `
                         <u-select clearable v-model="${vModel}" placeholder="请输入${label}">
-                            <u-select-item :value="true">是</u-select-item>
-                            <u-select-item :value="false">否</u-select-item>
+                            <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 === 'Decimal') {
+            } else if (propertyTypeName === 'Double') {
                 formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
             } else if (propertyTypeName === 'Text') {
                 formItem += `<u-textarea v-model="${vModel}" placeholder="请输入${label}"></u-textarea>`;
@@ -91,7 +91,7 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
         </u-form-item>
     </u-form>
 
-    <u-button color="primary" @click="${nameGroup.viewLogicCreate}($event)">创建</u-button>
+    <u-button color="primary" @click="${nameGroup.viewLogicCreate}">创建</u-button>
 </u-linear-layout>
     `;
 }
@@ -154,12 +154,12 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
             } else if (propertyTypeName === 'Boolean') {
                 formItem += `
                         <u-select clearable v-model="${vModel}" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''}>
-                            <u-select-item :value="true">是</u-select-item>
-                            <u-select-item :value="false">否</u-select-item>
+                            <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}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''}></u-number-input>`;
-            } else if (propertyTypeName === 'Decimal') {
+            } 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>`;
@@ -459,7 +459,7 @@ export function genCurdMultipleKeyBlock(entity: Entity, view: View) {
     return `<template>
     <u-linear-layout direction="vertical">
         ${genFilterTemplate(entity, nameGroup, selectNameGroupMap)}
-        ${genTableTemplate(entity, nameGroup)}
+        ${genTableTemplate(entity, nameGroup, true)}
         ${genSaveModalTemplate(entity, nameGroup, selectNameGroupMap)}
     </u-linear-layout>
 </template>
@@ -511,7 +511,7 @@ export function genCurdMultipleKeyBlock(entity: Entity, view: View) {
             "concept": "BindEvent",
             "arguments": [],
             "name": "created",
-            "calleeNamespace": "${view.getNamespace()}.views.${view.name}.logics",
+            "calleeNamespace": "",
             "calleeName": "${nameGroup.viewLogicInit}"
         }
     ],
@@ -581,7 +581,7 @@ export function genGridViewMultipleKeyBlock(entity: Entity, view: View) {
     return `<template>
     <u-linear-layout direction="vertical">
         ${genFilterTemplate(entity, nameGroup, selectNameGroupMap)}
-        ${genGridViewTemplate(entity, nameGroup)}
+        ${genGridViewTemplate(entity, nameGroup, true)}
         ${genSaveModalTemplate(entity, nameGroup, selectNameGroupMap)}
     </u-linear-layout>
 </template>
@@ -633,7 +633,7 @@ export function genGridViewMultipleKeyBlock(entity: Entity, view: View) {
             "concept": "BindEvent",
             "arguments": [],
             "name": "created",
-            "calleeNamespace": "${view.getNamespace()}.views.${view.name}.logics",
+            "calleeNamespace": "",
             "calleeName": "${nameGroup.viewLogicInit}"
         }
     ],