vue2-client 1.11.5 → 1.11.6-alpha

package/src/lib.js

@@ -1 +1 @@
-console.log('进入模块')
+console.log('进入模块')

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/main.js

@@ -1,34 +1,34 @@
-import Vue from 'vue'
-import App from './App.vue'
-import Router from 'vue-router'
-import Vuex from 'vuex'
-import { routerOptions, modules, i18n, message, bootstrap } from '../index'
-// import eventLogPlugin from '@/plugins/EventLogPlugin'
-import findParentData from '@/plugins/FindParentsData'
-import { Modal } from 'ant-design-vue'
-
-Vue.use(Router)
-Vue.use(Vuex)
-// Vue.use(eventLogPlugin)
-Vue.use(findParentData)
-
-// 创建router store
-const store = new Vuex.Store({ modules })
-const router = new Router(routerOptions)
-
-// 绑定原型，用于amis
-Vue.$store = store
-Vue.$router = router
-Vue.$i18n = i18n
-Vue.config.devtools = true
-// 绑定原型
-Vue.Modal = Modal
-
-bootstrap({ router, store, i18n, message }).then(() => {
-  new Vue({
-    router,
-    store,
-    i18n,
-    render: h => h(App)
-  }).$mount('#app')
-})
+import Vue from 'vue'
+import App from './App.vue'
+import Router from 'vue-router'
+import Vuex from 'vuex'
+import { routerOptions, modules, i18n, message, bootstrap } from '../index'
+// import eventLogPlugin from '@/plugins/EventLogPlugin'
+import findParentData from '@/plugins/FindParentsData'
+import { Modal } from 'ant-design-vue'
+
+Vue.use(Router)
+Vue.use(Vuex)
+// Vue.use(eventLogPlugin)
+Vue.use(findParentData)
+
+// 创建router store
+const store = new Vuex.Store({ modules })
+const router = new Router(routerOptions)
+
+// 绑定原型，用于amis
+Vue.$store = store
+Vue.$router = router
+Vue.$i18n = i18n
+Vue.config.devtools = true
+// 绑定原型
+Vue.Modal = Modal
+
+bootstrap({ router, store, i18n, message }).then(() => {
+  new Vue({
+    router,
+    store,
+    i18n,
+    render: h => h(App)
+  }).$mount('#app')
+})

package/src/mock/extend/index.js

