vue2-client 1.11.3 → 1.11.5

package/src/expression/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/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/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/exception/BreakWayException.ts

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

package/src/expression/exception/ContinueWayException.ts

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

package/src/expression/exception/ExpressionException.ts

@@ -0,0 +1,22 @@
+/**
+ * 表达式执行异常，将显示执行异常的位置信息
+ */
+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后续省略......";
+    }
+    super(message);
+    super.stack = cause.stack;
+  }
+}

package/src/expression/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/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/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/instances/JSONObject.ts

@@ -0,0 +1,105 @@
+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 = {};
+      for (const key of Object.keys(value)) {
+        const item = 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;
+    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/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/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>

package/src/layouts/GridView.vue

@@ -1,45 +1,45 @@
-<template>
-  <div id="test">
-    <a-card :bordered="false">
-      <XReport
-        ref="main"
-        v-if="configName"
-        :use-oss-for-img="false"
-        :config-name="configName"
-        :show-img-in-cell="true"
-        :display-only="true"
-        :edit-mode="false"
-        :show-save-button="false"
-        :no-padding="true"
-        :dont-format="true"/>
-      <a-empty v-else/>
-    </a-card>
-  </div>
-</template>
-
-<script>
-import XReport from '@vue2-client/base-client/components/common/XReportGrid/XReport.vue'
-
-export default {
-  name: 'GridView',
-  components: {
-    XReport
-  },
-  mounted () {
-    // 获取当前路由中的meta
-    this.configName = this.$router.currentRoute.meta.configName
-    this.nothing = !this.configName
-  },
-  data () {
-    return {
-      configName: '',
-      nothing: false
-    }
-  },
-  methods: {
-  }
-}
-</script>
-<style scoped>
-
-</style>
+<template>
+  <div id="test">
+    <a-card :bordered="false">
+      <XReport
+        ref="main"
+        v-if="configName"
+        :use-oss-for-img="false"
+        :config-name="configName"
+        :show-img-in-cell="true"
+        :display-only="true"
+        :edit-mode="false"
+        :show-save-button="false"
+        :no-padding="true"
+        :dont-format="true"/>
+      <a-empty v-else/>
+    </a-card>
+  </div>
+</template>
+
+<script>
+import XReport from '@vue2-client/base-client/components/common/XReportGrid/XReport.vue'
+
+export default {
+  name: 'GridView',
+  components: {
+    XReport
+  },
+  mounted () {
+    // 获取当前路由中的meta
+    this.configName = this.$router.currentRoute.meta.configName
+    this.nothing = !this.configName
+  },
+  data () {
+    return {
+      configName: '',
+      nothing: false
+    }
+  },
+  methods: {
+  }
+}
+</script>
+<style scoped>
+
+</style>