@lcap/nasl 3.3.0-alpha.1 → 3.3.0-alpha.3

package/src/concepts/View__.ts

@@ -1634,14 +1634,14 @@ export class View extends BaseNode {
       definition.viewLogics.forEach((logicOption: any) => {
         // 页面逻辑只有load函数的走之前的逻辑其余不用创建
         if (logicOption.name.startsWith('load')) {
-          const logic = Logic.from(
-            {
-              ...logicOption,
-            },
-            this,
-            'logics'
-          );
-          this.addLogic(logic);
+          // const logic = Logic.from(
+          //   {
+          //     ...logicOption,
+          //   },
+          //   this,
+          //   'logics'
+          // );
+          // this.addLogic(logic);
         }
       });
     }
@@ -1731,6 +1731,8 @@ export class View extends BaseNode {
    * @TODO 这一版先做成 componentOptions 式的，后面再美化
    */
   genScript() {
+    const componentList: Array<ViewElement> = []
+    this.elementsAttrs(this.elements, componentList)
     const definition = {
       params: this.params,
       variables: this.variables,
@@ -1742,6 +1744,7 @@ export class View extends BaseNode {
       auth: this.auth ? 'loginAuth' : undefined,
       viewBindEvents: this.getViewBindEvents(),
       viewExpressions: this.getViewExpressions(),
+      elements: componentList,
     };
     let code = '';
     let mixin = '';
@@ -1892,9 +1895,22 @@ export class View extends BaseNode {
       });
     }
   }
+  // 获取当前element，铺平
+  elementsAttrs(elements: Array<ViewElement>, componentList: Array<ViewElement>) {
+      if (elements) {
+          elements.forEach((item: ViewElement) => {
+              if (PAGE_COMPONENT_INCLUDE_TAG_MAP?.[item.tag]) {
+                  componentList.push(item)
+              }
+              if (item.children.length > 0) {
+                  this.elementsAttrs(item.children, componentList)
+              }
+          });
+      }
+  }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     function chineseTsName(name: string) {
       let tsName = name;
       // 匹配所有特殊字符都转为_
@@ -2008,6 +2024,28 @@ export class View extends BaseNode {
     });
     code += `${indent((state?.tabSize || 0) + 1)}}\n`;
     code += `let __elements: __elements;\n`;
