vue2-client 1.11.6-alpha.3 → 1.12.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.11.6-alpha.3",
+  "version": "1.12.1",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/expression/TestExpression.js

@@ -1,51 +1,52 @@
 import Program from './core/Program'
-import JSONObject from './instances/JSONObject'
 import LogicConsole from './instances/LogicConsole'
 
+const logicConsole = LogicConsole.getInstance()
+
 runTest()
 
 async function runTest () {
-  console.debug('1.========testValidate========')
+  logicConsole.debug('1.========testValidate========')
   await testValidate()
-  console.debug('2.========testAssert========')
+  logicConsole.debug('2.========testAssert========')
   await testAssert()
-  console.debug('3.========testTry========')
+  logicConsole.debug('3.========testTry========')
   await testTry()
-  console.debug('4.========testPropertyType========')
+  logicConsole.debug('4.========testPropertyType========')
   await testPropertyType()
-  console.debug('5.========testJSONArrayIndex========')
+  logicConsole.debug('5.========testJSONArrayIndex========')
   await testJSONArrayIndex()
-  console.debug('6.========testArrayIndex========')
+  logicConsole.debug('6.========testArrayIndex========')
   await testArrayIndex()
-  console.debug('7.========testCompare========')
+  logicConsole.debug('7.========testCompare========')
   await testCompare()
-  console.debug('8.========testJSONObject========')
+  logicConsole.debug('8.========testJSONObject========')
   await testJSONObject()
-  console.debug('9.========testJSONArray========')
+  logicConsole.debug('9.========testJSONArray========')
   await testJSONArray()
-  console.debug('10.========testFunctionCall========')
+  logicConsole.debug('10.========testFunctionCall========')
   await testFunctionCall()
-  console.debug('11.========testMath========')
+  logicConsole.debug('11.========testMath========')
   await testMath()
-  console.debug('12.========testString========')
+  logicConsole.debug('12.========testString========')
   await testString()
-  console.debug('13.========testCondition========')
+  logicConsole.debug('13.========testCondition========')
   await testCondition()
-  console.debug('14.========testThrow========')
+  logicConsole.debug('14.========testThrow========')
   await testThrow()
-  console.debug('15.========testJSONArrayLoop========')
+  logicConsole.debug('15.========testJSONArrayLoop========')
   await testJSONArrayLoop()
-  console.debug('16.========testJSONObjectLoop========')
+  logicConsole.debug('16.========testJSONObjectLoop========')
   await testJSONObjectLoop()
-  console.debug('17.========testIntLoop========')
+  logicConsole.debug('17.========testIntLoop========')
   await testIntLoop()
-  console.debug('18.========testContinueAndBreak========')
+  logicConsole.debug('18.========testContinueAndBreak========')
   await testContinueAndBreak()
-  console.debug('19.========testComment========')
+  logicConsole.debug('19.========testComment========')
   await testComment()
-  console.debug('20.========testReturn========')
+  logicConsole.debug('20.========testReturn========')
   await testReturn()
-  console.debug('21.========testLambda========')
+  logicConsole.debug('21.========testLambda========')
   await testLambda()
 }
 
@@ -502,7 +503,7 @@ async function runExpression (expression, data) {
   params.data = data
   params.log = new LogicConsole()
   params.b = 5
-  const result = await d.invoke(new JSONObject(params))
+  const result = await d.invoke(params)
   console.log(result)
   return result
 }

package/src/expression/core/Delegate.js

@@ -1,6 +1,5 @@
 import ExpressionType from '../enums/ExpressionType'
 import ReturnWayException from '../exception/ReturnWayException'
