vue2-client 1.11.4 → 1.11.6-alpha

package/src/expression/ts/core/Token.ts

@@ -0,0 +1,29 @@
+import TokenType from '../enums/TokenType'
+
+export default class Token {
+  private type: TokenType;
+  private value: any;
+  private startPos: number;
+
+  constructor(type: TokenType, value: any, startPos: number) {
+    this.type = type;
+    this.value = value;
+    this.startPos = startPos;
+  }
+
+  public toString() : string {
+    return this.type.toString() + this.value;
+  }
+
+  public getType() : TokenType {
+    return this.type;
+  }
+
+  public getValue() : any {
+    return this.value;
+  }
+
+  public getStartPos() : number {
+    return this.startPos;
+  }
+}

package/src/expression/ts/enums/ExpressionType.ts

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

package/src/expression/ts/enums/TokenType.ts

@@ -0,0 +1,13 @@
+import ExpressionType from "@/expression/enums/ExpressionType";
+
+enum TokenType {
+  Int = 'Int',
+  Double = 'Double',
+  Bool = 'Bool',
+  String = 'String',
+  Identy = 'Identity',
+  Oper = 'Oper',
+  End = 'End',
+  Null = 'Null'
+}
+export default TokenType

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/expression/ts/exception/ExpressionException.ts

@@ -0,0 +1,28 @@
+/**
+ * 表达式执行异常，将显示执行异常的位置信息
+ */
+export default class ExpressionException extends Error {
+  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) {
+      beforeErrorContent = "以上省略......\n" + beforeErrorContent.substring(length - 1000);
+    }
+    const afterErrorContent: string = source.substring(pos);
+    const afterErrorContentIndex: number = 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/ts/exception/ReturnWayException.ts

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

package/src/expression/ts/exception/ServiceException.ts

@@ -0,0 +1,22 @@
+export default class ServiceException extends Error {
+  message: string;
+  code: number | undefined;
+  constructor (message: string, code?: number) {
+    super()
+    this.message = message;
+    this.code = code;
+  }
+
+  public getMessage() : string {
+    return this.message;
+  }
+
+  public setMessage(message: string) : ServiceException {
+    this.message = message;
+    return this
+  }
+
+  public getCode() : number | undefined {
+    return this.code;
+  }
+}

package/src/expression/ts/instances/JSONArray.ts

@@ -0,0 +1,48 @@
+import JSONObject from "../instances/JSONObject";
+
+export default class JSONArray {
+  innerList: Array<any>;
+
+  constructor(value?: any) {
+    if (value && typeof value === "string") {
+      this.innerList = JSON.parse(value).map((item: any) => this.wrapValue(item));
+    } else if (value && Array.isArray(value)) {
+      this.innerList = value.map((item: any) => this.wrapValue(item));
+    } else {
+      this.innerList = new Array<any>();
+    }
+  }
+
+  private wrapValue(value: any): any {
+    if (Array.isArray(value)) {
+      return new JSONArray(value);
+    } else if (value && JSONObject.isPlainObject(value)) {
+      return new JSONObject(value);
+    }
+    return value;
+  }
+
+  public length(): number {
+    return this.innerList.length;
+  }
+
+  public put(item: any) {
+    this.innerList.push(this.wrapValue(item));
+  }
+
+  public get(index: number): any {
+    return this.innerList[index];
+  }
+
+  public toString(): string {
+    const replacer = (key: string, value: any): any => {
+      if (value instanceof JSONObject) {
+        return value.innerMap;
+      } else if (value instanceof JSONArray) {
+        return value.innerList;
+      }
+      return value;
+    };
+    return JSON.stringify(this.innerList, replacer);
+  }
+}

package/src/expression/ts/instances/JSONObject.ts