+
+    if (Array.isArray(this.elements)) {
+      code += indent((state?.tabSize || 0) + 1) + 'interface ';
+      code += `__elements_completionProperty {\n`;
+      const componentList: Array<ViewElement> = []
+      this.elementsAttrs(this.elements, componentList)
+      const variableList: string[] = []
+      componentList.forEach((item) => {
+        code += item.toEmbeddedTSVariableDefinition(shiftState(state, code, { inline: true }), variableList);
+        code += ';\n';
+      })
+      code += indent((state?.tabSize || 0) + 1) + `}\n`;
+      code += indent((state?.tabSize || 0) + 1);
+      code += `let __elements_completionProperty: __elements_completionProperty;\n`
+      code += indent((state?.tabSize || 0) + 1);
+      code += `let __elements_stashFunctionVariable = {\n`;
+      variableList.forEach((item) => {
+        code += indent((state?.tabSize || 0) + 2);
+        code += `${item}`
+      })
+      code += indent((state?.tabSize || 0) + 1) + `}\n`;
+    }
     // 逻辑
     if (Array.isArray(this.logics) && this.logics.length) {
       code += indent((state?.tabSize || 0) + 1);
@@ -2074,7 +2112,7 @@ export class View extends BaseNode {
   }
 
   @withSourceMap()
-  toNaturalTS(state?: TranslatorState, currentNode?: BaseNode): string {
+  toNaturalTS(state = createCompilerState(), currentNode?: BaseNode): string {
     let code = `export function ${this.tsName}_view`;
     const advanceMap: Map<Variable, Assignment | BatchAssignment> = new Map();
     this.traverseChildren((el) => {
@@ -2508,3 +2546,213 @@ export default View;
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
 //= ===============================================================================
+type AttrObject = {
+  value: string,
+  label: string
+}
+export const PAGE_COMPONENT_INCLUDE_TAG_MAP: Record<string, Record<string, AttrObject>> = {
+  'u-list-view': {
+      'page-size': {
+          value: 'size',
+          label: '分页大小'
+      },
+      'page-number': {
+          value: 'page',
+          label: '当前页数'
+      },
+      'data-source': {
+          value: 'data',
+          label: '数据'
+      },
+  },
+  'u-grid-view': {
+      'page-size': {
+          value: 'size',
+          label: '分页大小'
+      },
+      'page-number': {
+          value: 'page',
+          label: '当前页数'
+      },
+      'data-source': {
+          value: 'data',
+          label: '数据'
+      },
+  },
+  'u-list-components': {
+      'data-source': {
+          value: 'data',
+          label: '数据'
+      },
+  },
+  'u-table-view': {
+      'page-size': {
+          value: 'size',
+          label: '分页大小'
+      },
+      'page-number': {
+          value: 'page',
+          label: '当前页数'
+      },
+      'sorting': {
+          value: 'sort',
+          label: '排序属性'
+      },
+      'value': {
+          value: 'value',
+          label: '单选选中值'
+      },
+      'values': {
+          value: 'values',
+          label: '多选选中值'
+      },
+      'data-source': {
+          value: 'data',
+          label: '数据'
+      },
+  },
+  'u-radios': {
+      'value': {
+          value: 'value',
+          label: '选中值'
+      },
+      'data-source': {
+          value: 'data',
+          label: '数据'
+      },
+  },
+  'u-checkboxes': {
+      'value': {
+          value: 'value',
+          label: '选中值'
+      },
+      'data-source': {
+          value: 'data',
+          label: '数据'
+      },
+  },
+  'u-select': {
+      'value': {
+          value: 'value',
+          label: '选中值'
+      },
+      'data-source': {
+          value: 'data',
+          label: '数据'
+      },
+      'opened': {
+          value: 'opened',
+          label: '弹出状态'
+      },
+      'page-size': {
+          value: 'size',
+          label: '分页大小'
+      },
+      'page-number': {
+          value: 'page',
+          label: '当前页数'
+      },
+  },
+  'u-cascader': {
+      'value': {
+          value: 'value',
+          label: '选中值'
+      },
+      'data-source': {
+          value: 'data',
+          label: '数据'
+      },
+  },
+  'u-tree-select-new': {
+      'value': {
+          value: 'value',
+          label: '选中值'
+      },
+      'data-source': {
+          value: 'data',
+          label: '数据'
+      },
+  },
+  'van-radio-group': {
+      'value': {
+          value: 'value',
+          label: '选中值'
+      },
+      'data-source': {
+          value: 'data',
+          label: '数据'
+      },
+  },
+  'van-checkbox-group': {
+      'value': {
+          value: 'value',
+          label: '选中值'
+      },
+      'data-source': {
+          value: 'data',
+          label: '数据'
+      },
+  },
+  'van-pickerson': {
+      'pvalue': {
+          value: 'value',
+          label: '选中值'
+      },
+      'data-source': {
+          value: 'data',
+          label: '数据'
+      },
+      'page-size': {
+          value: 'size',
+          label: '分页大小'
+      },
+      'page-number': {
+          value: 'page',
+          label: '当前页数'
+      },
+  },
+  'van-cascader': {
+      'value': {
+          value: 'value',
+          label: '选中值'
+      },
+      'data-source': {
+          value: 'data',
+          label: '数据'
+      },
+  },
+  'van-list-view': {
+      'page-size': {
+          value: 'size',
+          label: '分页大小'
+      },
+      'page-number': {
+          value: 'page',
+          label: '当前页数'
+      },
+      'data-source': {
+          value: 'data',
+          label: '数据'
+      },
+  },
+  'van-grid-view': {
+      'page-size': {
+          value: 'size',
+          label: '分页大小'
+      },
+      'page-number': {
+          value: 'page',
+          label: '当前页数'
+      },
+      'data-source': {
+          value: 'data',
+          label: '数据'
+      },
+  },
+  'van-for-components': {
+      'data-source': {
+          value: 'data',
+          label: '数据'
+      },
+  },
+}

package/src/concepts/WhileStatement__.ts

@@ -1,5 +1,5 @@
 import { v4 as uuidv4 } from 'uuid';
-import { TranslatorState, shiftState, withSourceMap, indent } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
 //= ===============================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -264,7 +264,7 @@ export class WhileStatement extends LogicItem {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     let code = '';
     code += 'while (nasl.core.ensureBoolean(';
     code += this.test
@@ -291,7 +291,7 @@ export class WhileStatement extends LogicItem {
   }
 
   @withSourceMap()
-  toNaturalTS(state?: TranslatorState): string {
+  toNaturalTS(state = createCompilerState()): string {
     let code = '';
     code += 'while (';
     code += this.test ? this.test.toNaturalTS(shiftState(state, code, {

package/src/concepts/basics/stdlib/nasl.browser.ts

@@ -90,6 +90,7 @@ export default new Namespace({
         }),
         new Logic({
             name: 'compareKeyboardInput',
+            description: '用户输入键位比较',
             params: [
                 new Param({
                     name: 'keyboardEvent',

package/src/concepts/basics/stdlib/nasl.event.ts

@@ -6,11 +6,13 @@ export default new Namespace({
     logics: [
         new Logic({
             name: 'preventDefault',
+            description: '阻止浏览器默认行为',
             params: [],
             body: [],
         }),
         new Logic({
             name: 'stopPropagation',
+            description: '阻止事件向上传递',
             params: [],
             body: [],
         }),

package/src/generator/genBundleFiles.ts

@@ -291,7 +291,27 @@ export function genBundleFiles(app: App, frontend: Frontend, config: Config) {
                 document.documentElement.style.setProperty('--scrollbar-size', 0);
                 // 移除 iframe 边框
                 iframe.style.border = 'none';
+                // 当 iframe 跳转到外部页面时，需要跳转到外部页面
+                window.addEventListener('message', function (e) {
+                    if (e.data.type === 'iframe-to-diff-origin') {
+                        window.location.href = e.data.href;
+                    }
+                });
                 return;
+            } else {
+                // 点击跳转到外部页面时，通知顶层页面
+                // 由于顶层刷新会再次触发 iframe 的 beforeunload，因此加上 pending 防止多次触发
+                let pending = false;
+                window.addEventListener('beforeunload', function (e) {
+                    // activeElement 是当前点击的元素
+                    const href = e.target.activeElement.href;
+                    if (!href || pending) return;
+                    pending = true;
+                    window.parent.postMessage({
+                        type: 'iframe-to-diff-origin',
+                        href,
+                    }, '*');
+                });
             }
         }`;
   }
@@ -342,7 +362,76 @@ export function genBundleFiles(app: App, frontend: Frontend, config: Config) {
 
             return window.appVM = appVM;
         };
-        window.createLcapApp();
+        window.createLcapApp();`
+    if(frontend.globalScaleEnabled) {
+        content += `
+        /**
+         * iframe 路由同步的几种情况：
+         * 1. 跳转时，iframe 同步到顶层
+         * 2. 回退时，顶层同步到 iframe，经测试，即便在 iframe 里调用 back 也会先触发顶层回退
+         * 3. 前进时，iframe 同步到顶层
+         * 原因：顶层永远在 iframe 后面
+        */ 
+        // 自增ID，用于判断路由是否回退
+        let incrementID = 0;
+        // 当前历史ID，用于判断路由是否回退
+        let curHID = 0;
+        // 当前顶层历史ID，用于判断顶层路由是否回退
+        let curParentHID = 0;
+        // 是否是回退
+        let isBack = false;
+        // 是否是前进
+        let isForward = false;
+        appVM.$router.afterEach((to, from)=> {
+            if(isBack) {
+                // 重置回退状态
+                isBack = false;
+                return;
+            }
+            // iframe 前进时，需要让顶层页面也前进
+            if(isForward) {
+                isForward = false;
+                window.parent.history.forward();
+                return;
+            }
+            // 自增ID，用于判断路由是否回退
+            incrementID++;
+            window.history.replaceState({HID: incrementID}, '');
+            // iframe 路由变化时，需要同步顶层页面的路由
+            window.parent.history.pushState({HID: incrementID}, '', to.fullPath);
+            // iframe 路由变化时，title 也要同步
+            window.parent.document.title = document.title;
+            // 更新当前历史ID
+            curHID = incrementID;
+            curParentHID = incrementID;
+        });
+        window.addEventListener('popstate', function (e) {
+            if(curHID > e.state?.HID){
+                isBack = true;
+            } else {
+                isForward = true;
+            }
+            // 更新当前历史ID
+            curHID = e.state?.HID || 0;
+        });
+        // 顶层页面路由回退时，需要同步 iframe 的路由
+        window.parent.addEventListener('popstate', function (e) {
+            if(curParentHID > e.state?.HID){
+                appVM.$router.back();
+            }
+            // 更新当前顶层历史ID
+            curParentHID = e.state?.HID || 0;
+        });
+        // 首次加载同步 title 和 shortcut icon
+        window.addEventListener('load', function() {
+            window.parent.document.title = document.title;
+            const shortcutIconLink = document.querySelector('link[rel="shortcut icon"]');
+            if(shortcutIconLink) parent.document.head.appendChild(shortcutIconLink);
+        });
+        `
+    }
+
+    content += `
     })();`;
 
   if (config.env === 'dev') {
@@ -410,6 +499,7 @@ export function genBundleFiles(app: App, frontend: Frontend, config: Config) {
            }\`
             document.getElementsByTagName('body')[0].appendChild(style);
             window.addEventListener('message', function (e) {
+                console.log('message:',e)
                 if(e.data ==="release-start"){
                     showLoading()
                 }

package/src/generator/genReleaseBody.ts

@@ -243,7 +243,7 @@ export async function genReleaseBody(app: App, releaseData: ReleaseData) {
     logPublishFunc(`[语言] "[${app.title}]" 获取类型标注成功！`);
   } catch (err) {
     console.error(err);
-    throw new Error('代码标注失败，请稍后重试！或刷新后重试！');
+    throw new Error(`代码标注失败，原因是：${err.message}，请稍后重试！或刷新后重试！`);
   }
 
   // 可能所有的前端都不选

package/src/generator/permission.ts

@@ -57,7 +57,7 @@ async function findViewLogicReferences(logic: Logic, vis: Set<Logic> = new Set()
 
   async function dfs(usage: Usage) {
     if (usage.node instanceof CallLogic) {
-      const { logic } = usage.node;
+      const logic = usage.node.logic;
       if (!vis.has(logic) && logic) {
         vis.add(logic);
         await findViewLogicReferences(logic, vis);
@@ -208,7 +208,7 @@ function getAllLogics(app: App) {
 
   if (Array.isArray(entities)) {
     entities.forEach((entity) => {
-      const { ns } = entity;
+      const ns = entity.ns;
       if (Array.isArray(ns?.logics)) {
         allLogics.push(...ns.logics);
       }
@@ -296,7 +296,7 @@ export async function genPermissionData(app: App) {
   if (authValue?.length) {
     authValue.forEach((item) => {
       const { key, authValue } = item;
-      logicPageResourceDtoList[`${key}:POST`] = checkPageAndUploadAuth(uploaders, key) !== -1 ? [] : convertArray(authValue);
+      logicPageResourceDtoList[`${key}:POST`] = checkPageAndUploadAuth(uploaders, key) !== -1 ? [[]] : convertArray(authValue);
     });
   }
   closeCache();

package/src/index.ts

@@ -10,3 +10,4 @@ export * from './eventBus';
 export * as breakpoint from './breakpoint';
 export { loadApp, loadAppSync, handleApp, batchAction, batchQuery, mountDatabaseTypes } from './service/storage/init';
 export { createService } from './service/creator';
+export * from './natural';

package/src/natural/genNaturalTS.ts

@@ -14,8 +14,10 @@ export function genNaturalTS(app: App, currentNode?: BaseNode) {
 }
 
 export function genNaturalTSContext(app: App, currentNode?: BaseNode) {
-    let code = `// TypeScript 中有以下定义：\n`;
+
+    let code = `### 低代码平台的 ts 定义如下：\n`;
     /* 标准库 */
+    code += `\`\`\`ts\n`;
     code += '// 标准库\n';
     code += Object.values(naslStdlibMap).join('\n') + '\n';
     /* 全局上下文 */
@@ -27,7 +29,7 @@ export function genNaturalTSContext(app: App, currentNode?: BaseNode) {
     app.structures
         .filter((entity) => !entity.name.startsWith('LCAP'))
         .forEach((structure) => code += structure.toNaturalTS() + '\n');
-    code += '// 全局变量 \n';
+    code += '// 全局变量\n';
     const variables = app.frontends.flatMap((item) => item.variables).filter((item) => !!item);
     variables.forEach((variable) => {
         const state = createCompilerState();
@@ -66,12 +68,14 @@ export function genNaturalTSContext(app: App, currentNode?: BaseNode) {
         logic = currentNode.getAncestor('Logic') as Logic;
     }
     // code += '// 页面上下文\n';
-    code += '// 当前逻辑的 ts 定义\n';
+    code += `\`\`\`\n`;
+    code += '### 当前逻辑的 ts 定义\n';
+    code += `\`\`\`ts\n`;
     if (view) { // 为页面中的逻辑
         code += view.toNaturalTS(undefined, currentNode);
     } else if (logic) { // 为全局逻辑
         code += logic.toNaturalTS(undefined);
     }
-
+    code += `\`\`\`\n`;
     return code;
 }

package/src/natural/knowledgeMap.ts

@@ -4,24 +4,24 @@ const docsMap: any = {};
 if (globalThis.process) { // For TS build
     const fs = require('fs');
     knowledgeMap = {
-        index: fs.readFileSync(require.resolve('../../docs-for-aigc/index.md'), 'utf8'),
-        '实体和实体属性、实体索引': fs.readFileSync(require.resolve('../../docs-for-aigc/实体和实体属性、实体索引.d.ts'), 'utf8'),
-        '应用和数据源、数据源和实体': fs.readFileSync(require.resolve('../../docs-for-aigc/应用和数据源、数据源和实体.d.ts'), 'utf8'),
-        类型标注: fs.readFileSync(require.resolve('../../docs-for-aigc/类型标注.d.ts'), 'utf8'),
-        页面: fs.readFileSync(require.resolve('../../docs-for-aigc/页面.d.ts'), 'utf8'),
-        逻辑: fs.readFileSync(require.resolve('../../docs-for-aigc/逻辑.d.ts'), 'utf8'),
+        // index: fs.readFileSync(require.resolve('../../docs-for-aigc/index.md'), 'utf8'),
+        // '实体和实体属性、实体索引': fs.readFileSync(require.resolve('../../docs-for-aigc/实体和实体属性、实体索引.d.ts'), 'utf8'),
+        // '应用和数据源、数据源和实体': fs.readFileSync(require.resolve('../../docs-for-aigc/应用和数据源、数据源和实体.d.ts'), 'utf8'),
+        // 类型标注: fs.readFileSync(require.resolve('../../docs-for-aigc/类型标注.d.ts'), 'utf8'),
+        // 页面: fs.readFileSync(require.resolve('../../docs-for-aigc/页面.d.ts'), 'utf8'),
+        // 逻辑: fs.readFileSync(require.resolve('../../docs-for-aigc/逻辑.d.ts'), 'utf8'),
     };
 }
 /// #endif
 /// #if process.env.BUILD_TARGET !== 'node'
 if (globalThis.window) { // For TS build
     knowledgeMap = {
-        index: require('!!raw-loader!../../docs-for-aigc/index.md').default,
-        '实体和实体属性、实体索引': require('!!raw-loader!../../docs-for-aigc/实体和实体属性、实体索引.d.ts').default,
-        '应用和数据源、数据源和实体': require('!!raw-loader!../../docs-for-aigc/应用和数据源、数据源和实体.d.ts').default,
-        类型标注: require('!!raw-loader!../../docs-for-aigc/类型标注.d.ts').default,
-        页面: require('!!raw-loader!../../docs-for-aigc/页面.d.ts').default,
-        逻辑: require('!!raw-loader!../../docs-for-aigc/逻辑.d.ts').default,
+        // index: require('!!raw-loader!../../docs-for-aigc/index.md').default,
+        // '实体和实体属性、实体索引': require('!!raw-loader!../../docs-for-aigc/实体和实体属性、实体索引.d.ts').default,
+        // '应用和数据源、数据源和实体': require('!!raw-loader!../../docs-for-aigc/应用和数据源、数据源和实体.d.ts').default,
+        // 类型标注: require('!!raw-loader!../../docs-for-aigc/类型标注.d.ts').default,
+        // 页面: require('!!raw-loader!../../docs-for-aigc/页面.d.ts').default,
+        // 逻辑: require('!!raw-loader!../../docs-for-aigc/逻辑.d.ts').default,
     };
 }
 /// #endif