-import JSONObject from '../instances/JSONObject'
 
 export default class Delegate {
   exp
@@ -14,14 +13,14 @@ export default class Delegate {
     if (objectNames) {
       this.objectNames = objectNames
     } else {
-      this.objectNames = new JSONObject()
+      this.objectNames = []
     }
   }
 
   // 执行程序，执行前，参数必须实例化
   async invoke (params) {
     if (params == null) {
-      params = new JSONObject()
+      params = []
     }
     // 把初始参数给参数表
     this.objectNames = params
@@ -79,17 +78,17 @@ export default class Delegate {
 
   // 存储对象值
   put (key, value) {
-    this.objectNames.put(key, value)
+    this.objectNames[key] = value
   }
 
   // 获取对象值
   get (key) {
-    return this.objectNames.get(key)
+    return this.objectNames[key]
   }
 
   // 检查是否包含某个键
   containsKey (key) {
-    return this.objectNames.has(key)
+    return Object.prototype.hasOwnProperty.call(this.objectNames, key)
   }
 
   // 获取源代码
@@ -100,14 +99,17 @@ export default class Delegate {
   // 使用参数调用
   async apply (params) {
     if (params === null) {
-      params = new JSONObject()
+      params = {}
     }
     const map = this.objectNames
     if (this.lambdaOutProps.length === 0) {
-      this.lambdaOutProps.push(...map.keySet())
+      this.lambdaOutProps.push(Object.keys(map))
     }
-    const lambdaMap = new JSONObject(map)
-    lambdaMap.put('data', params)
+    const lambdaMap = {}
+    for (const key in map) {
+      lambdaMap[key] = map[key]
+    }
+    lambdaMap.data = params
     return await this.invoke(lambdaMap)
   }
 }

package/src/expression/core/Expression.js

@@ -5,8 +5,7 @@ import ContinueWayException from '../exception/ContinueWayException'
 import ServiceException from '../exception/ServiceException'
 import ReturnWayException from '../exception/ReturnWayException'
 import ExpressionException from '../exception/ExpressionException'
-import JSONObject from '../instances/JSONObject'
-import JSONArray from '../instances/JSONArray'
+import Vue from 'vue'
 
 export default class Expression {
   /**
@@ -435,72 +434,40 @@ export default class Expression {
     // 获取对象，for循环
     const obj = await objExp?.invoke()
 
-    if (obj instanceof JSONArray || obj instanceof Array) {
+    if (obj instanceof Array) {
       // 获取循环体，循环体中row代表每一项对象, 把对象传递给循环体执行
       const body = this.children[1]
-      if (obj instanceof JSONArray) {
-        const array = obj
-        for (let i = 0; i < array.length(); i++) {
-          this.delegate?.put('rowIndex', i)
-          this.delegate?.put('row', array.get(i))
-          try {
-            await body?.invoke()
-          } catch (e) {
-            if (e instanceof BreakWayException) {
-              break
-            } else if (e instanceof ContinueWayException) {
-              // ignore
-            } else {
-              throw e
-            }
-          }
-        }
-      } else {
-        const array = obj
-        for (let i = 0; i < array.length; i++) {
-          this.delegate?.put('rowIndex', i)
-          this.delegate?.put('row', array[i])
-          try {
-            await body?.invoke()
-          } catch (e) {
-            if (e instanceof BreakWayException) {
-              break
-            } else if (e instanceof ContinueWayException) {
-              // ignore
-            } else {
-              throw e
-            }
+      const array = obj
+      for (let i = 0; i < array.length; i++) {
+        this.delegate?.put('rowIndex', i)
+        this.delegate?.put('row', array[i])
+        try {
+          await body?.invoke()
+        } catch (e) {
+          if (e instanceof BreakWayException) {
+            break
+          } else if (e instanceof ContinueWayException) {
+            // ignore
+          } else {
+            throw e
           }
         }
       }
-    } else if (obj instanceof JSONObject || obj instanceof Object) {
+    } else if (obj instanceof Object) {
       // 获取循环体，循环体中row代表每一项对象, 把对象传递给循环体执行
       const body = this.children[1]
-      if (obj instanceof JSONObject) {
-        const json = obj
-        for (const key of json.keySet()) {
-          this.delegate?.put('rowKey', key)
-          this.delegate?.put('row', json.get(key))
-          try {
-            await body?.invoke()
-          } catch (e) {
-            if (e instanceof BreakWayException) { /* empty */ }
-          }
-        }
-      } else {
-        for (const key of obj) {
-          this.delegate?.put('rowKey', key)
-          this.delegate?.put('row', obj[key])
-          try {
-            await body?.invoke()
-          } catch (e) {
-            if (e instanceof BreakWayException) {
-              break
-            } else if (e instanceof ContinueWayException) {
-              // ignore
-            } else {
-              throw e
-            }
+      for (const key in obj) {
+        this.delegate?.put('rowKey', key)
+        this.delegate?.put('row', obj[key])
+        try {
+          await body?.invoke()
+        } catch (e) {
+          if (e instanceof BreakWayException) {
+            break
+          } else if (e instanceof ContinueWayException) {
+            // ignore
+          } else {
+            throw e
           }
         }
       }
@@ -543,32 +510,27 @@ export default class Expression {
    * 执行集合的where过滤
    */
   async where () {
-    const result = new JSONArray()
+    const result = []
 
     const objExp = this.children[0]
     // 获取对象，where循环只针对JSONArray及list
     let array
 
     const ret = await objExp?.invoke()
-    if (ret instanceof JSONArray) {
+    if (Array.isArray(ret)) {
       array = ret
-    } else if (ret instanceof Array) {
-      array = new JSONArray()
-      for (let i = 0; i < ret.length; i++) {
-        array.put(ret[i])
-      }
     } else {
-      throw new ServiceException('where循环只针对JSONArray, Array')
+      throw new ServiceException('where循环只针对Array')
     }
 
     // 获取过滤内容，其中row代表每一项对象, 把对象传递进去执行
     const body = this.children[1]
-    for (let i = 0; i < array.length(); i++) {
-      const value = array.get(i)
+    for (let i = 0; i < array.length; i++) {
+      const value = array[i]
       this.delegate?.put('row', value)
       const value2 = await body?.invoke()
       if (value2 === true) {
-        result.put(value)
+        result.push(value) // 添加符合条件的元素
       }
     }
     return result
@@ -610,11 +572,11 @@ export default class Expression {
    * 返回Json对象的结果，返回一个Json对象
    */
   async json () {
-    const result = new JSONObject()
+    const result = {}
     for (const child of this.children) {
       const name = child?.value.toString()
       const value = await child?.children[0]?.invoke()
-      result.put(name, value)
+      result[name] = value
     }
     return result
   }
@@ -623,11 +585,11 @@ export default class Expression {
    * 返回JSONArray结果
    */
   async array () {
-    const result = new JSONArray()
+    const result = []
     for (const child of this.children) {
       // 调用处理结果
       const value = await child?.invoke()
-      result.put(value)
+      result.push(value)
     }
     return result
   }
@@ -664,17 +626,11 @@ export default class Expression {
       this.delegate?.put(name, value)
     } else {
       const obj = await left.invoke()
-      // 如果是JSONObject，调用JSONObject的赋值过程
-      if (obj instanceof JSONObject) {
-        const json = obj
-        json.put(name, value)
-      } else {
-        try {
-          obj[name] = value
-          return value
-        } catch (e) {
-          throw new ServiceException('属性赋值错误：' + name)
-        }
+      try {
+        obj[name] = value
+        return value
+      } catch (e) {
+        throw new ServiceException('属性赋值错误：' + name)
       }
     }
     return value
@@ -688,18 +644,7 @@ export default class Expression {
     // 获取对象
     const obj = await objExp?.invoke()
     // 属性名
-    let rObj
-    // 是JSONObject
-    if (obj instanceof JSONObject) {
-      const json = obj
-      if (!json.has(key)) {
-        return null
-      }
-      rObj = json.get(key)
-    } else {
-      rObj = obj[key]
-    }
-    return this.convert(rObj)
+    return this.convert(obj[key])
   }
 
   /**
@@ -711,13 +656,7 @@ export default class Expression {
     // 获取对象
     const obj = await objExp?.invoke()
     // 如果对象为JSONArray，调用JSONArray的方法
-    if (obj instanceof JSONArray) {
-      const array = obj
-      // 获取下标值
-      const index = Number(await indexExp?.invoke())
-      const oRet = array.get(index)
-      return this.convert(oRet)
-    } else if (obj instanceof Array) {
+    if (obj instanceof Array) {
       const list = obj
       // 获取下标值
       const index = Number(await indexExp?.invoke())
@@ -762,9 +701,8 @@ export default class Expression {
    */
   async throwException () {
     let result = await this.children[0]?.invoke()
-    if (result instanceof JSONObject) {
-      const obj = result
-      throw new ServiceException(obj.get('msg').toString(), obj.getInt('status'))
+    if (typeof result === 'object') {
+      throw new ServiceException(result.msg, result.status)
     } else if (result instanceof Error) {
       const e = result
       if (e instanceof ServiceException) {
@@ -800,9 +738,9 @@ export default class Expression {
    */
   async validateParams () {
     const result = await this.children[0]?.invoke()
-    if (result instanceof JSONObject) {
+    if (typeof result === 'object') {
       const validateJson = result
-      const params = this.delegate?.get('data')
+      const params = this.delegate.get('data')
       this.validateMain('data', params, validateJson)
     } else {
       throw new ServiceException('validate仅接收json格式的对象')
@@ -821,43 +759,41 @@ export default class Expression {
    * 参数校验实现
    */
   validateMain (validateItemKey, params, validateJson) {
-    for (const key of validateJson.keySet()) {
-      const item = validateJson.getJSONObject(key)
-      const validateMode = item.optString('mode', 'normal')
+    for (const key in validateJson) {
+      const item = validateJson[key]
+      const validateMode = item.mode || 'normal'
       switch (validateMode) {
         case 'normal': {
-          const hasParams = params.has(key) && params.opt(key)
+          const hasParams = Object.prototype.hasOwnProperty.call(params, key) && params[key] != null
           if (!hasParams) {
-            if (item.optBoolean('required', false)) {
-              const message = item.optString('message', '参数校验失败，' + validateItemKey + '>>' + key + '不能为空')
+            if (item.required) {
+              const message = item.message || '参数校验失败，' + validateItemKey + '>>' + key + '不能为空'
               throw new ServiceException(message, 400)
             }
-            if (item.has('default')) {
-              params.put(key, item.get('default'))
+            if (item.default !== undefined) {
+              params[key] = item.default
             }
           }
           // items用于对JSON参数的成员进行校验
-          if (item.has('items')) {
-            const itemsValidate = item.getJSONObject('items')
-            this.validateMain(validateItemKey + '>>' + key, params.getJSONObject(key), itemsValidate)
+          if (item.items) {
+            this.validateMain(validateItemKey + '>>' + key, params[key], item.items)
           }
           break
         }
         case 'atLeastOne': {
-          const fields = item.getJSONArray('fields')
+          const fields = item.fields
           let isValidate = false
-          for (let i = 0; i < fields.length(); i++) {
-            const field = fields.get(i)
-            const fieldName = field.toString()
-            const hasParam = params.has(fieldName) && params.get(fieldName) != null
+          for (let i = 0; i < fields.length; i++) {
+            const field = fields[i]
+            const fieldName = field
+            const hasParam = Object.prototype.hasOwnProperty.call(params, fieldName) && params[fieldName] != null
             if (hasParam) {
               isValidate = true
               break
             }
           }
           if (!isValidate) {
-            const message = item.optString('message', '参数校验失败:参数组' + fields + '至少有一个不能为空')
-            throw new ServiceException(message, 400)
+            throw new ServiceException(item.message || '参数校验失败:参数组' + fields + '至少有一个不能为空', 400)
           }
           break
         }
@@ -966,24 +902,12 @@ export default class Expression {
           let l = await left.invoke()
           if (l == null) {
             l = 'null'
-          } else {
-            if (l instanceof JSONObject || l instanceof JSONArray) {
-              l = l.toString()
-            } else if (typeof l === 'object') {
-              l = JSON.stringify(l)
-            }
           }
           let r = await right.invoke()
           if (r == null) {
             r = 'null'
-          } else {
-            if (r instanceof JSONObject || r instanceof JSONArray) {
-              r = r.toString()
-            } else if (typeof r === 'object') {
-              r = JSON.stringify(r)
-            }
           }
-          return l + r
+          return Expression.toJSONString(l) + Expression.toJSONString(r)
         }
         // 返回JSON
         case ExpressionType.Json: {
@@ -1224,6 +1148,10 @@ export default class Expression {
       throw new ServiceException(`对象[${objExp.value}]为null`)
     }
 
+    if (name === 'toString') {
+      return Expression.toJSONString(obj)
+    }
+
     // 获得参数计算结果
     const params = []
     for (let i = 1; i < this.children.length; i++) {
@@ -1247,6 +1175,15 @@ export default class Expression {
     // 查找对象方法
     const method = this.getMethod(obj, name, types)
     if (!method) {
+      let result = '***404***'
+      if (obj.constructor.name === 'Object') {
+        result = this.callJSONObjectFunction(obj, name, params)
+      } else if (obj.constructor.name === 'Array') {
+        result = this.callJSONArrayFunction(obj, name, params)
+      }
+      if (result !== '***404***') {
+        return result
+      }
       let error = `找不到方法: ${obj.constructor.name}.${name}(`
       // 添加方法参数
       types.forEach(t => {
@@ -1257,15 +1194,113 @@ export default class Expression {
     }
 
     // 调用方法并处理返回值
-    // console.warn(`1:${obj.constructor.name}.${name}`)
     const oCall = method.apply(obj, params)
-    // console.warn(`2:${obj.constructor.name}.${name}`)
     const result = oCall instanceof Promise ? await oCall : oCall
-    // console.warn(`3:${obj.constructor.name}.${name}.${result}`)
     // 返回处理后的结果
     return result
   }
 
+  /**
+   * 适配JSONObject原生方法
+   */
+  callJSONObjectFunction (obj, name, params) {
+    switch (name) {
+      case 'has':
+        return Object.prototype.hasOwnProperty.call(obj, params[0])
+      case 'put': {
+        const key = params[0]
+        if (key == null) {
+          throw new ServiceException('Null key.')
+        }
+        const value = params[1]
+        if (value !== undefined && value !== null) {
+          obj[key] = value
+        } else {
+          delete obj[key]
+        }
+        return true
+      }
+      case 'putAll': {
+        const appendArray = params[0]
+        for (const key in appendArray) {
+          obj[key] = appendArray[key]
+        }
+        return true
+      }
+      case 'get': {
+        const key = params[0]
+        return obj[key]
+      }
+      case 'opt': {
+        const key = params[0]
+        return key == null ? null : obj[key]
+      }
+      case 'remove': {
+        const key = params[0]
+        return delete obj[key]
+      }
+      case 'keySet':
+        return Object.keys(obj)
+      default:
+        return '***404***'
+    }
+  }
+
+  /**
+   * 适配JSONArray原生方法
+   */
+  callJSONArrayFunction (obj, name, params) {
+    switch (name) {
+      case 'length':
+        return obj.length
+      case 'put':
+        return obj.push(params[0])
+      case 'putAll': {
+        const appendArray = params[0]
+        for (let i = 0; i < appendArray.length; i++) {
+          obj.push(appendArray[i])
+        }
+        return true
+      }
+      case 'get': {
+        const index = params[0]
+        const value = obj[index]
+        if (value === undefined || value === null) {
+          throw new ServiceException(`Array[${index}] not found.`)
+        }
+        return value
+      }
+      case 'opt': {
+        const index = params[0]
+        return index >= 0 && index < obj.length ? obj[index] : null
+      }
+      case 'remove': {
+        const index = params[0]
+        return index >= 0 && index < obj.length ? obj.splice(index, 1) : null
+      }
+      default:
+        return '***404***'
+    }
+  }
+
+  static toJSONString (obj) {
+    if (typeof obj === 'string' || typeof obj === 'number') {
+      return obj
+    }
+    const replacer = (key, value) => {
+      // 如果是函数，认为它是复杂对象，直接返回函数名
+      if (typeof value === 'function') {
+        return `Function(${value.name || 'anonymous'})` // 返回函数的名称，或者 'anonymous'
+      }
+      // 如果是 Vue 组件实例
+      if (value instanceof Vue) {
+        return `VueComponent(${value.constructor.name})`
+      }
+      return value
+    }
+    return JSON.stringify(obj, replacer)
+  }
+
   /**
    * 查找与给定方法名和参数类型匹配的方法
    */

package/src/expression/core/Program.js

@@ -3,7 +3,6 @@ import Expression from './Expression'
 import Delegate from './Delegate'
 import ExpressionType from '../enums/ExpressionType'
 import TokenType from '../enums/TokenType'
-import JSONArray from '../instances/JSONArray'
 
 /**
  * 表达式入口
@@ -538,7 +537,7 @@ export default class Program {
     // Empty array, return directly
     if (t.getType() === TokenType.Oper && t.getValue() === ']') {
       // Return JSON array constant
-      return Expression.Constant(new JSONArray(), this.pos)
+      return Expression.Constant([], this.pos)
     }
 
     // Loop to get array contents

package/src/expression/instances/LogicConsole.js

@@ -1,4 +1,6 @@
 // 自定义 Console 类
+import Expression from '../core/Expression'
+
 export default class LogicConsole {
   constructor () {
     if (LogicConsole.instance) {
@@ -35,11 +37,8 @@ export default class LogicConsole {
   }
 
   convert (args) {
-    return args.map(arg => {
-      if (typeof arg === 'object' && arg !== null && typeof arg.toString === 'function') {
-        return arg.toString()
-      }
-      return arg
+    return args.map(obj => {
+      return Expression.toJSONString(obj)
     })
   }
 }

package/src/logic/LogicRunner.js

@@ -1,9 +1,9 @@
-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'
+import Expression from '../expression/core/Expression'
 
 export default class LogicRunner {
   static logicConsoleInstance = new LogicConsole()
@@ -33,20 +33,15 @@ export default class LogicRunner {
     if (!result || !result.source) {
       throw new ServiceException('Logic资源' + logicName + '未找到', 400)
     }
-    let paramStr
-    if (param instanceof JSONObject) {
-      paramStr = param.toString()
-    } else {
-      paramStr = JSON.stringify(param)
-    }
+    const paramStr = Expression.toJSONString(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)
+    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)
   }
 

package/src/pages/LogicCallExample/index.vue

@@ -1,17 +1,23 @@
 <script setup>
 
 import LogicRunner from '@vue2-client/logic/LogicRunner'
-import { ref } from 'vue'
+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
+    metaData: metaData,
+    proxy: proxy
   })
+  console.warn(metaData)
   console.info('pageTest:' + result)
 }
 </script>

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'
 }

package/src/services/user.js

@@ -1,92 +1,92 @@
-import {
-  LOGIN,
-  MODIFY_PASSWORD,
-  ROUTES,
-  V4_GET_INFO,
-  V4_LOGIN,
-  V4_LOGOUT
-} from '@vue2-client/services/apiService'
-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 '@vue2-client/store/mutation-types'
-
-/**
- * 登录服务
- * @param name 账户名
- * @param password 账户密码
- * @returns {Promise<AxiosResponse<T>>}
- */
-export async function login (name, password) {
-  let data = {
-    name: name,
-    password: password
-  }
-  data = '$' + EncryptUtil.RSAEncrypt(JSON.stringify(data))
-  return request(LOGIN, METHOD.POST, data)
-}
-
-export async function modifyPassword (name, password, newPassword) {
-  return request(MODIFY_PASSWORD, METHOD.POST, {
-    data: {
-      ename: name,
-      password: password,
-      newpassword: newPassword,
-      affirmpassword: newPassword
-    }
-  })
-}
-
-export async function V4Login (name, password, routeName) {
-  return request(V4_LOGIN, METHOD.POST, {
-    username: name,
-    password: password,
-    resourceName: routeName
-  })
-}
-
-export async function V4RefreshToken () {
-  const { AESDecrypt } = EncryptUtil
-  const info = AESDecrypt(localStorage.getItem('SinglePage_TOKEN'), '3KMKqvgwR8ULbR8Z')
-  return axios.post(V4_LOGIN, {
-    username: info.name,
-    password: info.password,
-    resourceName: '智慧燃气'
-  })
-}
-
-export async function V4GetInfo () {
-  return request(V4_GET_INFO, METHOD.POST, {})
-}
-
-export async function getRoutesConfig (value, routeName = '智慧燃气') {
-  return request(ROUTES + '/' + routeName, METHOD.POST, value)
-}
-
-/**
- * 退出登录
- */
-export function logout () {
-  if (window.__MICRO_APP_ENVIRONMENT__) {
-    window.microApp.dispatch({ type: 'logout' })
-  }
-  return new Promise((resolve, reject) => {
-    request(V4_LOGOUT, METHOD.DELETE, {}).then(() => {
-      resolve()
-    }).catch(error => {
-      reject(error)
-    }).finally(() => {
-      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()
-    })
-  })
-}
-export default {
-  login,
-  logout,
-  getRoutesConfig,
-  V4RefreshToken
-}
+import {
+  LOGIN,
+  MODIFY_PASSWORD,
+  ROUTES,
+  V4_GET_INFO,
+  V4_LOGIN,
+  V4_LOGOUT
+} from '@vue2-client/services/apiService'
+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 '@vue2-client/store/mutation-types'
+
+/**
+ * 登录服务
+ * @param name 账户名
+ * @param password 账户密码
+ * @returns {Promise<AxiosResponse<T>>}
+ */
+export async function login (name, password) {
+  let data = {
+    name: name,
+    password: password
+  }
+  data = '$' + EncryptUtil.RSAEncrypt(JSON.stringify(data))
+  return request(LOGIN, METHOD.POST, data)
+}
+
+export async function modifyPassword (name, password, newPassword) {
+  return request(MODIFY_PASSWORD, METHOD.POST, {
+    data: {
+      ename: name,
+      password: password,
+      newpassword: newPassword,
+      affirmpassword: newPassword
+    }
+  })
+}
+
+export async function V4Login (name, password, routeName) {
+  return request(V4_LOGIN, METHOD.POST, {
+    username: name,
+    password: password,
+    resourceName: routeName
+  })
+}
+
+export async function V4RefreshToken () {
+  const { AESDecrypt } = EncryptUtil
+  const info = AESDecrypt(localStorage.getItem('SinglePage_TOKEN'), '3KMKqvgwR8ULbR8Z')
+  return axios.post(V4_LOGIN, {
+    username: info.name,
+    password: info.password,
+    resourceName: '智慧燃气'
+  })
+}
+
+export async function V4GetInfo () {
+  return request(V4_GET_INFO, METHOD.POST, {})
+}
+
+export async function getRoutesConfig (value, routeName = '智慧燃气') {
+  return request(ROUTES + '/' + routeName, METHOD.POST, value)
+}
+
+/**
+ * 退出登录
+ */
+export function logout () {
+  if (window.__MICRO_APP_ENVIRONMENT__) {
+    window.microApp.dispatch({ type: 'logout' })
+  }
+  return new Promise((resolve, reject) => {
+    request(V4_LOGOUT, METHOD.DELETE, {}).then(() => {
+      resolve()
+    }).catch(error => {
+      reject(error)
+    }).finally(() => {
+      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()
+    })
+  })
+}
+export default {
+  login,
+  logout,
+  getRoutesConfig,
+  V4RefreshToken
+}

package/test/Amis.spec.js

@@ -1,5 +1,6 @@
 import { mount } from '@vue/test-utils'
 import AMisRender from '@vue2-client/base-client/components/common/AMisRender/index.vue'
+import { it, describe, expect } from '@jest/globals'
 
 describe('AmisRender', () => {
     // 测试用例：正确渲染组件

package/test/Tree.spec.js

@@ -3,6 +3,7 @@ import { shallowMount, mount } from '@vue/test-utils'
 
 import TreeComponent from '@vue2-client/base-client/components/common/Tree'
 import * as CommonApi from '@vue2-client/services/api/common'
+import { afterEach, beforeEach, describe, expect, it, jest } from '@jest/globals'
 
 function handleLogic (logicName, parameters) {
   // 使用 switch 语句来处理多种业务逻辑

package/test/myDialog.spec.js

@@ -2,6 +2,7 @@ import { createLocalVue, mount } from '@vue/test-utils'
 import MyConfirm from '@vue2-client/base-client/components/common/XBadge'
 import Plugins from '@vue2-client/base-client/plugins'
 import Antd from 'ant-design-vue'
+import { it, describe, expect, beforeAll, jest } from '@jest/globals'
 
 const localVue = createLocalVue()
 

package/test/util.test.js

@@ -1,5 +1,6 @@
 // test/util.test.js
 import { getRealKeyData } from '../src/utils/util'
+import { describe, expect, it } from '@jest/globals'
 
 describe('getRealKeyData', () => {
   it('should return an object with keys after the first underscore', () => {

package/test/v3Api.test.js

@@ -1,6 +1,7 @@
 /* eslint-env jest */
 import { searchToListOption } from '@vue2-client/services/v3Api'
-import mockjs from 'mockjs' // Correct way to import mockjs
+import mockjs from 'mockjs'
+import { describe, it, jest } from '@jest/globals' // Correct way to import mockjs
 
 jest.mock('@vue2-client/utils/request', () => ({
   request: jest.fn(),

package/tests/unit/ReportTable.spec.js

@@ -1,6 +1,7 @@
 import { mount } from '@vue/test-utils'
 import ReportTable from '@vue2-client/pages/report/ReportTable'
 import { reportData } from '@vue2-client/mock/common/reportData'
+import { describe, expect, it } from '@jest/globals'
 
 // 报表组件测试域
 describe('ReportTable', () => {

package/src/expression/instances/JSONArray.js

@@ -1,48 +0,0 @@
-import JSONObject from '../instances/JSONObject'
-
-export default class JSONArray {
-  innerList
-
-  constructor (value) {
-    if (value && typeof value === 'string') {
-      this.innerList = JSON.parse(value).map((item) => this.wrapValue(item))
-    } else if (value && Array.isArray(value)) {
-      this.innerList = value.map((item) => this.wrapValue(item))
-    } else {
-      this.innerList = []
-    }
-  }
-
-  wrapValue (value) {
-    if (Array.isArray(value)) {
-      return new JSONArray(value)
-    } else if (value && JSONObject.isPlainObject(value)) {
-      return new JSONObject(value)
-    }
-    return value
-  }
-
-  length () {
-    return this.innerList.length
-  }
-
-  put (item) {
-    this.innerList.push(this.wrapValue(item))
-  }
-
-  get (index) {
-    return this.innerList[index]
-  }
-
-  toString () {
-    const replacer = (key, value) => {
-      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.js

@@ -1,122 +0,0 @@
-import JSONArray from '../instances/JSONArray'
-import ServiceException from '../exception/ServiceException'
-
-export default class JSONObject {
-  innerMap
-
-  constructor (value) {
-    let map
-    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
-  }
-
-  static isPlainObject (value) {
-    return false
-  }
-
-  put (key, value) {
-    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
-    }
-  }
-
-  putAll (object) {
-    if (object === null || object === undefined) {
-      throw new ServiceException('putAll的value不能为空')
-    }
-    if (object instanceof JSONObject) {
-      for (const key in object.keySet()) {
-        this.put(key, object.get(key))
-      }
-    } else if (typeof object === 'object') {
-      for (const key in object) {
-        this.put(key, object[key])
-      }
-    } else {
-      throw new ServiceException('putAll的value必须是对象或JSONObject')
-    }
-  }
-
-  get (key) {
-    return this.innerMap[key]
-  }
-
-  opt (key) {
-    return key == null ? null : this.innerMap[key]
-  }
-
-  optString (key, defaultValue) {
-    const result = this.opt(key)
-    return result || defaultValue
-  }
-
-  getBoolean (key) {
-    const object = this.get(key)
-    if (typeof object === 'boolean') {
-      return object
-    } else {
-      return Boolean(object)
-    }
-  }
-
-  optBoolean (key, defaultValue) {
-    const val = this.opt(key)
-    if (!val) {
-      return defaultValue
-    }
-    return this.getBoolean(key)
-  }
-
-  getInt (key) {
-    return this.innerMap[key]
-  }
-
-  getJSONObject (key) {
-    return this.innerMap[key]
-  }
-
-  getJSONArray (key) {
-    return this.innerMap[key]
-  }
-
-  has (key) {
-    return Object.prototype.hasOwnProperty.call(this.innerMap, key)
-  }
-
-  keySet () {
-    return Object.keys(this.innerMap)
-  }
-
-  toString () {
-    const replacer = (key, value) => {
-      if (value instanceof JSONObject) {
-        return value.innerMap
-      } else if (value instanceof JSONArray) {
-        return value.innerList
-      }
-      return value
-    }
-    return JSON.stringify(this.innerMap, replacer)
-  }
-}