vue2-client 1.11.5 → 1.11.6

package/src/expression/TestExpression.ts

@@ -3,7 +3,48 @@ import Program from "./core/Program";
 import JSONObject from "./instances/JSONObject";
 import LogicConsole from "./instances/LogicConsole";
 
+console.debug("1.========testValidate========")
 testValidate()
+console.debug("2.========testAssert========")
+testAssert()
+console.debug("3.========testTry========")
+testTry()
+console.debug("4.========testPropertyType========")
+testPropertyType()
+console.debug("5.========testJSONArrayIndex========")
+testJSONArrayIndex()
+console.debug("6.========testArrayIndex========")
+testArrayIndex()
+console.debug("7.========testCompare========")
+testCompare()
+console.debug("8.========testJSONObject========")
+testJSONObject()
+console.debug("9.========testJSONArray========")
+testJSONArray()
+console.debug("10.========testFunctionCall========")
+testFunctionCall()
+console.debug("11.========testMath========")
+testMath()
+console.debug("12.========testString========")
+testString()
+console.debug("13.========testCondition========")
+testCondition()
+console.debug("14.========testThrow========")
+testThrow()
+console.debug("15.========testJSONArrayLoop========")
+testJSONArrayLoop()
+console.debug("16.========testJSONObjectLoop========")
+testJSONObjectLoop()
+console.debug("17.========testIntLoop========")
+testIntLoop()
+console.debug("18.========testContinueAndBreak========")
+testContinueAndBreak()
+console.debug("19.========testComment========")
+testComment()
+console.debug("20.========testReturn========")
+testReturn()
+console.debug("21.========testLambda========")
+testLambda()
 
 /**
  * validate
@@ -52,6 +93,402 @@ function testValidate () {
   runExpression(expression, data)
 }
 
+/**
+ * assert
+ */
+function testAssert () {
+  const expression = `
+    c = 1,
+    assert c == 1,
+    log.debug("ok"),
+    a = 1 + c,
+    assert a == 2,
+    log.debug("ok2")`
+  runExpression(expression);
+}
+
+/**
+ * try
+ */
+function testTry () {
+  const expression = `
+    a = 0,
+    log.debug(a),
+    try {
+        assert c == 2
+    } catch (WebException e) {
+        log.debug(e),
+        a = 1 + 1
+    } catch (Exception e) {
+        log.debug(e),
+        a = 1 + 2
+    },
+    log.debug(a)
+  `
+  runExpression(expression)
+}
+
+/**
+ * property
+ */
+function testPropertyType() {
+  const expression = `
+    a = 1,
+    b = 2.0,
+    c = {
+        d: 1,
+        e: {
+            str: "123",
+            你好: "中国"
+        }
+    },
+    c.a = 1,
+    log.debug(c.e.你好),
+    log.debug(c["e"].str),
+    e = c.d,
+    f = "123",
+    g = [],
+    名称 = "123=>",
+    log.debug(data.testArray[0]),
+    return 名称
+  `
+  const data = {
+    testArray: "zhang|b|c".split("\|")
+  }
+  runExpression(expression, data)
+}
+
+/**
+ * JSONArray index
+ */
+function testJSONArrayIndex() {
+  const expression = `
+    a = [1,2,3,4,5],
+    return a[4]
+  `;
+  runExpression(expression)
+}
+
+/**
+ * array index
+ */
+function testArrayIndex() {
+  const expression = `
+    return data.a[4]
+  `;
+  const data = {
+    a: [1,2,3,4,5]
+  }
+  runExpression(expression, data)
+}
+
+function testCompare() {
+  const expression = `
+    a = 0,
+    a >= 0 :(
+        a = a + 1,
+        b = 1,
+        a == b :(
+            c = 3.0,
+            a < c :(
+                a + 2,
+                a <= c :(
+                    strA = $a$,
+                    strB = $b$,
+                    strC = $c$,
+                    strA < strB && strA != strC :(
+                        return $ok$
+                    ),null
+                ),null
+            ),null
+        ),null
+    ),null
+  `;
+  runExpression(expression)
+}
+
+/**
+ * JSONObject
+ */
+function testJSONObject() {
+  const expression = `
+    datas = {
+        name: "张三",
+        年龄: 15,
+    },
+    datas
+  `
+  runExpression(expression)
+}
+
+/**
+ * JSONArray
+ */
+function testJSONArray() {
+  const expression = `
+    datas = ["a","b","c"],
+    datas
+  `
+  runExpression(expression)
+}
+
+/**
+ * function call
+ */
+function testFunctionCall() {
+  const expression = `
+    log.debug("test is ok")
+  `
+  runExpression(expression)
+}
+
+/**
+ * math
+ */
+function testMath() {
+  const expression = `
+    a = 1,
+    b = 2,
+    c = a + b,
+    c = c - 1,
+    d = 5 * 8,
+    e = d / 10,
+    e = e % 2,
+    c
+  `
+  runExpression(expression)
+}
+
+/**
+ * string
+ */
+function testString() {
+  const expression = `
+    test1 = {}.toString(),
+    log.debug(test1),
+    a = $part1$,
+    log.debug(a),
+    b = "part2",
+    log.debug(b),
+    c = "{a}:{b}",
+    log.debug(c),
+    d = "{name}:张三",
+    log.debug(d),
+    e = "\\{name\\}:张三",
+    log.debug(e),
+    f = "\\"123\\"",
+    log.debug(f),
+    g = "\\$15.7",
+    log.debug(g),
+    h = $\\$15.7$,
+    log.debug(h),
+    i = "http:\\\\www.baidu.com",
+    log.debug(i),
+    j = $http://www.baidu.com$,
+    log.debug(j)
+  `
+  runExpression(expression)
+}
+
+/**
+ * condition
+ */
+function testCondition() {
+  const expression = `
+    1 != 1 :(
+        throw "异常"
+    ),null,
+    1 + 1 != 2 :(
+        throw "异常"
+    ),null,
+    !(2 > 3) && !(3 > 2):(
+        throw "异常"
+    ),null,
+    2 > 3 :(
+        throw "异常"
+    ),null,
+    !(3 > 2) :(
+        throw "异常"
+    ),null,
+    y = 1 > 0,
+    !y && 1 > 0 :(
+        throw "异常"
+    ),null
+  `
+  const data = {
+    type: "1"
+  }
+  runExpression(expression, data)
+}
+
+/**
+ * throw
+ */
+function testThrow() {
+  const expression = `
+    data.type == 2 :(
+        throw "error",
+        log.debug(result)
+    ),null
+  `
+  const data = {
+    type: "1"
+  }
+  runExpression(expression, data)
+}
+
+/**
+ * JSONArray loop
+ */
+function testJSONArrayLoop() {
+  const expression = `
+    log.debug("test-JSONArray"),
+    datas = [1,2,3,4,5],
+    datas.each(
+        log.debug(\${row}\$)
+    ),
+    log.debug("test-Set"),
+    data.testSet.each(
+        log.debug(\${row}\$)
+    ),
+    log.debug("test-Array"),
+    data.testArray.each(
+        log.debug(\${row}\$)
+    )
+  `
+  const data = {
+    testSet: [1, 2, 3, 4, 5],
+    testArray: 'a|b|c'.split('\|')
+  }
+  runExpression(expression, data)
+}
+
+/**
+ * JSONObject loop
+ */
+function testJSONObjectLoop() {
+  const expression = `
+    log.debug("test-JSONObject"),
+    datas = {name: 1, age: 2},
+    datas.each(
+        log.debug(\${rowKey}：{row}$)
+    ),
+    log.debug("test-Map"),
+    data.testMap.each(
+        log.debug(\${rowKey}：{row}$)
+    )
+  `
+  const data = {
+    testMap: {
+      name: "xxx",
+      age: 18,
+      gender: "男"
+    }
+  }
+  runExpression(expression, data)
+}
+
+/**
+ * int loop
+ */
+function testIntLoop() {
+  const expression = `
+    a = 5,
+    a.each(
+        log.debug(row)
+    ),
+    (0,5).each(
+        log.debug(row)
+    ),
+    null
+  `
+  runExpression(expression)
+}
+
+/**
+ * continue and break
+ */
+function testContinueAndBreak() {
+  const expression = `
+    datas = [1,2,3,4,5,6,7],
+    datas.each(
+        row == 3 :(
+          continue
+        ),row == 5:(
+          break
+        ),
+        log.debug(row)
+    )
+  `
+  runExpression(expression)
+}
+
+/**
+ * comment
+ */
+function testComment () {
+  const expression = `
+    $//排序单表查询
+    select {items}
+    from {tablename}
+    where {condition}
+    order by {orderitem}
+  `
+  runExpression(expression)
+}
+
+/**
+ * return
+ */
+function testReturn () {
+  const expression = `
+    data.type == 1 :(
+        return "123",
+        log.debug(123)
+    ),(
+        return 2
+    ),
+    log.debug(123)
+  `
+  const data = {
+    type: 1
+  }
+  runExpression(expression, data)
+}
+
+/**
+ * lambda
+ */
+function testLambda () {
+  const expression = `
+    log.debug("进入外层逻辑，参数：{data}"),
+    age = 13,
+    // 声明一个lambda块
+    lambdaObj = (data) => {
+        index = 1,
+        log.debug("进入lambda了"),
+        log.debug("传入lambda块的参数：{data}"),
+        log.debug("外层的只读参数：{age}"),
+        return "执行lambda完成"
+    },
+    log.debug("age参数:{age}"),
+    result = lambdaObj.apply({
+        name: "江超"
+    }),
+    result = lambdaObj.apply({
+        name: "大神"
+    }),
+    log.debug("result:{result}"),
+    return {
+        func: lambdaObj
+    }
+  `
+  const data = {
+    type: 1
+  }
+  runExpression(expression, data)
+}
+
 function runExpression (expression: string, data?: any) {
   const program = new Program(expression)
   const d = program.parse()

package/src/expression/core/Delegate.ts

@@ -104,7 +104,9 @@ export default class Delegate {
       params = new JSONObject();
     }
     const map = this.objectNames;
-    this.lambdaOutProps.push(...map.keySet());
+    if (this.lambdaOutProps.length === 0) {
+      this.lambdaOutProps.push(...map.keySet());
+    }
     const lambdaMap = new JSONObject(map)
     lambdaMap.put("data", params);
     return this.invoke(lambdaMap);

package/src/expression/core/Expression.ts

@@ -479,7 +479,7 @@ export default class Expression {
       if (obj instanceof JSONObject) {
         const json: JSONObject = obj as JSONObject
         for (const key of json.keySet()) {
-          this.delegate?.put('rowIndex', key)
+          this.delegate?.put('rowKey', key)
           this.delegate?.put('row', json.get(key))
           try {
             body?.invoke()
@@ -490,7 +490,7 @@ export default class Expression {
         }
       } else {
         for (const key of obj) {
-          this.delegate?.put('rowIndex', key)
+          this.delegate?.put('rowKey', key)
           this.delegate?.put('row', obj[key])
           try {
             body?.invoke()
@@ -914,6 +914,9 @@ export default class Expression {
    * 判断异常类型是否匹配
    */
   private isEqual(exception: any, typeName: string): boolean {
+    if (typeName === 'Exception' || typeName === 'Error') {
+      return true;
+    }
     return exception && exception.constructor.name === typeName;
   }
 
@@ -987,7 +990,7 @@ export default class Expression {
           const right: Expression = this.children[1] as Expression;
           const l = left.invoke();
           const r = right.invoke();
-          if (!l || !r) {
+          if (l == null || r == null) {
             return false;
           }
           // 两个字符串比较

package/src/expression/core/Program.ts

@@ -798,7 +798,7 @@ export default class Program {
         .replace("\\$", "$")
         .replace("\\{", "{")
         .replace("\\}", "}")
-        .replace("\\\"", "\"")
+        .replace(/\\"/g, '"')
         .replace("\\\\", "\\"), sPos);
 
       if (hasKeyword && (value === '$' || value === '\"')) {

package/src/expression/exception/ExpressionException.ts

@@ -2,8 +2,8 @@
  * 表达式执行异常，将显示执行异常的位置信息
  */
 export default class ExpressionException extends Error {
-  constructor (source: string, pos: number, cause: Error) {
-    let message: string
+  constructor(source: string, pos: number, cause: Error) {
+    let message: string;
     let beforeErrorContent: string = source.substring(0, pos).trim();
     const length: number = beforeErrorContent.length;
     if (length > 1000) {
@@ -16,7 +16,13 @@ export default class ExpressionException extends Error {
     } else {
       message = beforeErrorContent.trim() + " <- " + afterErrorContent.substring(0, afterErrorContentIndex) + "\n后续省略......";
     }
-    super(message);
-    super.stack = cause.stack;
+
+    // 通过原生 Error 的 cause 参数传递原因
+    super(message, { cause });
+    this.name = this.constructor.name;
+
+    if (Error.captureStackTrace) {
+      Error.captureStackTrace(this, this.constructor);
+    }
   }
 }

package/src/expression/instances/JSONObject.ts

@@ -9,8 +9,9 @@ export default class JSONObject {
       map = JSON.parse(value);
     } else if (value && typeof value === "object" && !Array.isArray(value)) {
       map = {};
-      for (const key of Object.keys(value)) {
-        const item = value[key];
+      const keySet = value instanceof JSONObject ? value.keySet() : Object.keys(value);
+      for (const key of keySet) {
+        const item = value instanceof JSONObject ? value.get(key) : value[key];
         if (Array.isArray(item)) {
           map[key] = new JSONArray(item);
         } else if (JSONObject.isPlainObject(item)) {
@@ -27,6 +28,9 @@ export default class JSONObject {
 
   public static isPlainObject(value: any): boolean {
     if (!value || typeof value !== "object") return false;
+    if (value instanceof JSONObject || value instanceof JSONArray) {
+      return false
+    }
     const proto = Object.getPrototypeOf(value);
     return proto === Object.prototype || proto === null;
   }

package/src/font-style/font.css

@@ -1,4 +1,4 @@
-@font-face {
-  font-family: 'PingFangSC-Regular-woff2';
-  src: url('./PingFangSC-Regular.woff2') format('woff2');
-}
+@font-face {
+  font-family: 'PingFangSC-Regular-woff2';
+  src: url('./PingFangSC-Regular.woff2') format('woff2');
+}

package/src/layouts/CommonLayout.vue

@@ -1,56 +1,56 @@
-<template>
-  <div class="common-layout">
-    <div class="top"><a class="clearCacheBtn" @click="clearCache">清除缓存</a></div>
-    <div class="content"><slot></slot></div>
-    <page-footer :link-list="footerLinks" :copyright="copyright" :copyrightStyle="copyrightStyle"></page-footer>
-  </div>
-</template>
-
-<script>
-import PageFooter from '@vue2-client/layouts/footer/PageFooter'
-import { mapState } from 'vuex'
-import { indexedDB } from '@vue2-client/utils/indexedDB'
-
-export default {
-  name: 'CommonLayout',
-  components: { PageFooter },
-  computed: {
-    ...mapState('setting', ['footerLinks', 'copyright', 'copyrightStyle'])
-  },
-  methods: {
-    clearCache () {
-      indexedDB.clearCache()
-    }
-  }
-}
-</script>
-
-<style scoped lang="less">
-.common-layout{
-  display: flex;
-  flex-direction: column;
-  height: 100vh;
-  overflow: auto;
-  background-color: @layout-body-background;
-  background-image: url('https://gw.alipayobjects.com/zos/rmsportal/TVYTbAXWheQpRcWDaDMu.svg');
-  background-repeat: no-repeat;
-  background-position-x: center;
-  background-position-y: 110px;
-  background-size: 100%;
-  .top {
-    padding: 5px 10px;
-    text-align: right;
-    .clearCacheBtn {
-      color: #fff !important;
-    }
-  }
-  .content{
-    padding: 32px 0;
-    flex: 1;
-    @media (min-width: 768px){
-
-      padding: 112px 0 24px;
-    }
-  }
-}
-</style>
+<template>
+  <div class="common-layout">
+    <div class="top"><a class="clearCacheBtn" @click="clearCache">清除缓存</a></div>
+    <div class="content"><slot></slot></div>
+    <page-footer :link-list="footerLinks" :copyright="copyright" :copyrightStyle="copyrightStyle"></page-footer>
+  </div>
+</template>
+
+<script>
+import PageFooter from '@vue2-client/layouts/footer/PageFooter'
+import { mapState } from 'vuex'
+import { indexedDB } from '@vue2-client/utils/indexedDB'
+
+export default {
+  name: 'CommonLayout',
+  components: { PageFooter },
+  computed: {
+    ...mapState('setting', ['footerLinks', 'copyright', 'copyrightStyle'])
+  },
+  methods: {
+    clearCache () {
+      indexedDB.clearCache()
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+.common-layout{
+  display: flex;
+  flex-direction: column;
+  height: 100vh;
+  overflow: auto;
+  background-color: @layout-body-background;
+  background-image: url('https://gw.alipayobjects.com/zos/rmsportal/TVYTbAXWheQpRcWDaDMu.svg');
+  background-repeat: no-repeat;
+  background-position-x: center;
+  background-position-y: 110px;
+  background-size: 100%;
+  .top {
+    padding: 5px 10px;
+    text-align: right;
+    .clearCacheBtn {
+      color: #fff !important;
+    }
+  }
+  .content{
+    padding: 32px 0;
+    flex: 1;
+    @media (min-width: 768px){
+
+      padding: 112px 0 24px;
+    }
+  }
+}
+</style>