@lcap/nasl 0.3.13 → 0.3.14-beta

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/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;
+    }
     /**
      * 验证表达式正确与否
      */