vue2-client 1.11.6 → 1.12.2

package/src/base-client/components/common/XDescriptions/demo.vue

@@ -1,51 +1,51 @@
-<script>
-import XDescriptionsGroup from '@vue2-client/base-client/components/common/XDescriptions/XDescriptionsGroup.vue'
-
-export default {
-  name: 'Demo',
-  components: { XDescriptionsGroup },
-  data () {
-    return {
-      visible: false,
-      userinfo: {
-        f_userinfo_code: '143400000003',
-        f_gasbrand: '测试表品牌',
-        f_address: '11'
-      }
-    }
-  },
-  methods: {
-    open () {
-      // runLogic('querySingleUserDetail', {
-      //   f_userinfo_code: '143400000003'
-      // }, 'af-revenue').then(res => {
-      //   this.userinfo = res
-      //   this.visible = true
-      // })
-       this.visible = true
-    }
-  }
-}
-</script>
-
-<template>
-  <div>
-    <a-button @click="open">
-      展开详情
-    </a-button>
-    <a-drawer
-      title="描述列表详情"
-      placement="right"
-      width="65vw"
-      :body-style="{height:'92%'}"
-      :visible="visible"
-      @close="()=>{visible = false}"
-    >
-      <x-descriptions-group config-name="测试Config" :showLeftTab="true" :data="userinfo" service-name="af-system"/>
-    </a-drawer>
-  </div>
-</template>
-
-<style scoped lang="less">
-
-</style>
+<script>
+import XDescriptionsGroup from '@vue2-client/base-client/components/common/XDescriptions/XDescriptionsGroup.vue'
+
+export default {
+  name: 'Demo',
+  components: { XDescriptionsGroup },
+  data () {
+    return {
+      visible: false,
+      userinfo: {
+        f_userinfo_code: '143400000003',
+        f_gasbrand: '测试表品牌',
+        f_address: '11'
+      }
+    }
+  },
+  methods: {
+    open () {
+      // runLogic('querySingleUserDetail', {
+      //   f_userinfo_code: '143400000003'
+      // }, 'af-revenue').then(res => {
+      //   this.userinfo = res
+      //   this.visible = true
+      // })
+       this.visible = true
+    }
+  }
+}
+</script>
+
+<template>
+  <div>
+    <a-button @click="open">
+      展开详情
+    </a-button>
+    <a-drawer
+      title="描述列表详情"
+      placement="right"
+      width="65vw"
+      :body-style="{height:'92%'}"
+      :visible="visible"
+      @close="()=>{visible = false}"
+    >
+      <x-descriptions-group config-name="测试Config" :showLeftTab="true" :data="userinfo" service-name="af-system"/>
+    </a-drawer>
+  </div>
+</template>
+
+<style scoped lang="less">
+
+</style>

package/src/base-client/components/common/XFormGroup/demo.vue

@@ -1,39 +1,39 @@
-<script>
-import XFormGroup from '@vue2-client/base-client/components/common/XFormGroup/XFormGroup.vue'
-import { getConfigByNameAsync } from '@vue2-client/services/api/common'
-
-export default {
-  name: 'Demo',
-  components: { XFormGroup },
-  data () {
-    return {
-      visible: true
-    }
-  },
-  created () {
-    getConfigByNameAsync('testFormGroup', 'af-revenue').then(res => {
-      this.$refs.xFormGroupDemo.init({
-        ...res,
-        serviceName: 'af-revenue',
-        showLeftTab: true,
-      })
-    })
-  },
-  methods: {
-    submitForm () {
-      this.$refs.xFormGroupDemo.onSubmit().then(res => {
-        console.log('所有表单的结果', res)
-      })
-    }
-  }
-}
-</script>
-
-<template>
-
-  <x-form-group ref="xFormGroupDemo"></x-form-group>
-</template>
-
-<style scoped lang="less">
-
-</style>
+<script>
+import XFormGroup from '@vue2-client/base-client/components/common/XFormGroup/XFormGroup.vue'
+import { getConfigByNameAsync } from '@vue2-client/services/api/common'
+
+export default {
+  name: 'Demo',
+  components: { XFormGroup },
+  data () {
+    return {
+      visible: true
+    }
+  },
+  created () {
+    getConfigByNameAsync('testFormGroup', 'af-revenue').then(res => {
+      this.$refs.xFormGroupDemo.init({
+        ...res,
+        serviceName: 'af-revenue',
+        showLeftTab: true,
+      })
+    })
+  },
+  methods: {
+    submitForm () {
+      this.$refs.xFormGroupDemo.onSubmit().then(res => {
+        console.log('所有表单的结果', res)
+      })
+    }
+  }
+}
+</script>
+
+<template>
+
+  <x-form-group ref="xFormGroupDemo"></x-form-group>
+</template>
+
+<style scoped lang="less">
+
+</style>

