vue2-client 1.11.6 → 1.12.2

package/src/expression/core/Token.js

@@ -0,0 +1,27 @@
+export default class Token {
+  type
+  value
+  startPos
+
+  constructor (type, value, startPos) {
+    this.type = type
+    this.value = value
+    this.startPos = startPos
+  }
+
+  toString () {
+    return this.type.toString() + this.value
+  }
+
+  getType () {
+    return this.type
+  }
+
+  getValue () {
+    return this.value
+  }
+
+  getStartPos () {
+    return this.startPos
+  }
+}

package/src/expression/enums/ExpressionType.js

@@ -0,0 +1,81 @@
+const ExpressionType = {
+  // >
+  GreaterThan: 'GreaterThan',
+  // >=
+  GreaterThanOrEqual: 'GreaterThanOrEqual',
+  // <
+  LessThan: 'LessThan',
+  // <=
+  LessThanOrEqual: 'LessThanOrEqual',
+  //= =
+  Equal: 'Equal',
+  //! =
+  NotEqual: 'NotEqual',
+  // +
+  Add: 'Add',
+  // -
+  Subtract: 'Subtract',
+  //*
+  Multiply: 'Multiply',
+  // 除法
+  Divide: 'Divide',
+  // 求余
+  Modulo: 'Modulo',
+
+  // 字符串连接
+  Concat: 'Concat',
+  // 逻辑非
+  Not: 'Not',
+  // 逻辑与
+  And: 'And',
+  // 逻辑或
+  Or: 'Or',
+
+  // 常数
+  Constant: 'Constant',
+  // 标识符
+  Identity: 'Identity',
+
+  // 获取对象属性
+  Property: 'Property',
+
+  // 产生Json对象
+  Json: 'Json',
+  // 产生Json数组
+  Array: 'Array',
+  // Json对象属性值对
+  Attr: 'Attr',
+  // 数组下标，[0]
+  ArrayIndex: 'ArrayIndex',
+  // 函数调用
+  Call: 'Call',
+  // for循环
+  For: 'For',
+  // 逗号表达式
+  Comma: 'Comma',
+  // 赋值语句
+  Assign: 'Assign:',
+  // 条件语句
+  Condition: 'Condition',
+  // 参数
+  Param: 'Param',
+  // Try
+  Try: 'Try',
+  // Catch
+  Catch: 'Catch',
+  // 跳出
+  Return: 'Return',
+  // 抛出异常
+  Throw: 'Throw',
+  // 校验
+  Validate: 'Validate',
+  // 断言
+  Assert: 'Assert',
+  // 循环终止
+  Break: 'Break',
+  // 循环跳过
+  Continue: 'Continue',
+  // lambda
+  Lambda: 'Lambda'
+}
+export default ExpressionType

package/src/expression/enums/TokenType.js

@@ -0,0 +1,11 @@
+const TokenType = {
+  Int: 'Int',
+  Double: 'Double',
+  Bool: 'Bool',
+  String: 'String',
+  Identy: 'Identity',
+  Oper: 'Oper',
+  End: 'End',
+  Null: 'Null'
+}
+export default TokenType

package/src/expression/exception/ExpressionException.js

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

package/src/expression/exception/ReturnWayException.js

@@ -0,0 +1,14 @@
+/**
+ * Return 方法
+ */
+export default class ReturnWayException extends Error {
+  returnObject
+  constructor (returnValue) {
+    super()
+    this.returnObject = returnValue
+  }
+
+  getReturnObject () {
+    return this.returnObject
+  }
+}

package/src/expression/exception/ServiceException.js

@@ -0,0 +1,22 @@
+export default class ServiceException extends Error {
+  message
+  code
+  constructor (message, code) {
+    super()
+    this.message = message
+    this.code = code
+  }
+
+  getMessage () {
+    return this.message
+  }
+
+  setMessage (message) {
+    this.message = message
+    return this
+  }
+
+  getCode () {
+    return this.code
+  }
+}

package/src/expression/instances/LogicConsole.js

