vue2-client 1.15.84 → 1.15.86

package/src/layouts/tabs/i18n.js

@@ -1,25 +1,25 @@
-module.exports = {
-  messages: {
-    CN: {
-      closeLeft: '关闭左侧',
-      closeRight: '关闭右侧',
-      closeOthers: '关闭其它',
-      refresh: '刷新页面',
-      warn: '这是最后一页，不能再关闭了'
-    },
-    HK: {
-      closeLeft: '關閉左側',
-      closeRight: '關閉右側',
-      closeOthers: '關閉其它',
-      refresh: '刷新頁面',
-      warn: '這是最後一頁，不能再關閉了'
-    },
-    US: {
-      closeLeft: 'close left',
-      closeRight: 'close right',
-      closeOthers: 'close others',
-      refresh: 'refresh the page',
-      warn: 'This is the last page, you can\'t close it'
-    }
-  }
-}
+module.exports = {
+  messages: {
+    CN: {
+      closeLeft: '关闭左侧',
+      closeRight: '关闭右侧',
+      closeOthers: '关闭其它',
+      refresh: '刷新页面',
+      warn: '这是最后一页，不能再关闭了'
+    },
+    HK: {
+      closeLeft: '關閉左側',
+      closeRight: '關閉右側',
+      closeOthers: '關閉其它',
+      refresh: '刷新頁面',
+      warn: '這是最後一頁，不能再關閉了'
+    },
+    US: {
+      closeLeft: 'close left',
+      closeRight: 'close right',
+      closeOthers: 'close others',
+      refresh: 'refresh the page',
+      warn: 'This is the last page, you can\'t close it'
+    }
+  }
+}

package/src/layouts/tabs/index.js

@@ -1,2 +1,2 @@
-import TabsView from './TabsView'
-export default TabsView
+import TabsView from './TabsView'
+export default TabsView

package/src/logic/LogicRunner.js

@@ -1,62 +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)
-  }
-}
+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

@@ -1,13 +1,13 @@
-import LogicRunner from './LogicRunner'
-
-testLogicCall()
-
-/**
- * testLogicCall
- */
-function testLogicCall () {
-  const result = LogicRunner.run('testVueLogic', {
-    test: '1'
-  })
-  console.info(result)
-}
+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

@@ -1,35 +1,35 @@
-/**
- * 日期工具类
- */
-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}`
-  }
-}
+/**
+ * 日期工具类
+ */
+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/common/VueTools.js

@@ -1,30 +1,30 @@
-/**
- * Vue工具类
- */
-export default class VueTools {
-  static instance = new VueTools()
-
-  constructor () {
-    if (VueTools.instance) {
-      return VueTools.instance
-    }
-    VueTools.instance = this
-  }
-
-  static getInstance () {
-    if (!VueTools.instance) {
-      VueTools.instance = new VueTools()
-    }
-    return VueTools.instance
-  }
-
-  /**
-   * 获取组件实例
-   * @param vueRef vue实例
-   * @param componentName 组件实例名（refName）
-   * @returns {VueComponent}
-   */
-  getComponent (vueRef, componentName) {
-    return vueRef.$refs[componentName]
-  }
-}
+/**
+ * Vue工具类
+ */
+export default class VueTools {
+  static instance = new VueTools()
+
+  constructor () {
+    if (VueTools.instance) {
+      return VueTools.instance
+    }
+    VueTools.instance = this
+  }
+
+  static getInstance () {
+    if (!VueTools.instance) {
+      VueTools.instance = new VueTools()
+    }
+    return VueTools.instance
+  }
+
+  /**
+   * 获取组件实例
+   * @param vueRef vue实例
+   * @param componentName 组件实例名（refName）
+   * @returns {VueComponent}
+   */
+  getComponent (vueRef, componentName) {
+    return vueRef.$refs[componentName]
+  }
+}

package/src/logic/plugins/index.js

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

package/src/logic/ts/LogicRunner.ts

@@ -1,67 +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)
-  }
-}
+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

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

package/src/main.js

@@ -1,33 +1,33 @@
-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'
-
-import VueDraggableResizable from 'vue-draggable-resizable'
-
-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)
-
-Vue.config.devtools = true
-// 绑定原型
-Vue.Modal = Modal
-Vue.component('VueDraggableResizable', VueDraggableResizable)
-
-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'
+
+import VueDraggableResizable from 'vue-draggable-resizable'
+
+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)
+
+Vue.config.devtools = true
+// 绑定原型
+Vue.Modal = Modal
+Vue.component('VueDraggableResizable', VueDraggableResizable)
+
+bootstrap({ router, store, i18n, message }).then(() => {
+  new Vue({
+    router,
+    store,
+    i18n,
+    render: h => h(App)
+  }).$mount('#app')
+})