package/src/expression/ExpressionRunner.js

@@ -0,0 +1,26 @@
+import Program from './core/Program'
+
+export default class ExpressionRunner {
+  /**
+   * Runs an expression with parameters
+   *
+   * @param source Expression source
+   * @param params Expression parameters
+   * @returns The result of the expression
+   */
+  static async run (source, params) {
+    const delegate = this.getDelegate(source)
+    return await delegate.invoke(params)
+  }
+
+  /**
+   * Gets the delegate for the expression
+   *
+   * @param source Expression source
+   * @returns A delegate to invoke
+   */
+  static getDelegate (source) {
+    // Parse the source and return a delegate
+    return new Program(source).parse()
+  }
+}

package/src/expression/TestExpression.js

@@ -0,0 +1,509 @@
+import Program from './core/Program'
+import LogicConsole from './instances/LogicConsole'
+
+const logicConsole = LogicConsole.getInstance()
+
+runTest()
+
+async function runTest () {
+  logicConsole.debug('1.========testValidate========')
+  await testValidate()
+  logicConsole.debug('2.========testAssert========')
+  await testAssert()
+  logicConsole.debug('3.========testTry========')
+  await testTry()
+  logicConsole.debug('4.========testPropertyType========')
+  await testPropertyType()
+  logicConsole.debug('5.========testJSONArrayIndex========')
+  await testJSONArrayIndex()
+  logicConsole.debug('6.========testArrayIndex========')
+  await testArrayIndex()
+  logicConsole.debug('7.========testCompare========')
+  await testCompare()
+  logicConsole.debug('8.========testJSONObject========')
+  await testJSONObject()
+  logicConsole.debug('9.========testJSONArray========')
+  await testJSONArray()
+  logicConsole.debug('10.========testFunctionCall========')
+  await testFunctionCall()
+  logicConsole.debug('11.========testMath========')
+  await testMath()
+  logicConsole.debug('12.========testString========')
+  await testString()
+  logicConsole.debug('13.========testCondition========')
+  await testCondition()
+  logicConsole.debug('14.========testThrow========')
+  await testThrow()
+  logicConsole.debug('15.========testJSONArrayLoop========')
+  await testJSONArrayLoop()
+  logicConsole.debug('16.========testJSONObjectLoop========')
+  await testJSONObjectLoop()
+  logicConsole.debug('17.========testIntLoop========')
+  await testIntLoop()
+  logicConsole.debug('18.========testContinueAndBreak========')
+  await testContinueAndBreak()
+  logicConsole.debug('19.========testComment========')
+  await testComment()
+  logicConsole.debug('20.========testReturn========')
+  await testReturn()
+  logicConsole.debug('21.========testLambda========')
+  await testLambda()
+}
+
+/**
+ * validate
+ */
+async function testValidate () {
+  const expression = `
+    validate {
+        model: {
+            required: true,
+        },
+        visible: {
+            default: 1 + 1,
+        },
+        isAep: {
+            default: 3
+        },
+        testJson: {
+            required: true,
+            items: {
+                userid: {
+                    required: true
+                }
+            }
+        },
+        testGroup: {
+            mode: "atLeastOne",
+            fields: [
+                "test1",
+                "test2"
+            ]
+        }
+    },
+    data.isAep == 3 :(
+        log.info(123)
+    ),null,
+    log.info(data)
+  `
+  const data = {
+    model: 'a',
+    test1: 'b',
+    isAep: null,
+    testJson: {
+      userid: {}
+    }
+  }
+  await runExpression(expression, data)
+}
+
+/**
+ * assert
+ */
+async function testAssert () {
+  const expression = `
+    c = 1,
+    assert c == 1,
+    log.debug("ok"),
+    a = 1 + c,
+    assert a == 2,
+    log.debug("ok2")`
+  await runExpression(expression)
+}
+
+/**
+ * try
+ */
+async 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)
+  `
+  await runExpression(expression)
+}
+
+/**
+ * property
+ */
+async 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('\|')
+  }
+  await runExpression(expression, data)
+}
+
+/**
+ * JSONArray index
+ */
+async function testJSONArrayIndex () {
+  const expression = `
+    a = [1,2,3,4,5],
+    return a[4]
+  `
+  await runExpression(expression)
+}
+
+/**
+ * array index
+ */
+async function testArrayIndex () {
+  const expression = `
+    return data.a[4]
+  `
+  const data = {
+    a: [1, 2, 3, 4, 5]
+  }
+  await runExpression(expression, data)
+}
+
+async 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
+  `
+  await runExpression(expression)
+}
+
+/**
+ * JSONObject
+ */
+async function testJSONObject () {
+  const expression = `
+    datas = {
+        name: "张三",
+        年龄: 15,
+    },
+    datas
+  `
+  await runExpression(expression)
+}
+
+/**
+ * JSONArray
+ */
+async function testJSONArray () {
+  const expression = `
+    datas = ["a","b","c"],
+    datas
+  `
+  await runExpression(expression)
+}
+
+/**
+ * function call
+ */
+async function testFunctionCall () {
+  const expression = `
+    log.debug("test is ok")
+  `
+  await runExpression(expression)
+}
+
+/**
+ * math
+ */
+async function testMath () {
+  const expression = `
+    a = 1,
+    b = 2,
+    c = a + b,
+    c = c - 1,
+    d = 5 * 8,
+    e = d / 10,
+    e = e % 2,
+    c
+  `
+  await runExpression(expression)
+}
+
+/**
+ * string
+ */
+async 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)
+  `
+  await runExpression(expression)
+}
+
+/**
+ * condition
+ */
+async 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'
+  }
+  await runExpression(expression, data)
+}
+
+/**
+ * throw
+ */
+async function testThrow () {
+  const expression = `
+    data.type == 2 :(
+        throw "error",
+        log.debug(result)
+    ),null
+  `
+  const data = {
+    type: '1'
+  }
+  await runExpression(expression, data)
+}
+
+/**
+ * JSONArray loop
+ */
+async 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('\|')
+  }
+  await runExpression(expression, data)
+}
+
+/**
+ * JSONObject loop
+ */
+async 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: '男'
+    }
+  }
+  await runExpression(expression, data)
+}
+
+/**
+ * int loop
+ */
+async function testIntLoop () {
+  const expression = `
+    a = 5,
+    a.each(
+        log.debug(row)
+    ),
+    (0,5).each(
+        log.debug(row)
+    ),
+    null
+  `
+  await runExpression(expression)
+}
+
+/**
+ * continue and break
+ */
+async function testContinueAndBreak () {
+  const expression = `
+    datas = [1,2,3,4,5,6,7],
+    datas.each(
+        row == 3 :(
+          continue
+        ),row == 5:(
+          break
+        ),
+        log.debug(row)
+    )
+  `
+  await runExpression(expression)
+}
+
+/**
+ * comment
+ */
+async function testComment () {
+  const expression = `
+    $//排序单表查询
+    select {items}
+    from {tablename}
+    where {condition}
+    order by {orderitem}
+  `
+  await runExpression(expression)
+}
+
+/**
+ * return
+ */
+async function testReturn () {
+  const expression = `
+    data.type == 1 :(
+        return "123",
+        log.debug(123)
+    ),(
+        return 2
+    ),
+    log.debug(123)
+  `
+  const data = {
+    type: 1
+  }
+  await runExpression(expression, data)
+}
+
+/**
+ * lambda
+ */
+async 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
+  }
+  await runExpression(expression, data)
+}
+
+async function runExpression (expression, data) {
+  const program = new Program(expression)
+  const d = program.parse()
+  const params = {}
+  if (data == null) {
+    data = {}
+  }
+  params.data = data
+  params.log = new LogicConsole()
+  params.b = 5
+  const result = await d.invoke(params)
+  console.log(result)
+  return result
+}