@lcap/nasl 2.18.0 → 2.19.0-beta.1

package/src/service/storage/dist/init.js

@@ -44,7 +44,6 @@ var __spreadArrays = (this && this.__spreadArrays) || function () {
 };
 exports.__esModule = true;
 exports.loadAppSync = exports.loadApp = exports.handleApp = exports.batchAction = exports.batchQuery = void 0;
-var translator_1 = require("../../translator");
 var concepts_1 = require("../../concepts");
 var decorators_1 = require("../../decorators");
 var config_1 = require("../../config");
@@ -86,7 +85,7 @@ function getLogic(key, app, diffLogicList) {
 }
 /* 获取LogicITEM */
 function getStatement(state, app, diffLogicList) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     var logicItems = [];
     switch (state.concept) {
         case 'Assignment':
@@ -98,6 +97,12 @@ function getStatement(state, app, diffLogicList) {
         case 'ForEachStatement':
             logicItems = __spreadArrays(state.body, [state.each, state.start, state.end]);
             break;
+        case 'Match':
+            logicItems = state.cases.map(getStatement).flat(1);
+            break;
+        case 'MatchCase':
+            logicItems = __spreadArrays(state.patterns, state.body);
+            break;
         case 'SwitchStatement':
             logicItems = state.cases.map(getStatement).flat(1);
             break;
@@ -111,16 +116,46 @@ function getStatement(state, app, diffLogicList) {
             logicItems = (_a = state.arguments) === null || _a === void 0 ? void 0 : _a.map(function (item) { return item.expression; });
             getLogic(state.calleewholeKey, app, diffLogicList);
             break;
-        case 'CallInterface':
+        case 'CallFunction':
             logicItems = (_b = state.arguments) === null || _b === void 0 ? void 0 : _b.map(function (item) { return item.expression; });
             break;
+        case 'CallInterface':
+            logicItems = (_c = state.arguments) === null || _c === void 0 ? void 0 : _c.map(function (item) { return item.expression; });
+            break;
         case 'BatchAssignment':
-            logicItems = __spreadArrays([(_c = state.left) === null || _c === void 0 ? void 0 : _c.expression], (_d = state.left) === null || _d === void 0 ? void 0 : _d.members, state.rights.map(function (item) { return __spreadArrays([item === null || item === void 0 ? void 0 : item.expression], item === null || item === void 0 ? void 0 : item.members); }).flat(1));
+            logicItems = __spreadArrays([(_d = state.left) === null || _d === void 0 ? void 0 : _d.expression], (_e = state.left) === null || _e === void 0 ? void 0 : _e.members, state.rights.map(function (item) { return __spreadArrays([item === null || item === void 0 ? void 0 : item.expression], item === null || item === void 0 ? void 0 : item.members); }).flat(1));
+            break;
+        case 'MemberExpression':
+            logicItems = [state.object, state.property];
+            break;
+        case 'StringInterpolation':
+            logicItems = __spreadArrays(state.expressions);
+            break;
         default:
             break;
     }
     return logicItems.filter(function (item) { return !!item; });
 }
+/* 小程序影响的服务端发布 */
+function getMiniAppChange(target, obj, action) {
+    var _a;
+    if (!target.app.miniEnable) {
+        return false;
+    }
+    /* 分端以后需要改 */
+    var len = (_a = target.nodePath) === null || _a === void 0 ? void 0 : _a.split('.').length;
+    if (len > 2) {
+        return false;
+    }
+    if (action === 'delete') {
+        return true;
+    }
+    else {
+        if ('name' in obj || 'title' in obj) {
+            return true;
+        }
+    }
+}
 /**
  *  执行更新
  */
@@ -178,7 +213,7 @@ function doAction(app, actionItem) {
                     try {
                         if (Array.isArray(list)) {
                             list.forEach(function (event) {
-                                var _a, _b, _c, _d, _e, _f;
+                                var _a, _b, _c, _d, _e, _f, _g, _h;
                                 var emitTarget = (_a = event === null || event === void 0 ? void 0 : event.originEvent) === null || _a === void 0 ? void 0 : _a.target;
                                 var _path = event.originEvent.path;
                                 var _root = ((_b = _path.split('.')) === null || _b === void 0 ? void 0 : _b[1]) || '';
@@ -201,8 +236,11 @@ function doAction(app, actionItem) {
                                     hasFrontEnd = true;
                                 }
                                 if (emitTarget.concept === 'View') {
-                                    var isDelete_1 = ((_c = event === null || event === void 0 ? void 0 : event.originEvent) === null || _c === void 0 ? void 0 : _c.action) === 'delete';
-                                    var isUpdateAuth = ((_d = event === null || event === void 0 ? void 0 : event.originEvent) === null || _d === void 0 ? void 0 : _d.action) === 'update' && ((_e = event === null || event === void 0 ? void 0 : event.originEvent) === null || _e === void 0 ? void 0 : _e.object) && 'auth' in ((_f = event === null || event === void 0 ? void 0 : event.originEvent) === null || _f === void 0 ? void 0 : _f.object);
+                                    if (getMiniAppChange(emitTarget, (_c = event === null || event === void 0 ? void 0 : event.originEvent) === null || _c === void 0 ? void 0 : _c.object, (_d = event === null || event === void 0 ? void 0 : event.originEvent) === null || _d === void 0 ? void 0 : _d.action)) {
+                                        hasBackEnd = true;
+                                    }
+                                    var isDelete_1 = ((_e = event === null || event === void 0 ? void 0 : event.originEvent) === null || _e === void 0 ? void 0 : _e.action) === 'delete';
+                                    var isUpdateAuth = ((_f = event === null || event === void 0 ? void 0 : event.originEvent) === null || _f === void 0 ? void 0 : _f.action) === 'update' && ((_g = event === null || event === void 0 ? void 0 : event.originEvent) === null || _g === void 0 ? void 0 : _g.object) && 'auth' in ((_h = event === null || event === void 0 ? void 0 : event.originEvent) === null || _h === void 0 ? void 0 : _h.object);
                                     if (isDelete_1 || isUpdateAuth) {
                                         var app_1 = emitTarget.app;
                                         var diffArr_3 = [];
@@ -374,7 +412,7 @@ function handleApp(app) {
             app._timer = setTimeout(function () {
                 console.error('收集超时，请及时排查原因');
                 app.emit('refresh');
-            }, 800);
+            }, 2500);
         }
         if (!app._isCollectingCount) {
             app._actionMsg = event === null || event === void 0 ? void 0 : event.actionMsg;
@@ -403,7 +441,7 @@ function handleApp(app) {
                     app._action = '';
                     app._noTimer = undefined;
                     if (!(Array.isArray(collectingList) && collectingList.length)) return [3 /*break*/, 2];
-                    translator_1.embeddedTSEmitter.emit('change', {
+                    app.naslServer.embeddedTSEmitter.emit('change', {
                         value: collectingList
                     });
                     return [4 /*yield*/, doAction(app, {
@@ -431,7 +469,7 @@ function handleApp(app) {
     app.on('storage', function (event) {
         // 是否正在收集
         if (app._isCollectingCount === 0) {
-            translator_1.embeddedTSEmitter.emit('change', {
+            app.naslServer.embeddedTSEmitter.emit('change', {
                 value: [event]
             });
             var actionMsg = '';

package/src/service/storage/init.ts

@@ -77,6 +77,13 @@ function getStatement(state: any, app: any, diffLogicList: string[]) {
             break;
         case 'BatchAssignment':
             logicItems = [state.left?.expression, ...state.left?.members, ...state.rights.map((item: SelectMembers) => [item?.expression, ...item?.members]).flat(1)];
+            break;
+        case 'MemberExpression':
+            logicItems = [state.object, state.property];
+            break;
+        case 'StringInterpolation':
+            logicItems = [...state.expressions];
+            break;
         default:
             break;
     }
@@ -85,7 +92,7 @@ function getStatement(state: any, app: any, diffLogicList: string[]) {
 }
 
 /* 小程序影响的服务端发布 */
-function getMiniAppChange(target: any, obj: any, action:string) {
+function getMiniAppChange(target: any, obj: any, action: string) {
     if (!target.app.miniEnable) {
         return false;
     }
@@ -335,7 +342,7 @@ export function handleApp(app: any) {
             app._timer = setTimeout(() => {
                 console.error('收集超时，请及时排查原因');
                 app.emit('refresh');
-            }, 800);
+            }, 2500);
         }
         if (!app._isCollectingCount) {
             app._actionMsg = event?.actionMsg;

package/src/service/video/VideoTranscribe.js

@@ -95,6 +95,7 @@ class VideoTranscribe {
         a.href = this.videoUrl;
         document.body.appendChild(a);
         a.click();
+        document.body.removeChild(a);
     }
 }
 

package/src/templator/dist/genEditTableBlock.js

@@ -0,0 +1,204 @@
+"use strict";
+exports.__esModule = true;
+exports.genBlurUpdateLogic = exports.genEditTableRemoveLogic = exports.genEditTableLoadLogic = exports.genEditTableTemplate = exports.genEditTableColumnTemplate = void 0;
+var utils = require("../utils");
+var _1 = require(".");
+var utils_1 = require("./utils");
+/**
+ * 根据实体属性生成表格列模板
+ * @param property 实体属性
+ */
+function genEditTableColumnTemplate(entity, property, nameGroup, selectNameGroupMap) {
+    var dataSource = entity.parentNode;
+    var lowerEntityName = utils.firstLowerCase(entity.name);
+    var valueExpression = "current.item." + lowerEntityName + "." + property.name;
+    var title = property.label || property.name;
+    var canEditable = function (property) { return !property.readonly; };
+    var getText = function (property) {
+        var propertyTypeName = property.typeAnnotation.typeName;
+        if (propertyTypeName === 'Boolean') {
+            return "\n            <u-text v-if=\"" + valueExpression + "\" text=\"\u662F\"></u-text>\n            <u-text v-if=\"!" + valueExpression + "\" text=\"\u5426\"></u-text>\n            ";
+        }
+        else {
+            return "<u-text :text=\"" + valueExpression + "\"></u-text>";
+        }
+    };
+    var genEditComponent = function (property) {
+        if (property.readonly)
+            return '';
+        var label = property.label || property.name;
+        var formItem = '';
+        var propertyTypeName = property.typeAnnotation.typeName;
+        if (property.relationEntity && selectNameGroupMap) {
+            // 有外键关联
+            var relationEntity = dataSource === null || dataSource === void 0 ? void 0 : dataSource.findEntityByName(property.relationEntity);
+            if (relationEntity) {
+                var relationProperty = relationEntity.properties.find(function (prop) { return prop.name === property.relationProperty; });
+                var displayedProperty = _1.getFirstDisplayedProperty(relationEntity);
+                if (displayedProperty) {
+                    var lowerEntityName_1 = utils.firstLowerCase(relationEntity.name);
+                    // 存在多个属性关联同一个实体的情况，因此加上属性名用以唯一标识
+                    var key = [property.name, relationEntity.name].join('-');
+                    var selectNameGroup = selectNameGroupMap.get(key);
+                    formItem += "\n                        <u-select clearable placeholder=\"\u8BF7\u9009\u62E9" + label + "\" :data-source=\"" + selectNameGroup.viewLogicLoad + "\"\n                            :autofocus=\"true\" :opened=\"true\" append-to=\"body\" @blur=\"" + nameGroup.viewLogicBlurUpdate + "\" @select=\"" + nameGroup.viewLogicBlurUpdate + "\"\n                            text-field=\"" + lowerEntityName_1 + "." + displayedProperty.name + "\" value-field=\"" + lowerEntityName_1 + "." + relationProperty.name + "\" :pageable=\"true\" :remote-paging=\"true\" :value.sync=\"" + valueExpression + "\">\n                        </u-select>\n                    ";
+                }
+                else
+                    return '';
+            }
+            else
+                return '';
+        }
+        else if (propertyTypeName === 'Boolean') {
+            formItem += "<u-select clearable :value.sync=\"" + valueExpression + "\" placeholder=\"\u8BF7\u8F93\u5165" + label + "\"\n            :autofocus=\"true\" :opened=\"true\" append-to=\"body\" @blur=\"" + nameGroup.viewLogicBlurUpdate + "\" @select=\"" + nameGroup.viewLogicBlurUpdate + "\">\n                <u-select-item :value=\"true\" text=\"\u662F\">\u662F</u-select-item>\n                <u-select-item :value=\"false\" text=\"\u5426\">\u5426</u-select-item>\n            </u-select>";
+        }
+        else if (propertyTypeName === 'Integer' || propertyTypeName === 'Long') {
+            formItem = "<u-number-input :value.sync=\"" + valueExpression + "\" placeholder=\"\u8BF7\u8F93\u5165" + label + "\" :autofocus=\"true\" @blur=\"" + nameGroup.viewLogicBlurUpdate + "\"></u-number-input>";
+        }
+        else if (propertyTypeName === 'Double') {
+            formItem = "<u-number-input :value.sync=\"" + valueExpression + "\" :precision=\"0\" :step=\"0\" placeholder=\"\u8BF7\u8F93\u5165" + label + "\" :autofocus=\"true\" @blur=\"" + nameGroup.viewLogicBlurUpdate + "\"></u-number-input>";
+        }
+        else if (propertyTypeName === 'Decimal') {
+            formItem = "<u-number-input :value.sync=\"" + valueExpression + "\" :precision=\"0\" :step=\"0\" placeholder=\"\u8BF7\u8F93\u5165" + label + "\" :autofocus=\"true\" @blur=\"" + nameGroup.viewLogicBlurUpdate + "\"></u-number-input>";
+        }
+        else if (propertyTypeName === 'Text') {
+            formItem = "<u-validator placement=\"bottom\" display=\"appear\" @blur-valid=\"" + nameGroup.viewLogicBlurUpdate + "\" style=\"width:100%\">\n            <u-textarea :value.sync=\"" + valueExpression + "\" placeholder=\"\u8BF7\u8F93\u5165" + label + "\" :autofocus=\"true\" size=\"full\"></u-textarea>\n            </u-validator>";
+        }
+        else if (propertyTypeName === 'Date') {
+            formItem = "<u-date-picker clearable :date.sync=\"" + valueExpression + "\" placeholder=\"\u8BF7\u8F93\u5165" + label + "\" append-to=\"body\" :autofocus=\"true\" :opened=\"true\" @blur=\"" + nameGroup.viewLogicBlurUpdate + "\"></u-date-picker>";
+        }
+        else if (propertyTypeName === 'Time') {
+            formItem = "<u-time-picker :time.sync=\"" + valueExpression + "\" placeholder=\"\u8BF7\u8F93\u5165" + label + "\" append-to=\"body\" :autofocus=\"true\" @blur=\"" + nameGroup.viewLogicBlurUpdate + "\"></u-time-picker>";
+        }
+        else if (propertyTypeName === 'DateTime') {
+            formItem = "<u-date-time-picker clearable :date.sync=\"" + valueExpression + "\" placeholder=\"\u8BF7\u8F93\u5165" + label + "\" append-to=\"body\" :autofocus=\"true\" :opened=\"true\" @blur=\"" + nameGroup.viewLogicBlurUpdate + "\"></u-date-time-picker>";
+        }
+        else {
+            formItem = "<u-validator placement=\"bottom\" display=\"appear\" @blur-valid=\"" + nameGroup.viewLogicBlurUpdate + "\" style=\"width:100%\" append-to=\"body\">\n                <u-input :value.sync=\"" + valueExpression + "\" placeholder=\"\u8BF7\u8F93\u5165" + label + "\" :autofocus=\"true\" size=\"full\"></u-input>\n            </u-validator>";
+        }
+        return "<template #editcell=\"current\">\n            <u-linear-layout gap=\"small\">\n                " + formItem + "\n            </u-linear-layout>\n        </template>";
+    };
+    return "<u-table-view-column field=\"" + utils.firstLowerCase(entity.name) + "." + property.name + "\" " + (canEditable(property) ? 'type="editable"' : '') + ">\n    <template #title><u-text text=\"" + title + "\"></u-text></template>\n    <template #cell=\"current\">\n        <u-linear-layout gap=\"small\">\n            " + getText(property) + "\n        </u-linear-layout>\n    </template>\n    " + genEditComponent(property) + "\n</u-table-view-column>";
+}
+exports.genEditTableColumnTemplate = genEditTableColumnTemplate;
+/**
+ * 生成表格模板
+ * @param entity 实体
+ * @param nameGroup 命名组
+ */
+function genEditTableTemplate(entity, nameGroup, selectNameGroupMap) {
+    var properties = entity.properties.filter(_1.filterProperty('inTable'));
+    return "<u-table-view ref=\"" + nameGroup.viewElementMainView + "\" :data-source=\"" + nameGroup.viewLogicLoad + "\" data-schema=\"" + nameGroup.structure + "\"\n        value-field=\"" + nameGroup.viewVariableEntity + ".id\"\n        :pageable=\"true\" :remote-paging=\"true\" :show-sizer=\"true\" :default-column-width=\"300\" editable>\n    <u-table-view-column type=\"index\" width=\"60\"><template #title><u-text text=\"\u5E8F\u53F7\"></u-text></template></u-table-view-column>\n\n    " + properties.map(function (property) { return genEditTableColumnTemplate(entity, property, nameGroup, selectNameGroupMap) + '\n'; }).join('') + "\n\n    <u-table-view-column>\n    <template #title><u-text text=\"\u64CD\u4F5C\"></u-text></template>\n        <template #cell=\"current\">\n            <u-linear-layout gap=\"small\">\n                <u-link @click=\"" + nameGroup.viewLogicRemove + "\">\u5220\u9664</u-link>\n            </u-linear-layout>\n        </template>\n    </u-table-view-column>\n</u-table-view>\n";
+}
+exports.genEditTableTemplate = genEditTableTemplate;
+/**
+ * 生成表格 load 逻辑
+ * @param entity 实体
+ */
+function genEditTableLoadLogic(entity, nameGroup, newLogic, supportFilter) {
+    var moduleNode = entity.app;
+    var moduleNamespace = moduleNode === null || moduleNode === void 0 ? void 0 : moduleNode.getNamespace();
+    var params = [
+        _1.genLogicParam("" + newLogic.params[0].name, 'params.page'),
+        _1.genLogicParam("" + newLogic.params[1].name, 'params.size'),
+        _1.genLogicParam("" + newLogic.params[2].name, 'params.sort'),
+        _1.genLogicParam("" + newLogic.params[3].name, 'params.order'),
+    ];
+    if (supportFilter)
+        params.push(_1.genLogicParam("" + newLogic.params[4].name, nameGroup.viewVariableFilter));
+    return utils_1.NaslNode.Logic({
+        name: nameGroup.viewLogicLoad,
+        params: [
+            utils_1.NaslNode.Param({
+                name: 'params',
+                typeAnnotation: utils_1.NaslUITypeAnnotation.DataSourceParams
+            }),
+        ],
+        returns: [
+            utils_1.NaslNode.Return({
+                name: 'result',
+                typeAnnotation: null
+            }),
+        ],
+        variables: [],
+        body: [
+            utils_1.NaslLogicItem.Start,
+            utils_1.NaslLogicItem.Assignment({
+                left: utils_1.NaslLogicItem.Identifier({
+                    name: 'result'
+                }),
+                right: utils_1.NaslLogicItem.CallLogic({
+                    calleeNamespace: moduleNamespace + ".logics",
+                    calleeName: newLogic.name,
+                    arguments: params
+                })
+            }),
+            utils_1.NaslLogicItem.End,
+        ]
+    });
+}
+exports.genEditTableLoadLogic = genEditTableLoadLogic;
+/**
+ * 生成表格 remove 逻辑
+ * @param entity 实体
+ */
+function genEditTableRemoveLogic(entity, nameGroup) {
+    var _a;
+    var lowerEntityName = utils.firstLowerCase(entity.name);
+    var ns = entity.ns;
+    var deleteLogic = (_a = ns === null || ns === void 0 ? void 0 : ns.logics) === null || _a === void 0 ? void 0 : _a.find(function (logic) { return logic.name === "delete"; });
+    var idPropertys = entity.properties.filter(function (property) { return property.primaryKey || property.name === 'id'; });
+    return utils_1.NaslNode.Logic({
+        name: nameGroup.viewLogicRemove,
+        params: [],
+        returns: [],
+        variables: [],
+        body: [
+            utils_1.NaslLogicItem.Start,
+            utils_1.NaslLogicItem.CallLogic({
+                calleeNamespace: deleteLogic.getNamespace(),
+                calleeName: deleteLogic.name,
+                arguments: idPropertys.map(function (idProperty) {
+                    var paramFromLogic = _1.getParamFromLogic(deleteLogic, idProperty.name);
+                    // 如果旧逻辑，但是新导入表中，id的name 不是id 的话，就直接使用名称叫id的
+                    if (!paramFromLogic) {
+                        paramFromLogic = _1.getParamFromLogic(deleteLogic, 'id');
+                    }
+                    return _1.genLogicParam(paramFromLogic.name, "current.item." + lowerEntityName + "." + paramFromLogic.name);
+                })
+            }),
+            _1.genCallComponentLogic(nameGroup.viewElementMainView, 'reload'),
+            utils_1.NaslLogicItem.End,
+        ]
+    });
+}
+exports.genEditTableRemoveLogic = genEditTableRemoveLogic;
+function genBlurUpdateLogic(entity, nameGroup) {
+    var _a;
+    var lowerEntityName = utils.firstLowerCase(entity.name);
+    var ns = entity.ns;
+    var updateLogic = (_a = ns === null || ns === void 0 ? void 0 : ns.logics) === null || _a === void 0 ? void 0 : _a.find(function (logic) { return logic.name === "update"; });
+    return utils_1.NaslNode.Logic({
+        name: nameGroup.viewLogicBlurUpdate,
+        params: [],
+        returns: [],
+        body: [
+            utils_1.NaslLogicItem.Start,
+            utils_1.NaslLogicItem.Assignment({
+                left: _1.genMemberExpression("current.item.editing", ['', '', nameGroup.structure + ".editing"]),
+                right: utils_1.NaslLogicItem.StringLiteral({
+                    value: ''
+                })
+            }),
+            utils_1.NaslLogicItem.CallLogic({
+                calleeNamespace: updateLogic.getNamespace(),
+                calleeName: updateLogic.name,
+                arguments: [
+                    _1.genLogicParam("" + updateLogic.params[0].name, "current.item." + lowerEntityName),
+                ]
+            }),
+            utils_1.NaslLogicItem.End,
+        ],
+        playground: []
+    });
+}
+exports.genBlurUpdateLogic = genBlurUpdateLogic;

package/src/templator/dist/genGridViewBlock.js

@@ -0,0 +1,265 @@
+"use strict";
+var __spreadArrays = (this && this.__spreadArrays) || function () {
+    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
+    for (var r = Array(s), k = 0, i = 0; i < il; i++)
+        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
+            r[k] = a[j];
+    return r;
+};
+exports.__esModule = true;
+exports.genGridViewCardBlock = exports.genGridViewBlock = exports.genGridViewRemoveLogic = exports.genGridViewLoadLogic = exports.genH5GridViewTemplate = exports.genGridViewTemplate = exports.genH5GridViewCardTemplate = exports.genGridViewCardTemplate = void 0;
+var config_1 = require("../config");
+var utils = require("../utils");
+var _1 = require(".");
+var utils_1 = require("./utils");
+/**
+ * 根据实体属性生成表格列模板
+ * @param property 实体属性
+ */
+function genGridViewCardTemplate(property, nameGroup) {
+    var entity = property.entity;
+    var dataSource = entity.parentNode;
+    var lowerEntityName = utils.firstLowerCase(entity.name);
+    var currentName = nameGroup.currentName || 'current';
+    var valueExpression = currentName + ".item." + lowerEntityName + "." + property.name;
+    var title = property.label || property.name;
+    if (property.relationEntity) {
+        // 有外键关联
+        var relationEntity = dataSource === null || dataSource === void 0 ? void 0 : dataSource.findEntityByName(property.relationEntity);
+        if (relationEntity) {
+            var displayedProperty = _1.getFirstDisplayedProperty(relationEntity);
+            if (displayedProperty) {
+                var relationLowerEntityName = utils.firstLowerCase(relationEntity.name);
+                valueExpression = currentName + ".item." + relationLowerEntityName + "." + displayedProperty.name;
+            }
+            else
+                return '';
+        }
+        else
+            return '';
+    }
+    else {
+        valueExpression = currentName + ".item." + lowerEntityName + "." + property.name;
+    }
+    var getText = function (property) {
+        var propertyTypeName = property.typeAnnotation.typeName;
+        if (propertyTypeName === 'Boolean') {
+            return "\n                <u-text v-if=\"" + valueExpression + "\" text=\"\u662F\"></u-text>\n                <u-text v-if=\"!" + valueExpression + "\" text=\"\u5426\"></u-text>\n                ";
+        }
+        else {
+            return "<u-text :text=\"" + valueExpression + "\"></u-text>";
+        }
+    };
+    return "<u-linear-layout gap=\"small\">\n                <u-text text=\"" + title + ":\"></u-text>" + getText(property) + "\n            </u-linear-layout>";
+}
+exports.genGridViewCardTemplate = genGridViewCardTemplate;
+function genH5GridViewCardTemplate(property, nameGroup) {
+    var entity = property.entity;
+    var dataSource = entity.parentNode;
+    var lowerEntityName = utils.firstLowerCase(entity.name);
+    var currentName = nameGroup.currentName || 'current';
+    var valueExpression = currentName + ".item." + lowerEntityName + "." + property.name;
+    if (property.relationEntity) {
+        // 有外键关联
+        var relationEntity = dataSource === null || dataSource === void 0 ? void 0 : dataSource.findEntityByName(property.relationEntity);
+        if (relationEntity) {
+            var displayedProperty = _1.getFirstDisplayedProperty(relationEntity);
+            if (displayedProperty) {
+                var relationLowerEntityName = utils.firstLowerCase(relationEntity.name);
+                valueExpression = currentName + ".item." + relationLowerEntityName + "." + displayedProperty.name;
+            }
+            else
+                return '';
+        }
+        else
+            return '';
+    }
+    else {
+        valueExpression = currentName + ".item." + lowerEntityName + "." + property.name;
+    }
+    var getText = function (property) {
+        var propertyTypeName = property.typeAnnotation.typeName;
+        if (propertyTypeName === 'Boolean') {
+            return "\n                <van-text v-if=\"" + valueExpression + "\" text=\"\u662F\" display=\"block\"></van-text>\n                <van-text v-if=\"!" + valueExpression + "\" text=\"\u5426\" display=\"block\"></van-text>\n                ";
+        }
+        else {
+            return "<van-text :text=\"" + valueExpression + "\" display=\"block\"></van-text>";
+        }
+    };
+    return "" + getText(property);
+}
+exports.genH5GridViewCardTemplate = genH5GridViewCardTemplate;
+/**
+ * 生成表格模板
+ * @param entity 实体
+ * @param nameGroup 命名组
+ */
+function genGridViewTemplate(entity, nameGroup, modifyable) {
+    var currentName = nameGroup.currentName || 'current';
+    var properties = entity.properties.filter(_1.filterProperty('inTable'));
+    return "<u-grid-view ref=\"" + nameGroup.viewElementMainView + "\" :data-source=\"" + nameGroup.viewLogicLoad + "\" data-schema=\"" + nameGroup.structure + "\"\n        value-field=\"" + nameGroup.viewVariableEntity + ".id\"\n        :page-size=\"20\"\n        :pageable=\"true\"\n        :remote-paging=\"true\"\n        :show-sizer=\"true\"\n        :repeat=\"4\"\n        :border=\"false\"\n        :readonly=\"true\"\n        :show-foot=\"true\"\n        style=\"height:auto\">\n        <template #item=\"current\">\n            <u-card title=\"\">\n                <u-linear-layout direction=\"vertical\" gap=\"small\">\n                    " + properties.map(function (property) { return genGridViewCardTemplate(property, nameGroup) + '\n'; }).join('') + "\n                    <u-linear-layout gap=\"small\">\n                        <u-link " + (modifyable ? "@click=\"" + (nameGroup.viewLogicModify || 'modify') + "\"" : '') + ">\u4FEE\u6539</u-link>\n                        <u-link @click=\"" + nameGroup.viewLogicRemove + "\">\u5220\u9664</u-link>\n                    </u-linear-layout>\n                </u-linear-layout>\n            </u-card>\n        </template>\n</u-grid-view>\n";
+}
+exports.genGridViewTemplate = genGridViewTemplate;
+function genH5GridViewTemplate(entity, nameGroup) {
+    var currentName = nameGroup.currentName || 'current';
+    var properties = entity.properties.filter(_1.filterProperty('inTable'));
+    return "<van-grid-view ref=\"gridView\" :data-source=\"" + nameGroup.viewLogicLoad + "\" data-schema=\"" + nameGroup.structure + "\"\n    pageable=\"auto-more\"\n    :remote-paging=\"true\"\n    :col=\"2\"\n    :iffall=\"false\">\n    <template #item=\"current\">\n        <van-cardu no-title>\n            " + properties.map(function (property) { return genH5GridViewCardTemplate(property, nameGroup) + '\n'; }).join('') + "\n        </van-cardu>\n    </template>\n</van-grid-view>\n";
+}
+exports.genH5GridViewTemplate = genH5GridViewTemplate;
+/**
+ * 生成表格 load 逻辑
+ * @param entity 实体
+ */
+function genGridViewLoadLogic(entity, nameGroup, newLogic, supportFilter) {
+    var moduleNode = entity.app;
+    var moduleNamespace = moduleNode === null || moduleNode === void 0 ? void 0 : moduleNode.getNamespace();
+    var params = [
+        _1.genLogicParam("" + newLogic.params[0].name, 'params.page'),
+        _1.genLogicParam("" + newLogic.params[1].name, 'params.size'),
+        _1.genLogicParam("" + newLogic.params[2].name, 'params.sort'),
+        _1.genLogicParam("" + newLogic.params[3].name, 'params.order'),
+    ];
+    if (supportFilter)
+        params.push(_1.genLogicParam("" + newLogic.params[4].name, nameGroup.viewVariableFilter));
+    return utils_1.NaslNode.Logic({
+        name: nameGroup.viewLogicLoad,
+        params: [
+            utils_1.NaslNode.Param({
+                name: 'params',
+                typeAnnotation: utils_1.NaslUITypeAnnotation.DataSourceParams
+            }),
+        ],
+        returns: [
+            utils_1.NaslNode.Return({
+                name: 'result',
+                typeAnnotation: null
+            }),
+        ],
+        variables: [],
+        body: [
+            utils_1.NaslLogicItem.Start,
+            utils_1.NaslLogicItem.Assignment({
+                left: utils_1.NaslLogicItem.Identifier({
+                    name: 'result'
+                }),
+                right: utils_1.NaslLogicItem.CallLogic({
+                    calleeNamespace: moduleNamespace + ".logics",
+                    calleeName: newLogic.name,
+                    arguments: params
+                })
+            }),
+            utils_1.NaslLogicItem.End,
+        ]
+    });
+}
+exports.genGridViewLoadLogic = genGridViewLoadLogic;
+/**
+ * 生成表格 remove 逻辑
+ * @param entity 实体
+ */
+function genGridViewRemoveLogic(entity, nameGroup) {
+    var _a;
+    var lowerEntityName = utils.firstLowerCase(entity.name);
+    var ns = entity.ns;
+    var deleteLogic = (_a = ns === null || ns === void 0 ? void 0 : ns.logics) === null || _a === void 0 ? void 0 : _a.find(function (logic) { return logic.name === "delete"; });
+    var idPropertys = entity.properties.filter(function (property) { return property.primaryKey || property.name === 'id'; });
+    var currentName = nameGroup.currentName || 'current';
+    return utils_1.NaslNode.Logic({
+        name: nameGroup.viewLogicRemove,
+        params: [],
+        returns: [],
+        variables: [],
+        body: [
+            utils_1.NaslLogicItem.Start,
+            utils_1.NaslLogicItem.CallLogic({
+                calleeNamespace: deleteLogic.getNamespace(),
+                calleeName: deleteLogic.name,
+                arguments: idPropertys.map(function (idProperty) {
+                    var paramFromLogic = _1.getParamFromLogic(deleteLogic, idProperty.name);
+                    // 如果旧逻辑，但是新导入表中，id的name 不是id 的话，就直接使用名称叫id的
+                    if (!paramFromLogic) {
+                        paramFromLogic = _1.getParamFromLogic(deleteLogic, 'id');
+                    }
+                    return _1.genLogicParam(paramFromLogic.name, currentName + ".item." + lowerEntityName + "." + paramFromLogic.name);
+                })
+            }),
+            _1.genCallComponentLogic(nameGroup.viewElementMainView, 'reload'),
+            utils_1.NaslLogicItem.End,
+        ]
+    });
+}
+exports.genGridViewRemoveLogic = genGridViewRemoveLogic;
+/**
+ * 生成表格区块
+ * @param entity 实体
+ * @param view 所插入的页面，用于生成逻辑名字，去重等
+ * @notice 目前 logic 名去重做成前置处理了，与 mergeBlock 的后置处理不冲突
+ *        (页面 load 名) -产生-> (logic 名) -产生-> (structure 名)
+ *        load -> load_someView_tableView
+ *        load_select_student -> load_someView_select_student
+ */
+// 数据网格（简）
+function genGridViewBlock(entity, oldNode) {
+    var view = oldNode.view;
+    var dataSource = entity.parentNode;
+    var module = dataSource.parentNode;
+    var viewElementMainView = view.getViewElementUniqueName('gridView');
+    var nameGroup = _1.genUniqueQueryNameGroup(module, view, viewElementMainView);
+    nameGroup.viewElementMainView = viewElementMainView;
+    nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
+    nameGroup.viewLogicRemove = view.getLogicUniqueName('remove');
+    // 当前节点的currentName
+    nameGroup.currentName = oldNode.getCurrentName();
+    // 收集所有和本实体关联的实体
+    var entitySet = new Set();
+    entitySet.add(entity);
+    var newLogics = [];
+    entity.properties.forEach(function (property) {
+        if (property.relationEntity) {
+            // 有外键关联
+            var relationEntity = dataSource === null || dataSource === void 0 ? void 0 : dataSource.findEntityByName(property.relationEntity);
+            if (relationEntity) {
+                var displayedProperty = _1.getFirstDisplayedProperty(relationEntity);
+                if (displayedProperty)
+                    entitySet.add(relationEntity);
+            }
+        }
+    });
+    var allEntities = __spreadArrays(entitySet);
+    var entityLogic = _1.genQueryLogic(allEntities, nameGroup, false, true, module);
+    newLogics.push(entityLogic);
+    return "\n<template>\n    " + (config_1.config.scope === 'h5' ? genH5GridViewTemplate(entity, nameGroup) : genGridViewTemplate(entity, nameGroup)) + "\n</template>\n<definition>\n{\n    \"viewLogics\": [\n        " + JSON.stringify(genGridViewLoadLogic(entity, nameGroup, entityLogic, false)) + ",\n        " + JSON.stringify(genGridViewRemoveLogic(entity, nameGroup)) + "\n    ],\n\n    \"logics\": " + JSON.stringify(newLogics) + "\n}\n</definition>\n";
+}
+exports.genGridViewBlock = genGridViewBlock;
+function genGridViewCardBlock(property, oldNode) {
+    var view = oldNode.view;
+    var entity = property.entity;
+    var dataSource = entity.parentNode;
+    var module = dataSource.parentNode;
+    var viewElementMainView = view.getViewElementUniqueName('gridView');
+    var nameGroup = _1.genUniqueQueryNameGroup(module, view, viewElementMainView);
+    nameGroup.viewElementMainView = viewElementMainView;
+    nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
+    nameGroup.viewLogicRemove = view.getLogicUniqueName('remove');
+    // 收集所有和本实体关联的实体
+    var entitySet = new Set();
+    entitySet.add(entity);
+    var newLogics = [];
+    entity.properties.forEach(function (property) {
+        if (property.relationEntity) {
+            // 有外键关联
+            var relationEntity = dataSource === null || dataSource === void 0 ? void 0 : dataSource.findEntityByName(property.relationEntity);
+            if (relationEntity) {
+                var displayedProperty = _1.getFirstDisplayedProperty(relationEntity);
+                if (displayedProperty)
+                    entitySet.add(relationEntity);
+            }
+        }
+    });
+    var allEntities = __spreadArrays(entitySet);
+    var entityLogic = _1.genQueryLogic(allEntities, nameGroup, true, true, module);
+    newLogics.push(entityLogic);
+    return "\n    <template>\n        " + genGridViewTemplate(entity, nameGroup) + "\n    </template>\n    <definition>\n    {\n        \"viewLogics\": [\n            " + JSON.stringify(genGridViewLoadLogic(entity, nameGroup, entityLogic, false)) + ",\n            " + JSON.stringify(genGridViewRemoveLogic(entity, nameGroup)) + "\n        ],\n        \"logics\": " + JSON.stringify(newLogics) + "\n    }\n    </definition>\n    ";
+}
+exports.genGridViewCardBlock = genGridViewCardBlock;
+exports["default"] = genGridViewBlock;