vue2-client 1.15.87 → 1.15.88

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

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

@@ -1,32 +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;
-    })
-  }
-}
+// 自定义 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/layouts/AdminLayout.vue

@@ -1,176 +1,176 @@
-<template>
-  <a-layout :class="['admin-layout', 'beauty-scroll']">
-    <drawer v-if="isMobile" v-model="drawerOpen">
-      <side-menu :theme="theme.mode" :menuData="menuData" :collapsed="false" :collapsible="false" @menuSelect="onMenuSelect"/>
-    </drawer>
-    <side-menu
-      :class="[fixedSideBar ? 'fixed-side' : '']"
-      :theme="theme.mode"
-      v-else-if="layout === 'side' || layout === 'mix'"
-      :menuData="sideMenuData"
-      :collapsed="collapsed"
-      :collapsible="true" />
-    <div v-if="fixedSideBar && !isMobile" :style="`width: ${sideMenuWidth}; min-width: ${sideMenuWidth};max-width: ${sideMenuWidth};`" class="virtual-side"></div>
-    <drawer v-if="!hideSetting" v-model="showSetting" placement="right">
-      <div class="setting" slot="handler">
-        <a-icon :type="showSetting ? 'close' : 'setting'"/>
-      </div>
-      <setting />
-    </drawer>
-    <a-layout class="admin-layout-main beauty-scroll">
-      <admin-header :class="[{'fixed-tabs': fixedTabs, 'fixed-header': fixedHeader, 'multi-page': multiPage}]" :style="headerStyle" :menuData="headMenuData" :collapsed="collapsed" @toggleCollapse="toggleCollapse"/>
-      <a-layout-header :class="['virtual-header', {'fixed-tabs' : fixedTabs, 'fixed-header': fixedHeader, 'multi-page': multiPage}]" v-show="fixedHeader"></a-layout-header>
-      <a-layout-content class="admin-layout-content">
-        <div style="position: relative">
-          <slot></slot>
-        </div>
-      </a-layout-content>
-      <a-layout-footer style="padding: 0">
-        <page-footer :link-list="footerLinks" :copyright="copyright" />
-      </a-layout-footer>
-    </a-layout>
-  </a-layout>
-</template>
-
-<script>
-import AdminHeader from './header/AdminHeader'
-import PageFooter from './footer/PageFooter'
-import Drawer from '../components/tool/Drawer'
-import SideMenu from '../components/menu/SideMenu'
-import Setting from '../components/setting/Setting'
-import { mapState, mapMutations, mapGetters } from 'vuex'
-
-// const minHeight = window.innerHeight - 64 - 122
-
-export default {
-  name: 'AdminLayout',
-  components: { Setting, SideMenu, Drawer, PageFooter, AdminHeader },
-  data () {
-    return {
-      minHeight: window.innerHeight - 64 - 1,
-      collapsed: false,
-      showSetting: false,
-      drawerOpen: false
-    }
-  },
-  provide () {
-    return {
-      adminLayout: this
-    }
-  },
-  watch: {
-    $route (val) {
-      this.setActivated(val)
-    },
-    layout () {
-      this.setActivated(this.$route)
-    },
-    isMobile (val) {
-      if (!val) {
-        this.drawerOpen = false
-      }
-    }
-  },
-  computed: {
-    ...mapState('setting', ['isMobile', 'theme', 'layout', 'footerLinks', 'copyright', 'fixedHeader', 'fixedSideBar',
-      'fixedTabs', 'hideSetting', 'multiPage']),
-    ...mapGetters('setting', ['firstMenu', 'subMenu', 'menuData']),
-    sideMenuWidth () {
-      return this.collapsed ? '80px' : '256px'
-    },
-    headerStyle () {
-      const width = (this.fixedHeader && this.layout !== 'head' && !this.isMobile) ? `calc(100% - ${this.sideMenuWidth})` : '100%'
-      const position = this.fixedHeader ? 'fixed' : 'static'
-      return `width: ${width}; position: ${position};`
-    },
-    headMenuData () {
-      const { layout, menuData, firstMenu } = this
-      return layout === 'mix' ? firstMenu : menuData
-    },
-    sideMenuData () {
-      const { layout, menuData, subMenu } = this
-      return layout === 'mix' ? subMenu : menuData
-    }
-  },
-  methods: {
-    ...mapMutations('setting', ['correctPageMinHeight', 'setActivatedFirst']),
-    toggleCollapse () {
-      this.collapsed = !this.collapsed
-    },
-    onMenuSelect () {
-      this.toggleCollapse()
-    },
-    setActivated (route) {
-      if (this.layout === 'mix') {
-        let matched = route.matched
-        matched = matched.slice(0, matched.length - 1)
-        const { firstMenu } = this
-        for (const menu of firstMenu) {
-          if (matched.findIndex(item => item.path === menu.fullPath) !== -1) {
-            this.setActivatedFirst(menu.fullPath)
-            break
-          }
-        }
-      }
-    }
-  },
-  created () {
-    this.correctPageMinHeight(this.minHeight - 24)
-    this.setActivated(this.$route)
-  },
-  beforeDestroy () {
-    this.correctPageMinHeight(-this.minHeight + 24)
-  }
-}
-</script>
-
-<style lang="less" scoped>
-  .admin-layout{
-    .side-menu{
-      &.fixed-side{
-        position: fixed;
-        height: 100vh;
-        left: 0;
-        top: 0;
-      }
-    }
-    .virtual-side{
-      transition: all 0.2s;
-    }
-    .virtual-header{
-      transition: all 0.2s;
-      opacity: 0;
-      &.fixed-tabs.multi-page:not(.fixed-header){
-        height: 0;
-      }
-    }
-    .admin-layout-main{
-      height: 100%;
-      .admin-header{
-        top: 0;
-        right: 0;
-        overflow: hidden;
-        transition: all 0.2s;
-        &.fixed-tabs.multi-page:not(.fixed-header){
-          height: 0;
-        }
-      }
-    }
-    .admin-layout-content{
-      padding: 24px;
-      display: flex;
-      flex-direction: column;
-      min-height: auto;
-    }
-    .setting{
-      background-color: @primary-color;
-      color: @base-bg-color;
-      border-radius: 5px 0 0 5px;
-      line-height: 40px;
-      font-size: 22px;
-      width: 40px;
-      height: 40px;
-      box-shadow: -2px 0 8px @shadow-color;
-    }
-  }
-</style>
+<template>
+  <a-layout :class="['admin-layout', 'beauty-scroll']">
+    <drawer v-if="isMobile" v-model="drawerOpen">
+      <side-menu :theme="theme.mode" :menuData="menuData" :collapsed="false" :collapsible="false" @menuSelect="onMenuSelect"/>
+    </drawer>
+    <side-menu
+      :class="[fixedSideBar ? 'fixed-side' : '']"
+      :theme="theme.mode"
+      v-else-if="layout === 'side' || layout === 'mix'"
+      :menuData="sideMenuData"
+      :collapsed="collapsed"
+      :collapsible="true" />
+    <div v-if="fixedSideBar && !isMobile" :style="`width: ${sideMenuWidth}; min-width: ${sideMenuWidth};max-width: ${sideMenuWidth};`" class="virtual-side"></div>
+    <drawer v-if="!hideSetting" v-model="showSetting" placement="right">
+      <div class="setting" slot="handler">
+        <a-icon :type="showSetting ? 'close' : 'setting'"/>
+      </div>
+      <setting />
+    </drawer>
+    <a-layout class="admin-layout-main beauty-scroll">
+      <admin-header :class="[{'fixed-tabs': fixedTabs, 'fixed-header': fixedHeader, 'multi-page': multiPage}]" :style="headerStyle" :menuData="headMenuData" :collapsed="collapsed" @toggleCollapse="toggleCollapse"/>
+      <a-layout-header :class="['virtual-header', {'fixed-tabs' : fixedTabs, 'fixed-header': fixedHeader, 'multi-page': multiPage}]" v-show="fixedHeader"></a-layout-header>
+      <a-layout-content class="admin-layout-content">
+        <div style="position: relative">
+          <slot></slot>
+        </div>
+      </a-layout-content>
+      <a-layout-footer style="padding: 0">
+        <page-footer :link-list="footerLinks" :copyright="copyright" />
+      </a-layout-footer>
+    </a-layout>
+  </a-layout>
+</template>
+
+<script>
+import AdminHeader from './header/AdminHeader'
+import PageFooter from './footer/PageFooter'
+import Drawer from '../components/tool/Drawer'
+import SideMenu from '../components/menu/SideMenu'
+import Setting from '../components/setting/Setting'
+import { mapState, mapMutations, mapGetters } from 'vuex'
+
+// const minHeight = window.innerHeight - 64 - 122
+
+export default {
+  name: 'AdminLayout',
+  components: { Setting, SideMenu, Drawer, PageFooter, AdminHeader },
+  data () {
+    return {
+      minHeight: window.innerHeight - 64 - 1,
+      collapsed: false,
+      showSetting: false,
+      drawerOpen: false
+    }
+  },
+  provide () {
+    return {
+      adminLayout: this
+    }
+  },
+  watch: {
+    $route (val) {
+      this.setActivated(val)
+    },
+    layout () {
+      this.setActivated(this.$route)
+    },
+    isMobile (val) {
+      if (!val) {
+        this.drawerOpen = false
+      }
+    }
+  },
+  computed: {
+    ...mapState('setting', ['isMobile', 'theme', 'layout', 'footerLinks', 'copyright', 'fixedHeader', 'fixedSideBar',
+      'fixedTabs', 'hideSetting', 'multiPage']),
+    ...mapGetters('setting', ['firstMenu', 'subMenu', 'menuData']),
+    sideMenuWidth () {
+      return this.collapsed ? '80px' : '256px'
+    },
+    headerStyle () {
+      const width = (this.fixedHeader && this.layout !== 'head' && !this.isMobile) ? `calc(100% - ${this.sideMenuWidth})` : '100%'
+      const position = this.fixedHeader ? 'fixed' : 'static'
+      return `width: ${width}; position: ${position};`
+    },
+    headMenuData () {
+      const { layout, menuData, firstMenu } = this
+      return layout === 'mix' ? firstMenu : menuData
+    },
+    sideMenuData () {
+      const { layout, menuData, subMenu } = this
+      return layout === 'mix' ? subMenu : menuData
+    }
+  },
+  methods: {
+    ...mapMutations('setting', ['correctPageMinHeight', 'setActivatedFirst']),
+    toggleCollapse () {
+      this.collapsed = !this.collapsed
+    },
+    onMenuSelect () {
+      this.toggleCollapse()
+    },
+    setActivated (route) {
+      if (this.layout === 'mix') {
+        let matched = route.matched
+        matched = matched.slice(0, matched.length - 1)
+        const { firstMenu } = this
+        for (const menu of firstMenu) {
+          if (matched.findIndex(item => item.path === menu.fullPath) !== -1) {
+            this.setActivatedFirst(menu.fullPath)
+            break
+          }
+        }
+      }
+    }
+  },
+  created () {
+    this.correctPageMinHeight(this.minHeight - 24)
+    this.setActivated(this.$route)
+  },
+  beforeDestroy () {
+    this.correctPageMinHeight(-this.minHeight + 24)
+  }
+}
+</script>
+
+<style lang="less" scoped>
+  .admin-layout{
+    .side-menu{
+      &.fixed-side{
+        position: fixed;
+        height: 100vh;
+        left: 0;
+        top: 0;
+      }
+    }
+    .virtual-side{
+      transition: all 0.2s;
+    }
+    .virtual-header{
+      transition: all 0.2s;
+      opacity: 0;
+      &.fixed-tabs.multi-page:not(.fixed-header){
+        height: 0;
+      }
+    }
+    .admin-layout-main{
+      height: 100%;
+      .admin-header{
+        top: 0;
+        right: 0;
+        overflow: hidden;
+        transition: all 0.2s;
+        &.fixed-tabs.multi-page:not(.fixed-header){
+          height: 0;
+        }
+      }
+    }
+    .admin-layout-content{
+      padding: 24px;
+      display: flex;
+      flex-direction: column;
+      min-height: auto;
+    }
+    .setting{
+      background-color: @primary-color;
+      color: @base-bg-color;
+      border-radius: 5px 0 0 5px;
+      line-height: 40px;
+      font-size: 22px;
+      width: 40px;
+      height: 40px;
+      box-shadow: -2px 0 8px @shadow-color;
+    }
+  }
+</style>