@@ -0,0 +1,109 @@
+import JSONArray from "../instances/JSONArray";
+
+export default class JSONObject {
+  innerMap: { [key: string]: any };
+
+  constructor(value?: any) {
+    let map: { [key: string]: any };
+    if (value && typeof value === "string") {
+      map = JSON.parse(value);
+    } else if (value && typeof value === "object" && !Array.isArray(value)) {
+      map = {};
+      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)) {
+          map[key] = new JSONObject(item);
+        } else {
+          map[key] = item;
+        }
+      }
+    } else {
+      map = {};
+    }
+    this.innerMap = map;
+  }
+
+  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;
+  }
+
+  public put(key: string, value: any) {
+    if (Array.isArray(value)) {
+      this.innerMap[key] = new JSONArray(value);
+    } else if (JSONObject.isPlainObject(value)) {
+      this.innerMap[key] = new JSONObject(value);
+    } else {
+      this.innerMap[key] = value;
+    }
+  }
+
+  public get(key: string): any {
+    return this.innerMap[key];
+  }
+
+  public opt(key: string): any {
+    return key == null ? null : this.innerMap[key];
+  }
+
+  public optString(key: string, defaultValue: string): string {
+    const result = this.opt(key);
+    return result ? result : defaultValue;
+  }
+
+  public getBoolean(key: string): boolean {
+    const object = this.get(key);
+    if (typeof object === "boolean") {
+      return object as boolean;
+    } else {
+      return Boolean(object);
+    }
+  }
+
+  public optBoolean(key: string, defaultValue: boolean): boolean {
+    const val = this.opt(key);
+    if (!val) {
+      return defaultValue;
+    }
+    return this.getBoolean(key);
+  }
+
+  public getInt(key: string): number {
+    return this.innerMap[key] as number;
+  }
+
+  public getJSONObject(key: string): JSONObject {
+    return this.innerMap[key] as JSONObject;
+  }
+
+  public getJSONArray(key: string): JSONArray {
+    return this.innerMap[key] as JSONArray;
+  }
+
+  public has(key: string): boolean {
+    return this.innerMap.hasOwnProperty(key);
+  }
+
+  public keySet(): string[] {
+    return Object.keys(this.innerMap);
+  }
+
+  public toString(): string {
+    const replacer = (key: string, value: any): any => {
+      if (value instanceof JSONObject) {
+        return value.innerMap;
+      } else if (value instanceof JSONArray) {
+        return value.innerList;
+      }
+      return value;
+    };
+    return JSON.stringify(this.innerMap, replacer);
+  }
+}

package/src/expression/ts/instances/LogicConsole.ts

@@ -0,0 +1,32 @@
+// 自定义 Console 类
+export default class LogicConsole {
+
+  public debug(...args: any[]): void {
+    const newArgs = this.convert(args);
+    console.debug(...newArgs);
+  }
+
+  public info(...args: any[]): void {
+    const newArgs = this.convert(args);
+    console.info(...newArgs);
+  }
+
+  public warn(...args: any[]): void {
+    const newArgs = this.convert(args);
+    console.warn(...newArgs);
+  }
+
+  public error(...args: any[]): void {
+    const newArgs = this.convert(args);
+    console.error(...newArgs);
+  }
+
+  private convert(args: any[]): any[] {
+    return args.map(arg => {
+      if (typeof arg === 'object' && arg !== null && typeof arg.toString === 'function') {
+        return arg.toString();
+      }
+      return arg;
+    })
+  }
+}

package/src/logic/LogicRunner.js

@@ -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 { getConfigByNameAsync } from '@vue2-client/services/api/common'
+import * as Plugins from './plugins/index'
+
+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)
+    }
+    let paramStr
+    if (param instanceof JSONObject) {
+      paramStr = param.toString()
+    } else {
+      paramStr = JSON.stringify(param)
+    }
+    LogicRunner.logicConsoleInstance.info(`执行Logic[${logicName}]，params: ${paramStr}`)
+    // 附加用户注册的对象到业务逻辑中
+    const plugins = new JSONObject()
+    plugins.put('data', param)
+    plugins.put('log', LogicRunner.logicConsoleInstance)
+    plugins.put('ENV', result.$globalProp)
+    plugins.put('logic', this)
+    plugins.putAll(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,30 @@
+<script setup>
+
+import LogicRunner from '@vue2-client/logic/LogicRunner'
+import { ref } from 'vue'
+
+const metaData = ref({
+  inputValue: '',
+  displayValue: 'default'
+})
+
+async function testLogic () {
+  const result = await LogicRunner.run('testVueLogic', {
+    metaData: 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

@@ -52,10 +52,11 @@ routerResource.newDynamicStatistics = () => import('@vue2-client/pages/NewDynami
 routerResource.example = {
   path: 'example',
   name: '示例主页面',
+  // component: () => import('@vue2-client/base-client/components/common/XDescriptions/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/XFormGroup/demo.vue'),
+  component: () => import('@vue2-client/base-client/components/common/XFormGroup/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XReport/XReportDemo.vue'),
-  component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XDatePicker/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XTab/XTabDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),
@@ -67,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/user.js

@@ -9,6 +9,7 @@ import {
 import { request, METHOD, removeAuthorization } from '@vue2-client/utils/request'
 import EncryptUtil from '@vue2-client/utils/EncryptUtil'
 import axios from 'axios'
+import { V4_SESSION_KEY } from '@/store/mutation-types'
 
 /**
  * 登录服务
@@ -78,6 +79,7 @@ export function logout () {
       localStorage.removeItem(process.env.VUE_APP_ROUTES_KEY)
       localStorage.removeItem(process.env.VUE_APP_PERMISSIONS_KEY)
       localStorage.removeItem(process.env.VUE_APP_ROLES_KEY)
+      localStorage.removeItem(V4_SESSION_KEY)
       removeAuthorization()
     })
   })

package/src/store/mutation-types.js

@@ -1,3 +1,4 @@
 export const ACCESS_TOKEN = 'Access-Token'
 export const V4_ACCESS_TOKEN = 'Authorization'
 export const SYSTEM_VERSION = 'systemVersion'
+export const V4_SESSION_KEY = 'v4-session-key'