@@ -0,0 +1,44 @@
+// 自定义 Console 类
+import Expression from '../core/Expression'
+
+export default class LogicConsole {
+  constructor () {
+    if (LogicConsole.instance) {
+      return LogicConsole.instance
+    }
+    LogicConsole.instance = this
+  }
+
+  static getInstance () {
+    if (!LogicConsole.instance) {
+      LogicConsole.instance = new LogicConsole()
+    }
+    return LogicConsole.instance
+  }
+
+  debug (...args) {
+    const newArgs = this.convert(args)
+    console.debug(...newArgs)
+  }
+
+  info (...args) {
+    const newArgs = this.convert(args)
+    console.info(...newArgs)
+  }
+
+  warn (...args) {
+    const newArgs = this.convert(args)
+    console.warn(...newArgs)
+  }
+
+  error (...args) {
+    const newArgs = this.convert(args)
+    console.error(...newArgs)
+  }
+
+  convert (args) {
+    return args.map(obj => {
+      return Expression.toJSONString(obj)
+    })
+  }
+}

package/src/expression/{core → ts/core}/Expression.ts

@@ -1245,7 +1245,11 @@ export default class Expression {
 
     // 调用方法并处理返回值
     const oCall = method.apply(obj, params);
-    return this.convert(oCall);
+    if (oCall instanceof Promise) {
+      return oCall.then(result => this.convert(result));
+    } else {
+      return this.convert(oCall);
+    }
   }
 
   /**
@@ -1260,8 +1264,18 @@ export default class Expression {
 
     // 递归获取原型链上的所有方法
     while (proto !== null) {
-      methods = methods.concat(Object.getOwnPropertyNames(proto).filter(prop => typeof proto[prop] === 'function'));
-      proto = Object.getPrototypeOf(proto);
+      methods = methods.concat(
+        Object.getOwnPropertyNames(proto)
+          .filter(prop => !['caller', 'callee', 'arguments'].includes(prop)) // 先排除
+          .filter(prop => {
+            try {
+              return typeof proto[prop] === 'function' // 再判断是否为函数
+            } catch (e) {
+              return false // 避免 TypeError
+            }
+          })
+      )
+      proto = Object.getPrototypeOf(proto)
     }
 
     // 去重

package/src/expression/ts/exception/BreakWayException.ts

@@ -0,0 +1,2 @@
+export default class BreakWayException extends Error {
+}

package/src/expression/ts/exception/ContinueWayException.ts

@@ -0,0 +1,2 @@
+export default class ContinueWayException extends Error {
+}

package/src/layouts/BlankView.vue

@@ -1,6 +1,6 @@
 <template>
   <page-toggle-transition :disabled="animate.disabled" :animate="animate.name" :direction="animate.direction">
-    <a-keep-alive :exclude-keys="excludeKeys" v-if="cachePage" v-model="clearCaches">
+    <a-keep-alive :exclude-keys="excludeKeys" v-if="cachePage && isMicroAppEnv" v-model="clearCaches">
       <router-view v-if="!refreshing" :key="$route.path" />
     </a-keep-alive>
     <router-view v-else-if="!refreshing" />
@@ -19,7 +19,8 @@ export default {
     return {
       clearCaches: [],
       excludeKeys: [],
-      refreshing: false
+      refreshing: false,
+      isMicroAppEnv: false
     }
   },
   computed: {
@@ -30,6 +31,7 @@ export default {
   },
   mounted () {
     if (window.__MICRO_APP_ENVIRONMENT__) {
+      this.isMicroAppEnv = true
       window.microApp.addDataListener((data) => {
         if (data.type === 'refresh') {
           this.refresh()

package/src/logic/LogicRunner.js

@@ -0,0 +1,62 @@
+import ServiceException from '../expression/exception/ServiceException'
+import LogicConsole from '../expression/instances/LogicConsole'
+import ExpressionRunner from '../expression/ExpressionRunner'
+import { getConfigByNameAsync } from '@vue2-client/services/api/common'
+import * as Plugins from './plugins/index'
+import Expression from '../expression/core/Expression'
+
+export default class LogicRunner {
+  static logicConsoleInstance = new LogicConsole()
+
+  /**
+   * 是否存在指定名称的Logic资源
+   *
+   * @param logicName Logic名称
+   * @return 是否存在
+   */
+  static async has (logicName) {
+    return await LogicRunner.getLogic(logicName, false, (result) => {
+      return result != null
+    })
+  }
+
+  /**
+   * 执行Logic
+   *
+   * @param logicName      Logic名称
+   * @param param          参数
+   * @return 执行结果
+   */
+  static async run (logicName, param) {
+    // 获取Logic资源
+    const result = await LogicRunner.getLogic(logicName, false)
+    if (!result || !result.source) {
+      throw new ServiceException('Logic资源' + logicName + '未找到', 400)
+    }
+    const paramStr = Expression.toJSONString(param)
+    LogicRunner.logicConsoleInstance.info(`执行Logic[${logicName}]，params: ${paramStr}`)
+    // 附加用户注册的对象到业务逻辑中
+    const plugins = {}
+    plugins.data = param
+    plugins.log = LogicRunner.logicConsoleInstance
+    plugins.ENV = result.$globalProp
+    plugins.logic = this
+    Object.assign(plugins, Plugins.default)
+    return LogicRunner.runExpression(result.source, plugins)
+  }
+
+  /**
+   * 执行原生表达式
+   *
+   * @param source 表达式内容
+   * @param params 参数
+   * @return 执行结果
+   */
+  static async runExpression (source, params) {
+    return await ExpressionRunner.run(source, params)
+  }
+
+  static async getLogic (logicName, isDev) {
+    return await getConfigByNameAsync(logicName, undefined, isDev)
+  }
+}

