@lcap/nasl 0.3.12 → 0.3.14-beta

package/src/types/data/genBlock/genCreateBlock.ts

@@ -94,6 +94,7 @@ export function genH5CreateFormTemplate(entity: Entity, nameGroup: NameGroup, se
                         <template #input><van-cascader title="请选择${label}" placeholder="请选择${label}"
                             v-model="${nameGroup.model}.${property.name}" :data-source="${selectNameGroupMap.get(relationEntity.id).load}"
                             text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}"
+                            :notitleblock="true"
                             :pageable="true" :remote-paging="true"></van-cascader></template>
                     `;
                 } else
@@ -107,10 +108,9 @@ export function genH5CreateFormTemplate(entity: Entity, nameGroup: NameGroup, se
         } else if (property.typeKey === '#/basicTypes/Decimal') {
             formItem += `<template #input><van-stepper v-model="${nameGroup.model}.${property.name}" placeholder="请输入${property.label || property.name}"></van-stepper></template>`;
         } else if (property.typeKey === '#/basicTypes/Text') {
-            formItem = formItem.replace(/other/g, '');
-            formItem += `<van-input v-model="${nameGroup.model}.${property.name}" placeholder="请输入${property.label || property.name}"></van-input>`;
+            formItem += `<template #input><van-fieldtextarea v-model="${nameGroup.model}.${property.name}" placeholder="请输入${property.label || property.name}"></van-fieldtextarea></template>`;
         } else if (property.typeKey === '#/basicTypes/Date') {
-            formItem += `<template #input><van-calendar v-model="${nameGroup.model}.${property.name}" title="请输入${property.label || property.name}"></van-calendar></template>`;
+            formItem += `<template #input><van-calendar :defaultDate.sync="${nameGroup.model}.${property.name}" title="选择日期"></van-calendar></template>`;
         } else if (property.typeKey === '#/basicTypes/Time') {
             formItem += `<template #input><van-datetime-picker type="time" v-model="${nameGroup.model}.${property.name}" title="请选择${property.label || property.name}" label-field=""></van-datetime-picker></template>`;
         } else if (property.typeKey === '#/basicTypes/DateTime') {
@@ -118,8 +118,7 @@ export function genH5CreateFormTemplate(entity: Entity, nameGroup: NameGroup, se
         } else if (dataTypesMap[property.typeKey].type === 'enum') {
             formItem += '<template #input>' + genEnumSelectBlock(dataTypesMap[property.typeKey] as Enum, `${nameGroup.model}.${property.name}`, '', `请选择${property.label || property.name}`) + '</template>';
         } else {
-            formItem = formItem.replace(/other/g, '');
-            formItem += `<van-input v-model="${nameGroup.model}.${property.name}" placeholder="请输入${property.label || property.name}"></van-input>`;
+            formItem += `<template #input><van-fieldinput v-model="${nameGroup.model}.${property.name}" placeholder="请输入${property.label || property.name}"></van-fieldinput></template>`;
         }
 
         formItem += `            </van-field>\n`;

package/src/types/data/genBlock/genListViewBlock.ts

@@ -27,7 +27,7 @@ export function genH5ListViewTemplate(property: EntityProperty, nameGroup: NameG
     text-field="${nameGroup.lowerEntity}.${property.name}"
     value-field="${nameGroup.lowerEntity}.id" pageable="auto-more" :remote-paging="true">
     <template #item="scope">
-        <van-cell :value="${expression}" isLink></van-cell>
+        <van-cell :value="${expression}" isLink><template #title>{{ ${expression} }}</template></van-cell>
     </template>
 </van-list-view>`;
 }

package/src/types/data/genBlock/genTableBlock.ts

@@ -38,14 +38,14 @@ export function genTableColumnTemplate(property: EntityProperty) {
         if (property.typeKey === '#/basicTypes/Boolean') {
             return `
             <u-text v-if="${expression}" text="是"></u-text>
-            <u-text v-if="!${expression}" text="否"></u-text>
+            <u-text v-if="${expression} == false" text="否"></u-text>
             `;
         } else {
             return `<u-text :text="${expression}"></u-text>`;
         }
     };
 
-    return `<u-table-view-column title="${title}">
+    return `<u-table-view-column title="${title}" field="${lowerEntityName}.${property.name}">
     <template #cell="scope">
         <u-linear-layout gap="small">
             ${getText(property)}

package/src/types/data/genBlock/genUpdateBlock.ts

@@ -105,6 +105,7 @@ export function genH5UpdateFormTemplate(entity: Entity, nameGroup: NameGroup, se
                         <template #input><van-cascader title="请选择${label}" placeholder="请选择${label}"
                             v-model="${nameGroup.model}.${property.name}" :data-source="${selectNameGroupMap.get(relationEntity.id).load}"
                             text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}"
+                            :notitleblock="true"
                             :pageable="true" :remote-paging="true"></van-cascader></template>
                     `;
                 } else
@@ -118,12 +119,10 @@ export function genH5UpdateFormTemplate(entity: Entity, nameGroup: NameGroup, se
         } else if (property.typeKey === '#/basicTypes/Decimal') {
             formItem += `<template #input><van-stepper v-model="${nameGroup.model}.${property.name}" placeholder="请输入${label}"></van-stepper></template>`;
         } else if (property.typeKey === '#/basicTypes/Text') {
-            formItem = formItem.replace(/other/g, '');
-            formItem += `<van-input v-model="${nameGroup.model}.${property.name}" placeholder="请输入${label}"></van-input>`;
-
+            formItem += `<template #input><van-fieldtextarea v-model="${nameGroup.model}.${property.name}" placeholder="请输入${label}"></van-fieldtextarea></template>`;
             // @TODO
         } else if (property.typeKey === '#/basicTypes/Date') {
-            formItem += `<template #input><van-calendar clearable :date.sync="${nameGroup.model}.${property.name}" placeholder="请输入${label}"></van-calendar></template>`;
+            formItem += `<template #input><van-calendar clearable :defaultDate.sync="${nameGroup.model}.${property.name}" placeholder="请输入${label}" title="选择日期"></van-calendar></template>`;
         } else if (property.typeKey === '#/basicTypes/Time') {
             formItem += `<template #input><van-datetime-picker type="time" v-model="${nameGroup.model}.${property.name}" title="请选择${label}" label-field=""></van-datetime-picker></template>`;
         } else if (property.typeKey === '#/basicTypes/DateTime') {
@@ -131,8 +130,7 @@ export function genH5UpdateFormTemplate(entity: Entity, nameGroup: NameGroup, se
         } else if (dataTypesMap[property.typeKey].type === 'enum') {
             formItem += '<template #input>' + genEnumSelectBlock(dataTypesMap[property.typeKey] as Enum, `${nameGroup.model}.${property.name}`, '', `请选择${label}`) + '</template>';
         } else {
-            formItem = formItem.replace(/other/g, '');
-            formItem += `<van-input v-model="${nameGroup.model}.${property.name}" placeholder="请输入${label}"></van-input>`;
+            formItem += `<template #input><van-fieldinput v-model="${nameGroup.model}.${property.name}" placeholder="请输入${label}"></van-fieldinput></template>`;
         }
 
         formItem += `            </van-field>\n`;

package/src/types/data/genericTypes.ts

@@ -6,10 +6,14 @@ export function getGenericTypeRef(typeName: string) {
     return `#/genericTypes/${typeName}`;
 }
 
-export async function getGenericList() {
+export async function getGenericList(appId: string) {
     let list = [];
     try {
-        list = await genericService.getGenericClassList();
+        list = await genericService.getGenericClassList({
+            headers: {
+                'request-lcpAppId': appId,
+            },
+        });
     } catch (err) { }
     const genericTypeList: any = [];
     const genericTypemap: any = {};

package/src/types/data/systemTypes.ts

@@ -24,6 +24,7 @@ export const systemTypeList = [
     { kind: 'systemType', text: 'UploadErrorEvent', value: '#/systemTypes/UploadErrorEvent' },
     { kind: 'systemType', text: 'SortEvent', value: '#/systemTypes/SortEvent' },
     { kind: 'systemType', text: 'PoiInfo', value: '#/systemTypes/PoiInfo' },
+    { kind: 'systemType', text: 'File', value: '#/systemTypes/File' },
 ];
 
 export const systemTypeMap: { [name: string]: ObjectSchema } = {
@@ -417,6 +418,27 @@ export const systemTypeMap: { [name: string]: ObjectSchema } = {
                 description: '选择项相关对象',
                 isLeaf: true,
             },
+            {
+                type: 'genericType',
+                typeKey: '#/genericTypes/List',
+                typeInstantiation: {
+                    typeName: 'List',
+                    typeParams: [
+                        {
+                            type: 'typeParam',
+                            typeParamName: 'T',
+                            typeParamValue: {
+                                typeKey: '#/basicTypes/String',
+                                type: 'string',
+                                format: '',
+                            },
+                        },
+                    ],
+                },
+                name: 'items',
+                description: '所有选中项相关对象的数组',
+                isLeaf: true,
+            },
             {
                 typeKey: '#/basicTypes/String',
                 type: 'string',
@@ -1311,6 +1333,27 @@ export const systemTypeMap: { [name: string]: ObjectSchema } = {
                 description: '选择项相关对象',
                 isLeaf: true,
             },
+            {
+                type: 'genericType',
+                typeKey: '#/genericTypes/List',
+                typeInstantiation: {
+                    typeName: 'List',
+                    typeParams: [
+                        {
+                            type: 'typeParam',
+                            typeParamName: 'T',
+                            typeParamValue: {
+                                typeKey: '#/basicTypes/String',
+                                type: 'string',
+                                format: '',
+                            },
+                        },
+                    ],
+                },
+                name: 'items',
+                description: '所有选中项相关对象的数组',
+                isLeaf: true,
+            },
         ],
     },
     '#/systemTypes/UploadEvent': {
@@ -1559,4 +1602,34 @@ export const systemTypeMap: { [name: string]: ObjectSchema } = {
             },
         ],
     },
+    '#/systemTypes/File': {
+        name: 'File',
+        type: 'object',
+        propertyList: [
+            {
+                typeKey: '#/basicTypes/String',
+                type: 'string',
+                format: '',
+                name: 'name',
+                description: '文件名称',
+                isLeaf: true,
+            },
+            {
+                typeKey: '#/basicTypes/Integer',
+                type: 'integer',
+                format: 'int',
+                name: 'size',
+                description: '文件大小',
+                isLeaf: true,
+            },
+            {
+                typeKey: '#/basicTypes/String',
+                type: 'string',
+                format: '',
+                name: 'type',
+                description: '文件类型',
+                isLeaf: true,
+            },
+        ],
+    },
 };

package/src/types/logic/Logic.ts

@@ -162,6 +162,19 @@ export class Logic extends Vertex {
      */
     @immutable()
     public triggerType: string = undefined;
+    /**
+    * 事务
+    * {
+    * "enabled": "事务是否生效; true | false", // 目前只有这一个属性有使用到
+    * "propagation": "事务的传播机制",
+    * "isolation": "事务的隔离级别",
+    * "rollbackFor": ["事务需要捕获且回滚的异常"],
+    * "noRollbackFor": ["事务无需回滚的异常"]
+    *
+    * }
+    */
+    @immutable()
+    public transactional: Record<string, unknown> = {};
     /**
      * 定时任务
      */
@@ -276,6 +289,7 @@ export class Logic extends Vertex {
         config.defaultApp?.emit('saving');
 
         const body = this.toPlainJSON();
+        // body.transactional = this.transactional;
         utils.logger.debug('修改逻辑', body);
         await logicService.update({
             headers: {
@@ -518,6 +532,27 @@ export class Logic extends Vertex {
         }
         return this;
     }
+    /**
+   * 更新事务属性
+   */
+    @action('更新事务属性')
+    async setTransaction(transactional: Record<string, unknown>) {
+        const body = {
+            logicId: this.id,
+            id: transactional.id,
+            enabled: transactional.enabled,
+        };
+        this.assign({ transactional });
+        await logicService.updateTransactional({ body });
+        await this.update(undefined, {
+            actionDesc: '更新事务属性',
+        });
+        if (this.view) {
+            this.view.page.service.emit('pageTreeChange');
+            this.emit('change');
+        }
+        return this;
+    }
     /**
      * 验证表达式正确与否
      */