@@ -1,84 +1,84 @@
-import Mock from 'mockjs'
-import { logos, sayings, positions, avatars, admins } from '../common'
-
-const Random = Mock.Random
-
-const timeList = [
-  {
-    CN: '早上好',
-    HK: '早晨啊',
-    US: 'Good morning'
-  }, {
-    CN: '上午好',
-    HK: '上午好',
-    US: 'Good morning'
-  }, {
-    CN: '中午好',
-    HK: '中午好',
-    US: 'Good afternoon'
-  }, {
-    CN: '下午好',
-    HK: '下午好',
-    US: 'Good afternoon'
-  }, {
-    CN: '晚上好',
-    HK: '晚上好',
-    US: 'Good evening'
-  }
-]
-
-const welcomeMessages = [
-  {
-    CN: '休息一会儿吧',
-    HK: '休息一會兒吧',
-    US: 'you may need a break'
-  },
-  {
-    CN: '准备吃什么呢',
-    HK: '準備吃什麼呢',
-    US: 'what are you going to eat'
-  },
-  {
-    CN: '要不要打一把 LOL',
-    HK: '要不要打一把 LOL',
-    US: 'how about a game of DOTA'
-  },
-  {
-    CN: '我猜你可能累了',
-    HK: '我猜你可能累了',
-    US: 'i guess you might be tired'
-  }
-]
-
-const goods = ['运动鞋', '短裤', 'T恤', '七分裤', '风衣', '寸衫']
-
-Random.extend({
-  admin () {
-    return this.pick(admins)
-  },
-  welcome () {
-    return this.pick(welcomeMessages)
-  },
-  timeFix () {
-    const time = new Date()
-    const hour = time.getHours()
-    return hour < 9
-      ? timeList[0]
-      : (hour <= 11 ? timeList[1] : (hour <= 13 ? timeList[2] : (hour <= 20 ? timeList[3] : timeList[4])))
-  },
-  avatar () {
-    return this.pick(avatars)
-  },
-  position () {
-    return this.pick(positions)
-  },
-  goods () {
-    return this.pick(goods)
-  },
-  saying () {
-    return this.pick(sayings)
-  },
-  logo () {
-    return this.pick(logos)
-  }
-})
+import Mock from 'mockjs'
+import { logos, sayings, positions, avatars, admins } from '../common'
+
+const Random = Mock.Random
+
+const timeList = [
+  {
+    CN: '早上好',
+    HK: '早晨啊',
+    US: 'Good morning'
+  }, {
+    CN: '上午好',
+    HK: '上午好',
+    US: 'Good morning'
+  }, {
+    CN: '中午好',
+    HK: '中午好',
+    US: 'Good afternoon'
+  }, {
+    CN: '下午好',
+    HK: '下午好',
+    US: 'Good afternoon'
+  }, {
+    CN: '晚上好',
+    HK: '晚上好',
+    US: 'Good evening'
+  }
+]
+
+const welcomeMessages = [
+  {
+    CN: '休息一会儿吧',
+    HK: '休息一會兒吧',
+    US: 'you may need a break'
+  },
+  {
+    CN: '准备吃什么呢',
+    HK: '準備吃什麼呢',
+    US: 'what are you going to eat'
+  },
+  {
+    CN: '要不要打一把 LOL',
+    HK: '要不要打一把 LOL',
+    US: 'how about a game of DOTA'
+  },
+  {
+    CN: '我猜你可能累了',
+    HK: '我猜你可能累了',
+    US: 'i guess you might be tired'
+  }
+]
+
+const goods = ['运动鞋', '短裤', 'T恤', '七分裤', '风衣', '寸衫']
+
+Random.extend({
+  admin () {
+    return this.pick(admins)
+  },
+  welcome () {
+    return this.pick(welcomeMessages)
+  },
+  timeFix () {
+    const time = new Date()
+    const hour = time.getHours()
+    return hour < 9
+      ? timeList[0]
+      : (hour <= 11 ? timeList[1] : (hour <= 13 ? timeList[2] : (hour <= 20 ? timeList[3] : timeList[4])))
+  },
+  avatar () {
+    return this.pick(avatars)
+  },
+  position () {
+    return this.pick(positions)
+  },
+  goods () {
+    return this.pick(goods)
+  },
+  saying () {
+    return this.pick(sayings)
+  },
+  logo () {
+    return this.pick(logos)
+  }
+})

package/src/mock/goods/index.js