package/src/logic/TestLogic.js

@@ -0,0 +1,13 @@
+import LogicRunner from './LogicRunner'
+
+testLogicCall()
+
+/**
+ * testLogicCall
+ */
+function testLogicCall () {
+  const result = LogicRunner.run('testVueLogic', {
+    test: '1'
+  })
+  console.info(result)
+}

package/src/logic/plugins/common/DateTools.js

@@ -0,0 +1,32 @@
+export default class DateTools {
+  static instance = new DateTools()
+
+  constructor () {
+    if (DateTools.instance) {
+      return DateTools.instance
+    }
+    DateTools.instance = this
+  }
+
+  static getInstance () {
+    if (!DateTools.instance) {
+      DateTools.instance = new DateTools()
+    }
+    return DateTools.instance
+  }
+
+  /**
+   * 获取当前时间
+   * @returns {string} yyyy-MM-dd HH:mm:ss
+   */
+  getNow2 () {
+    const now = new Date()
+    const year = now.getFullYear()
+    const month = String(now.getMonth() + 1).padStart(2, '0') // 月份从 0 开始，所以要 +1
+    const day = String(now.getDate()).padStart(2, '0')
+    const hours = String(now.getHours()).padStart(2, '0')
+    const minutes = String(now.getMinutes()).padStart(2, '0')
+    const seconds = String(now.getSeconds()).padStart(2, '0')
+    return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`
+  }
+}

package/src/logic/plugins/index.js

@@ -0,0 +1,5 @@
+import DateTools from '@vue2-client/logic/plugins/common/DateTools'
+
+export default {
+  dateTools: DateTools.getInstance()
+}

package/src/logic/ts/LogicRunner.ts

@@ -0,0 +1,67 @@
+import JSONObject from "../../expression/instances/JSONObject";
+import ServiceException from "../../expression/exception/ServiceException";
+import LogicConsole from "../../expression/instances/LogicConsole";
+import ExpressionRunner from "../../expression/ExpressionRunner";
+import { indexedDB } from '../../utils/indexedDB'
+
+export default class LogicRunner {
+
+  private static logicConsoleInstance: LogicConsole = new LogicConsole();
+
+  /**
+   * 是否存在指定名称的Logic资源
+   *
+   * @param logicName Logic名称
+   * @return 是否存在
+   */
+  public static has(logicName: string): boolean {
+    return LogicRunner.getLogic(logicName, false, (result: any) => {
+      return result != null;
+    });
+  }
+
+  /**
+   * 执行Logic
+   *
+   * @param logicName      Logic名称
+   * @param param          参数
+   * @return 执行结果
+   */
+  public static run(logicName: string, param: JSONObject | Object) : any {
+    // 获取Logic资源
+    const source = LogicRunner.getLogic(logicName, false, (result: any) => {
+      return result;
+    });
+    if (source == null) {
+      throw new ServiceException("Logic资源" + logicName + "未找到", 400)
+    }
+    LogicRunner.logicConsoleInstance.info("执行Logic[{}]，params: {}", logicName, param)
+    // 附加用户注册的对象到业务逻辑中
+    const plugins = new JSONObject();
+    plugins.put("data", param);
+    plugins.put("log", LogicRunner.logicConsoleInstance);
+    plugins.put("logic", LogicRunner.prototype);
+    return LogicRunner.runExpression(source, plugins);
+  }
+
+  /**
+   * 执行原生表达式
+   *
+   * @param source 表达式内容
+   * @param params 参数
+   * @return 执行结果
+   */
+  private static runExpression(source: string, params: JSONObject) : any {
+    return ExpressionRunner.run(source, params)
+  }
+
+  private static getLogic(logicName: string, isDev: boolean, callback: Function) : any {
+    let apiPre = '/api/'
+    if (isDev) {
+      apiPre = '/devApi/'
+    }
+    const serviceName = process.env.VUE_APP_SYSTEM_NAME
+    const getConfigUrl = apiPre + serviceName + '/logic/openapi/getLiuliConfiguration'
+    indexedDB.getByWeb(logicName, getConfigUrl, {configName: logicName}, callback)
+  }
+}

package/src/logic/ts/TestLogic.ts

@@ -0,0 +1,13 @@
+import LogicRunner from './LogicRunner'
+
+testLogicCall()
+
+/**
+ * testLogicCall
+ */
+function testLogicCall () {
+  const result = LogicRunner.run('testVueLogic', {
+    test: '1'
+  })
+  console.info(result)
+}

package/src/pages/LogicCallExample/index.vue

@@ -0,0 +1,36 @@
+<script setup>
+
+import LogicRunner from '@vue2-client/logic/LogicRunner'
+import { getCurrentInstance, ref } from 'vue'
+
+const { proxy } = getCurrentInstance()
+
+const metaData = ref({
+  test: {},
+  test2: [],
+  inputValue: '',
+  displayValue: 'default'
+})
+
+async function testLogic () {
+  const result = await LogicRunner.run('testVueLogic', {
+    metaData: metaData,
+    proxy: proxy
+  })
+  console.warn(metaData)
+  console.info('pageTest:' + result)
+}
+</script>
+
+<template>
+  <div>
+    录入值：<a-input v-model="metaData.inputValue" />
+    显示值：<span ref="displaySpan">{{ metaData.displayValue }}</span>
+    <br/>
+    <a-button @click="testLogic">修改</a-button>
+  </div>
+</template>
+
+<style scoped lang="less">
+
+</style>

package/src/router/async/router.map.js

@@ -68,6 +68,7 @@ routerResource.example = {
   // component: () => import('@vue2-client/base-client/components/common/XPrint/Demo.vue'),
   // component: () => import('@vue2-client/base-client/components/AI/demo.vue'),
   // component: () => import('@vue2-client/components/g2Charts/demo.vue'),
+  // component: () => import('@vue2-client/pages/LogicCallExample/index.vue'),
 }
 // routerResource.example = () =>
 //    import('@vue2-client/pages/Example')

package/src/services/apiService.js

@@ -11,5 +11,6 @@ module.exports = {
   ROUTES: `/rs/user/userLogin`,
   SEARCH: `/rs/search`,
   GOODS: `/goods`,
-  GOODS_COLUMNS: `/columns`
+  GOODS_COLUMNS: `/columns`,
+  V4_GET_INFO: '/api/af-system/user/info'
 }