@lcap/nasl 0.3.12-beta.3 → 0.3.13

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lcap/nasl",
   "description": "NetEase Application Specific Language",
-  "version": "0.3.12-beta.3",
+  "version": "0.3.13",
   "author": "Forrest <rainforest92@126.com>",
   "scripts": {
     "dev": "tsc -watch -p ./",

package/src/service/config/api.js

@@ -0,0 +1,32 @@
+export default {
+    loadList: {
+        url: {
+            method: 'get',
+            path: '/api/v1/property/list/{serviceId}',
+        },
+    },
+    add: {
+        url: {
+            method: 'post',
+            path: '/api/v1/property',
+        },
+    },
+    delete: {
+        url: {
+            method: 'delete',
+            path: '/api/v1/property/{serviceId}/{propertyId}',
+        },
+    },
+    update: {
+        url: {
+            method: 'put',
+            path: '/api/v1/property',
+        },
+    },
+    check: {
+        url: {
+            method: 'get',
+            path: '/api/v1/property/fetch/{serviceId}/{key}',
+        },
+    },
+};

package/src/service/config/index.js

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

package/src/service/create/index.js

@@ -27,7 +27,7 @@ const requester = function (requestInfo) {
             headers.Cookie = aslConfig.cookie;
     }
 
-    headers['request-lcpAppId'] = aslConfig.defaultApp?.id;
+    headers['request-lcpAppId'] = headers['request-lcpAppId'] || aslConfig.defaultApp?.id;
     if (aslConfig.defaultApp?.baseVersion)
         headers['request-appBaseVersion'] = aslConfig.defaultApp.baseVersion;
     if (aslConfig.defaultApp?.versionChangedTime)
@@ -54,7 +54,7 @@ const requester = function (requestInfo) {
         withCredentials: !baseURL,
     };
 
-    if (aslConfig.debugRequest && requestOptions.method !== 'GET') {
+    if (aslConfig.debugRequestAll || (aslConfig.debugRequest && requestOptions.method !== 'GET')) {
         console.debug('[Request Debug]', requestOptions);
     }
     const req = axios(requestOptions);

package/src/types/app/App.ts

@@ -160,6 +160,9 @@ export class App extends Vertex {
                 query: {
                     id: this.id,
                 },
+                headers: {
+                    'request-lcpAppId': this.id,
+                },
             });
         }
         const { envList } = appDetail.services
@@ -175,9 +178,12 @@ export class App extends Vertex {
             query: {
                 id: this.id,
             },
+            headers: {
+                'request-lcpAppId': this.id,
+            },
         });
         const { status } = result || {};