@@ -1,108 +1,108 @@
-import Mock from 'mockjs'
-import '@vue2-client/mock/extend'
-import { parseUrlParams } from '@vue2-client/utils/request'
-
-const current = new Date().getTime()
-
-const goodsList = Mock.mock({
-  'list|100': [{
-    'id|+1': 0,
-    name: '@GOODS',
-    orderId: `${current}-@integer(1,100)`,
-    'status|1-4': 1,
-    send: '@BOOLEAN',
-    sendTime: '@DATETIME',
-    orderDate: '@DATE',
-    auditTime: '@TIME'
-  }]
-})
-
-Mock.mock(RegExp(`${process.env.VUE_APP_API_BASE_URL}/goods` + '.*'), 'get', ({ url }) => {
-  const params = parseUrlParams(decodeURI(url))
-  let { page, pageSize } = params
-  // eslint-disable-next-line no-eval
-  page = eval(page) - 1 || 0
-  // eslint-disable-next-line no-eval
-  pageSize = eval(pageSize) || 10
-  delete params.page
-  delete params.pageSize
-  let result = goodsList.list.filter(item => {
-    for (const [key, value] of Object.entries(params)) {
-      if (item[key] !== value) {
-        return false
-      }
-    }
-    return true
-  })
-  const total = result.length
-  if ((page) * pageSize > total) {
-    result = []
-  } else {
-    result = result.slice(page * pageSize, (page + 1) * pageSize)
-  }
-  return {
-    code: 0,
-    message: 'success',
-    data: {
-      page: page + 1,
-      pageSize,
-      total,
-      list: result
-    }
-  }
-})
-
-const columnsConfig = [
-  {
-    title: '商品名称',
-    dataIndex: 'name',
-    searchAble: true
-  },
-  {
-    title: '订单号',
-    dataIndex: 'orderId'
-  },
-  {
-    searchAble: true,
-    dataIndex: 'status',
-    dataType: 'select',
-    slots: { title: 'statusTitle' },
-    scopedSlots: { customRender: 'status' },
-    search: {
-      selectOptions: [
-        { title: '已下单', value: 1 },
-        { title: '已付款', value: 2 },
-        { title: '已审核', value: 3 }
-        // {title: '已发货', value: 4}
-      ]
-    }
-  },
-  {
-    title: '发货',
-    searchAble: true,
-    dataIndex: 'send',
-    dataType: 'boolean',
-    scopedSlots: { customRender: 'send' }
-  },
-  {
-    title: '发货时间',
-    dataIndex: 'sendTime',
-    dataType: 'datetime'
-  },
-  {
-    title: '下单日期',
-    searchAble: true,
-    dataIndex: 'orderDate',
-    dataType: 'date',
-    visible: false
-  },
-  {
-    title: '审核时间',
-    dataIndex: 'auditTime',
-    dataType: 'time'
-  }
-]
-
-Mock.mock(`${process.env.VUE_APP_API_BASE_URL}/columns`, 'get', () => {
-  return columnsConfig
-})
+import Mock from 'mockjs'
+import '@vue2-client/mock/extend'
+import { parseUrlParams } from '@vue2-client/utils/request'
+
+const current = new Date().getTime()
+
+const goodsList = Mock.mock({
+  'list|100': [{
+    'id|+1': 0,
+    name: '@GOODS',
+    orderId: `${current}-@integer(1,100)`,
+    'status|1-4': 1,
+    send: '@BOOLEAN',
+    sendTime: '@DATETIME',
+    orderDate: '@DATE',
+    auditTime: '@TIME'
+  }]
+})
+
+Mock.mock(RegExp(`${process.env.VUE_APP_API_BASE_URL}/goods` + '.*'), 'get', ({ url }) => {
+  const params = parseUrlParams(decodeURI(url))
+  let { page, pageSize } = params
+  // eslint-disable-next-line no-eval
+  page = eval(page) - 1 || 0
+  // eslint-disable-next-line no-eval
+  pageSize = eval(pageSize) || 10
+  delete params.page
+  delete params.pageSize
+  let result = goodsList.list.filter(item => {
+    for (const [key, value] of Object.entries(params)) {
+      if (item[key] !== value) {
+        return false
+      }
+    }
+    return true
+  })
+  const total = result.length
+  if ((page) * pageSize > total) {
+    result = []
+  } else {
+    result = result.slice(page * pageSize, (page + 1) * pageSize)
+  }
+  return {
+    code: 0,
+    message: 'success',
+    data: {
+      page: page + 1,
+      pageSize,
+      total,
+      list: result
+    }
+  }
+})
+
+const columnsConfig = [
+  {
+    title: '商品名称',
+    dataIndex: 'name',
+    searchAble: true
+  },
+  {
+    title: '订单号',
+    dataIndex: 'orderId'
+  },
+  {
+    searchAble: true,
+    dataIndex: 'status',
+    dataType: 'select',
+    slots: { title: 'statusTitle' },
+    scopedSlots: { customRender: 'status' },
+    search: {
+      selectOptions: [
+        { title: '已下单', value: 1 },
+        { title: '已付款', value: 2 },
+        { title: '已审核', value: 3 }
+        // {title: '已发货', value: 4}
+      ]
+    }
+  },
+  {
+    title: '发货',
+    searchAble: true,
+    dataIndex: 'send',
+    dataType: 'boolean',
+    scopedSlots: { customRender: 'send' }
+  },
+  {
+    title: '发货时间',
+    dataIndex: 'sendTime',
+    dataType: 'datetime'
+  },
+  {
+    title: '下单日期',
+    searchAble: true,
+    dataIndex: 'orderDate',
+    dataType: 'date',
+    visible: false
+  },
+  {
+    title: '审核时间',
+    dataIndex: 'auditTime',
+    dataType: 'time'
+  }
+]
+
+Mock.mock(`${process.env.VUE_APP_API_BASE_URL}/columns`, 'get', () => {
+  return columnsConfig
+})