-        if (['PULLING', 'PUSHING'].includes(status)) {
+        if (['PULLING', 'PUSHING', 'PRE_PULLING'].includes(status)) {
             this.emit('updateIdeStatus', status);
         }
         await this.loadEnvList(result);
@@ -195,6 +201,9 @@ export class App extends Vertex {
             query: {
                 appId: this.id,
             },
+            headers: {
+                'request-lcpAppId': this.id,
+            },
         });
 
         const services = result.map((service: Service) => {
@@ -275,7 +284,7 @@ export class App extends Vertex {
         await this.load(); // 请求其它接口前，需要先查询到 app 上的 baseVersion
         await Promise.all([
             this.loadServices(),
-            updateGenericTypeList(),
+            updateGenericTypeList(this.id),
         ]);
 
         if (options.asyncLoadServicesDetail)
@@ -328,7 +337,8 @@ export class App extends Vertex {
     getModule(moduleName: string) {
         const { modules } = this;
         let module = modules.find((m) => m.name === moduleName);
-        if(module) return module;
+        if (module)
+            return module;
 
         module = new Module({ name: moduleName });
         modules.push(module);

package/src/types/app/Service.ts

@@ -108,6 +108,9 @@ export class Service extends Vertex {
             query: {
                 id: this.id,
             },
+            headers: {
+                'request-lcpAppId': this.appId,
+            },
         });
 
         const structures: Array<Structure> = [];
@@ -142,6 +145,9 @@ export class Service extends Vertex {
             query: {
                 id: this.id,
             },
+            headers: {
+                'request-lcpAppId': this.appId,
+            },
         });
         this.globalLogic.syncStructures(newStructures);
 
@@ -183,6 +189,9 @@ export class Service extends Vertex {
             query: {
                 serviceId: this.id,
             },
+            headers: {
+                'request-lcpAppId': this.appId,
+            },
         });
 
         interfaces = interfaces.map((item) => {
@@ -277,6 +286,9 @@ export class WebService extends Service {
             query: {
                 appId: this.id,
             },
+            headers: {
+                'request-lcpAppId': this.appId,
+            },
         });
         // result.id = result.appId;
 
@@ -367,11 +379,15 @@ export class WebService extends Service {
             },
         };
 
+        // 官方扩展组件暂时不包含 dist-theme/index.css 文件
+        const officialCustomComponents = ['lcap-login', 'lcap-video'];
         Object.keys(packageInfo.componentDependencies).forEach((name) => {
             const version = packageInfo.componentDependencies[name].replace(/^[^0-9]+/, '');
 
             result.custom.js.push(`${prefix}/packages/${name}@${version}/dist-theme/index.js`);
-            result.custom.css.push(`${prefix}/packages/${name}@${version}/dist-theme/index.css`);
+            if (!officialCustomComponents.includes(name)) {
+                result.custom.css.push(`${prefix}/packages/${name}@${version}/dist-theme/index.css`);
+            }
             result.custom.names.push(name);
         });
 
@@ -408,6 +424,9 @@ ${Object.keys(themeVariables).map((key) => `    ${key}: ${themeVariables[key]};`
             config: {
                 mock: config.mock,
             },
+            headers: {
+                'request-lcpAppId': this.appId,
+            },
         });
         const pages = result.map((page) => Page.from(page, this));
         this.assign({ pages });
@@ -543,6 +562,9 @@ export class MicroService extends Service {
             query: {
                 microServiceId: this.id,
             },
+            headers: {
+                'request-lcpAppId': this.appId,
+            },
         });
         entities.forEach((item, index) => {
             convert2RefType(item);
@@ -670,6 +692,9 @@ export class MicroService extends Service {
             query: {
                 microServiceId: this.id,
             },
+            headers: {
+                'request-lcpAppId': this.appId,
+            },
         });
 
         enums.forEach((item, index) => {
@@ -713,6 +738,9 @@ export class MicroService extends Service {
             query: {
                 serviceId: this.id,
             },
+            headers: {
+                'request-lcpAppId': this.appId,
+            },
         });
         const processes = result.map((process) => Process.from(process, this));
         this.assign({ processes });
@@ -732,6 +760,9 @@ export class MicroService extends Service {
             query: {
                 microServiceId: this.id,
             },
+            headers: {
+                'request-lcpAppId': this.appId,
+            },
         });
         const newEntities: Array<Entity> = [];
         const syncEntities: Array<Entity> = [];
@@ -781,6 +812,9 @@ export class MicroService extends Service {
             query: {
                 microServiceId: this.id,
             },
+            headers: {
+                'request-lcpAppId': this.appId,
+            },
         });
         entities.forEach((item) => {
             const tempEntity = <Entity>vertexsMap.get(item.id);
@@ -819,6 +853,7 @@ export class MicroService extends Service {
             },
             headers: {
                 IdeVersion: 2.3,
+                'request-lcpAppId': this.appId,
             },
         });
         interfaces = interfaces.map((item) => {

package/src/types/data/Entity.ts

@@ -179,6 +179,19 @@ export class Entity extends Vertex implements ObjectSchema {
      */
     @immutable()
     public readonly entityGenSource: string = undefined;
+
+    /**
+     * 数据源同步状态
+     */
+    @immutable()
+    public readonly sourceSyncState: number = undefined;
+
+    /**
+     * 数据源同步状态信息
+     */
+    @immutable()
+    public readonly sourceSyncMsgs: Array<string> = undefined;
+
     /**
      * 周边存在的名称
      */
@@ -332,6 +345,7 @@ export class Entity extends Vertex implements ObjectSchema {
         updateDataTypeList();
         this.dataNode.service.emit('dataTypesChange');
         this.dataNode.service.emit('vertexIdToNameChange', this.id, this.name);
+        await this.load();
     }
     /**
      * 设置实体表名
@@ -374,6 +388,7 @@ export class Entity extends Vertex implements ObjectSchema {
                 },
             });
 
+            // eslint-disable-next-line @typescript-eslint/no-this-alias, consistent-this
             const entity = this;
             entity.assign({ resolvers: [] });
 

package/src/types/data/Structure.ts

@@ -196,6 +196,16 @@ export class Structure extends Vertex implements ObjectSchema {
         config.defaultApp?.emit('saved');
         return this;
     }
+    /**
+     * 删除数据类型中数据结构 兼容模块功能
+     */
+    @action('删除数据类型中数据结构')
+    deleteType(none?: void, actionOptions?: ActionOptions) {
+        delete dataTypesMap[this.schemaRef];
+        updateDataTypeList();
+        this.destroy();
+        this.dataNode.service.emit('dataTypesChange');
+    }
     /**
      * 删除数据结构
      */

package/src/types/data/dataTypes.ts

@@ -20,12 +20,32 @@ export const dataTypesMap: { [name: string]: Schema } = {
 };
 
 export function updateDataTypeList() {
-    dataTypeList[1].children = Object.keys(dataTypesMap)
+    const typeMap: any = {};
+    Object.keys(dataTypesMap)
         .filter((key) => !key.includes('#/basicTypes') && !key.includes('#/systemTypes') && !key.includes('#/genericTypes'))
-        .map((key) => {
-            const dataType = dataTypesMap[key];
-            return { kind: (dataType as any).level, text: dataType.name, value: key };
+        .forEach((key) => {
+            const { level, name, createdTime }: any = dataTypesMap[key];
+            // 数据分类
+            if (!typeMap[level]) {
+                typeMap[level] = [];
+            }
+
+            typeMap[level].push({ kind: level, text: name, value: key, createdTime });
+        });
+
+    // 实体按创建时间排序
+    if (typeMap.entity) {
+        typeMap.entity.sort((a: any, b: any) => {
+            // 刚创建的实体createdTime没有值。。。
+            if (!a.createdTime) {
+                return -1;
+            }
+            return b.createdTime - a.createdTime;
         });
+    }
+
+    const children = Object.keys(typeMap).reduce((result, type) => result.concat(typeMap[type]), []);
+    dataTypeList[1].children = children;
 }
 
 export function properties2PropertyList(definition: any) {
@@ -45,8 +65,8 @@ export function properties2PropertyList(definition: any) {
     return definition;
 }
 
-export async function updateGenericTypeList() {
-    const datatypes = await getGenericList();
+export async function updateGenericTypeList(appId: string) {
+    const datatypes = await getGenericList(appId);
     dataTypeList[2].children = datatypes.genericTypeList.concat(systemTypeList);
     Object.assign(dataTypesMap, datatypes.genericTypemap);
 }

package/src/types/data/genBlock/builtInFunctions.json

@@ -541,5 +541,20 @@
                 "format": "int"
             }
         }
-    }
-}
+    },
+    "GetProperties": {
+        "params": [
+          {
+            "name": "name",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "return": {
+          "schema": {
+            "type": "string"
+          }
+        }
+      }
+}

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

@@ -38,7 +38,7 @@ 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>`;

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/LogicItem.ts

@@ -1056,6 +1056,7 @@ export class LogicItem extends Vertex {
                 id: node.id,
                 type: 'logicItem',
                 logicId: this.logic && this.logic.id,
+                appId: config.defaultApp?.id,
             });
         }
         // const res = await logicService.checkType({

package/src/types/page/Element.ts

@@ -1036,15 +1036,26 @@ export class Element extends Vertex {
                     }
                 } else {
                     const expression = <ExpressionNode> this._parseExpression(directive.value, context);
-                    element.directiveList.push(Directive.from({
-                        type: expression ? 'string' : 'dynamic',
-                        name: directive.name,
-                        rawName: directive.rawName,
-                        value: expression ? '' : directive.value,
-                        expression,
-                        arg: directive.arg,
-                        modifiers: directive.modifiers,
-                    }, element));
+                    if(!expression || expression.type === 'StringLiteral') { // 处理类似情况：v-auth="''",v-tooltip="''"
+                        element.directiveList.push(Directive.from({
+                            type: 'string',
+                            name: directive.name,
+                            rawName: directive.rawName,
+                            value:  directive.value && directive.value.replace(/'/g, ''),
+                            arg: directive.arg,
+                            modifiers: directive.modifiers,
+                        }, element));
+                    } else {
+                        element.directiveList.push(Directive.from({
+                            type: 'dynamic',
+                            name: directive.name,
+                            rawName: directive.rawName,
+                            value: '',
+                            expression,
+                            arg: directive.arg,
+                            modifiers: directive.modifiers,
+                        }, element));
+                    }
                 }
             });
 

package/src/types/page/Page.ts

@@ -107,6 +107,9 @@ export class Page extends Vertex {
             path: {
                 id: this.id,
             },
+            headers: {
+                'request-lcpAppId': this.service.appId,
+            },
         });
         this.assign(result);
 
@@ -174,6 +177,7 @@ export class Page extends Vertex {
                 appId: config.defaultApp?.id,
                 operationAction: actionOptions?.actionName || 'Page.create',
                 operationDesc: actionOptions?.actionDesc || `添加页面"${this.name}${this.title ? `(${this.title})` : ''}"`,
+                'request-lcpAppId': this.service.appId,
             },
             body,
         }).catch(catchFn());
@@ -233,6 +237,7 @@ export class Page extends Vertex {
                 appId: config.defaultApp?.id,
                 operationAction: actionOptions?.actionName || 'Page.create',
                 operationDesc: actionOptions?.actionDesc || `添加页面"${this.name}${this.title ? `(${this.title})` : ''}"`,
+                'request-lcpAppId': this.service.appId,
             },
             body,
         });
@@ -268,6 +273,7 @@ export class Page extends Vertex {
                 appId: config.defaultApp?.id,
                 operationAction: actionOptions?.actionName || 'Page.delete',
                 operationDesc: actionOptions?.actionDesc || `删除页面"${this.name}${this.title ? `(${this.title})` : ''}"`,
+                'request-lcpAppId': this.service.appId,
             },
             path: {
                 id: this.id,
@@ -295,6 +301,7 @@ export class Page extends Vertex {
                 appId: config.defaultApp?.id,
                 operationAction: actionOptions?.actionName || 'Page.delete',
                 operationDesc: actionOptions?.actionDesc || `修改页面"${this.name}${this.title ? `(${this.title})` : ''}"`,
+                'request-lcpAppId': this.service.appId,
             },
             body,
         }).catch(catchFn());

package/src/types/page/View.ts

@@ -189,6 +189,7 @@ export class View extends Block {
         if (this.contentPromise)
             return this.contentPromise;
 
+
         return this.contentPromise = (async () => {
             try {
                 const result: View = await viewService.load({
@@ -198,6 +199,9 @@ export class View extends Block {
                     query: {
                         enableCache,
                     },
+                    headers: {
+                        'request-lcpAppId': this.page.service.appId, // generator调用时需要appId headers
+                    },
                 });
 
                 const $def = result.$def;
@@ -237,6 +241,9 @@ export class View extends Block {
                     enableCache,
                 },
                 config: { noErrorTip: true },
+                headers: {
+                    'request-lcpAppId': this.page.service.appId,
+                },
             });
             const oldLogics = this.$def.logics;
             Object.assign(result, {
@@ -357,6 +364,9 @@ export class View extends Block {
                 appId: config.defaultApp?.id,
                 operationAction: actionOptions?.actionName || 'View.create',
                 operationDesc: actionOptions?.actionDesc || `添加子页面"${this.name}${this.title ? `(${this.title})` : ''}"`,
+                headers: {
+                    'request-lcpAppId': this.page ? this.page.service.appId : this.parent.page.service.appId,
+                },
             },
             body,
         }).catch(catchFn());
@@ -411,6 +421,9 @@ export class View extends Block {
                 appId: config.defaultApp?.id,
                 operationAction: actionOptions?.actionName || 'View.create',
                 operationDesc: actionOptions?.actionDesc || `添加子页面"${this.name}${this.title ? `(${this.title})` : ''}"`,
+                headers: {
+                    'request-lcpAppId': this.page.service.appId,
+                },
             },
             body,
         });
@@ -445,6 +458,9 @@ export class View extends Block {
                 appId: config.defaultApp?.id,
                 operationAction: actionOptions?.actionName || 'View.delete',
                 operationDesc: actionOptions?.actionDesc || `删除子页面"${this.name}${this.title ? `(${this.title})` : ''}"`,
+                headers: {
+                    'request-lcpAppId': this.page.service.appId,
+                },
             },
             path: {
                 id: this.id,
@@ -479,6 +495,9 @@ export class View extends Block {
                 appId: config.defaultApp?.id,
                 operationAction: actionOptions?.actionName || 'View.update',
                 operationDesc: actionOptions?.actionDesc || `修改子页面"${this.name}${this.title ? `(${this.title})` : ''}"`,
+                headers: {
+                    'request-lcpAppId': this.page.service.appId,
+                },
             },
             body,
         }).catch(catchFn());
@@ -960,6 +979,9 @@ export class View extends Block {
                 appId: config.defaultApp?.id,
                 operationAction: 'View.mergeBlock',
                 operationDesc: '根据实体自动生成组件和逻辑',
+                headers: {
+                    'request-lcpAppId': this.page.service.appId,
+                },
             },
         });