vue2-client 1.4.59 → 1.4.60

package/src/components/tool/TagSelect.vue

@@ -1,83 +1,83 @@
-<template>
-  <div class="tag-select">
-    <tag-select-option @click="toggleCheck">全部</tag-select-option>
-    <slot></slot>
-    <a v-show="showTrigger" ref="trigger" class="trigger" @click="toggle">展开<a-icon :type="collapsed ? 'down' : 'up'" style="margin-left: 5px"/></a>
-  </div>
-</template>
-
-<script>
-import TagSelectOption from './TagSelectOption'
-
-export default {
-  name: 'TagSelect',
-  Option: TagSelectOption,
-  components: { TagSelectOption },
-  data () {
-    return {
-      showTrigger: false,
-      collapsed: true,
-      screenWidth: document.body.clientWidth,
-      checkAll: false
-    }
-  },
-  watch: {
-    screenWidth: function () {
-      this.showTrigger = this.needTrigger()
-    },
-    collapsed: function (val) {
-      this.$el.style.maxHeight = val ? '39px' : '78px'
-    }
-  },
-  mounted () {
-    const _this = this
-    // 此处延迟执行，是为解决mouted未完全完成情况下引发的trigger显示bug
-    setTimeout(() => {
-      _this.showTrigger = _this.needTrigger()
-      _this.$refs.trigger.style.display = _this.showTrigger ? 'inline' : 'none'
-    }, 1)
-    window.onresize = () => {
-      return (() => {
-        window.screenWidth = document.body.clientWidth
-        _this.screenWidth = window.screenWidth
-      })()
-    }
-  },
-  methods: {
-    needTrigger () {
-      return this.$el.clientHeight < this.$el.scrollHeight || this.$el.scrollHeight > 39
-    },
-    toggle () {
-      this.collapsed = !this.collapsed
-    },
-    getAllTags () {
-      return this.$children.filter((item) => {
-        return item.isTagSelectOption
-      })
-    },
-    toggleCheck () {
-      this.checkAll = !this.checkAll
-      const tagList = this.getAllTags()
-      tagList.forEach((item) => {
-        item.checked = this.checkAll
-      })
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-  .tag-select{
-    user-select: none;
-    position: relative;
-    overflow: hidden;
-    max-height: 39px;
-    padding-right: 50px;
-    display: inline-block;
-  }
-  .trigger{
-    position: absolute;
-    top: 0;
-    right: 0;
-  }
-</style>
+<template>
+  <div class="tag-select">
+    <tag-select-option @click="toggleCheck">全部</tag-select-option>
+    <slot></slot>
+    <a v-show="showTrigger" ref="trigger" class="trigger" @click="toggle">展开<a-icon :type="collapsed ? 'down' : 'up'" style="margin-left: 5px"/></a>
+  </div>
+</template>
+
+<script>
+import TagSelectOption from './TagSelectOption'
+
+export default {
+  name: 'TagSelect',
+  Option: TagSelectOption,
+  components: { TagSelectOption },
+  data () {
+    return {
+      showTrigger: false,
+      collapsed: true,
+      screenWidth: document.body.clientWidth,
+      checkAll: false
+    }
+  },
+  watch: {
+    screenWidth: function () {
+      this.showTrigger = this.needTrigger()
+    },
+    collapsed: function (val) {
+      this.$el.style.maxHeight = val ? '39px' : '78px'
+    }
+  },
+  mounted () {
+    const _this = this
+    // 此处延迟执行，是为解决mouted未完全完成情况下引发的trigger显示bug
+    setTimeout(() => {
+      _this.showTrigger = _this.needTrigger()
+      _this.$refs.trigger.style.display = _this.showTrigger ? 'inline' : 'none'
+    }, 1)
+    window.onresize = () => {
+      return (() => {
+        window.screenWidth = document.body.clientWidth
+        _this.screenWidth = window.screenWidth
+      })()
+    }
+  },
+  methods: {
+    needTrigger () {
+      return this.$el.clientHeight < this.$el.scrollHeight || this.$el.scrollHeight > 39
+    },
+    toggle () {
+      this.collapsed = !this.collapsed
+    },
+    getAllTags () {
+      return this.$children.filter((item) => {
+        return item.isTagSelectOption
+      })
+    },
+    toggleCheck () {
+      this.checkAll = !this.checkAll
+      const tagList = this.getAllTags()
+      tagList.forEach((item) => {
+        item.checked = this.checkAll
+      })
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+  .tag-select{
+    user-select: none;
+    position: relative;
+    overflow: hidden;
+    max-height: 39px;
+    padding-right: 50px;
+    display: inline-block;
+  }
+  .trigger{
+    position: absolute;
+    top: 0;
+    right: 0;
+  }
+</style>

package/src/components/transition/PageToggleTransition.vue

@@ -1,97 +1,97 @@
-<template>
-  <transition
-    v-if="!disabled"
-    :enter-active-class="`animated ${enterAnimate} page-toggle-enter-active`"
-    :leave-active-class="`animated ${leaveAnimate} page-toggle-leave-active`"
-  >
-    <slot></slot>
-  </transition>
-  <div v-else><slot></slot></div>
-</template>
-
-<script>
-  import { preset as animates } from '@vue2-client/config/default/animate.config'
-
-  export default {
-    name: 'PageToggleTransition',
-    props: {
-      disabled: {
-        type: Boolean,
-        default: false
-      },
-      animate: {
-        type: String,
-        validator (value) {
-          return animates.findIndex(item => item.name === value) !== -1
-        },
-        default: 'bounce'
-      },
-      // eslint-disable-next-line vue/require-default-prop
-      direction: {
-        type: String,
-        validator (value) {
-          return ['x', 'y', 'left', 'right', 'up', 'down', 'downLeft', 'upRight', 'downRight', 'upLeft', 'downBig',
-            'upBig', 'downLeft', 'downRight', 'topRight', 'bottomLeft', 'topLeft', 'bottomRight', 'default'].indexOf(value) > -1
-        }
-      },
-      reverse: {
-        type: Boolean,
-        default: true
-      }
-    },
-    computed: {
-      enterAnimate () {
-        return this.activeClass(false)
-      },
-      leaveAnimate () {
-        return this.activeClass(true)
-      }
-    },
-    methods: {
-      activeClass (isLeave) {
-        const animate = animates.find(item => this.animate === item.name)
-        if (animate === undefined) {
-          return ''
-        }
-        let direction = ''
-        if (this.direction === undefined) {
-          direction = animate.directions[0]
-        } else {
-          direction = animate.directions.find(item => item === this.direction)
-        }
-        direction = (direction === undefined || direction === 'default') ? '' : direction
-        if (direction !== '') {
-          direction = isLeave && this.reverse ? this.reversePosition(direction, animate.directions) : direction
-          direction = direction[0].toUpperCase() + direction.substring(1)
-        }
-        const t = isLeave ? 'Out' : 'In'
-        return animate.name + t + direction
-      },
-      reversePosition (direction, directions) {
-        if (direction.length === 0 || direction === 'x' || direction === 'y') {
-          return direction
-        }
-        let index = directions.indexOf(direction)
-        index = (index % 2 === 1) ? index - 1 : index + 1
-        return directions[index]
-      }
-    }
-  }
-</script>
-
-<style lang="less">
-  .page-toggle-enter-active{
-    position: absolute !important;
-    animation-duration: 0.8s !important;
-    width: calc(100%) !important;
-  }
-  .page-toggle-leave-active{
-    position: absolute !important;
-    animation-duration: 0.8s !important;
-    width: calc(100%) !important;
-  }
-  .page-toggle-enter{
-  }
-  .page-toggle-leave-to{
-  }
-</style>
+<template>
+  <transition
+    v-if="!disabled"
+    :enter-active-class="`animated ${enterAnimate} page-toggle-enter-active`"
+    :leave-active-class="`animated ${leaveAnimate} page-toggle-leave-active`"
+  >
+    <slot></slot>
+  </transition>
+  <div v-else><slot></slot></div>
+</template>
+
+<script>
+  import { preset as animates } from '@vue2-client/config/default/animate.config'
+
+  export default {
+    name: 'PageToggleTransition',
+    props: {
+      disabled: {
+        type: Boolean,
+        default: false
+      },
+      animate: {
+        type: String,
+        validator (value) {
+          return animates.findIndex(item => item.name === value) !== -1
+        },
+        default: 'bounce'
+      },
+      // eslint-disable-next-line vue/require-default-prop
+      direction: {
+        type: String,
+        validator (value) {
+          return ['x', 'y', 'left', 'right', 'up', 'down', 'downLeft', 'upRight', 'downRight', 'upLeft', 'downBig',
+            'upBig', 'downLeft', 'downRight', 'topRight', 'bottomLeft', 'topLeft', 'bottomRight', 'default'].indexOf(value) > -1
+        }
+      },
+      reverse: {
+        type: Boolean,
+        default: true
+      }
+    },
+    computed: {
+      enterAnimate () {
+        return this.activeClass(false)
+      },
+      leaveAnimate () {
+        return this.activeClass(true)
+      }
+    },
+    methods: {
+      activeClass (isLeave) {
+        const animate = animates.find(item => this.animate === item.name)
+        if (animate === undefined) {
+          return ''
+        }
+        let direction = ''
+        if (this.direction === undefined) {
+          direction = animate.directions[0]
+        } else {
+          direction = animate.directions.find(item => item === this.direction)
+        }
+        direction = (direction === undefined || direction === 'default') ? '' : direction
+        if (direction !== '') {
+          direction = isLeave && this.reverse ? this.reversePosition(direction, animate.directions) : direction
+          direction = direction[0].toUpperCase() + direction.substring(1)
+        }
+        const t = isLeave ? 'Out' : 'In'
+        return animate.name + t + direction
+      },
+      reversePosition (direction, directions) {
+        if (direction.length === 0 || direction === 'x' || direction === 'y') {
+          return direction
+        }
+        let index = directions.indexOf(direction)
+        index = (index % 2 === 1) ? index - 1 : index + 1
+        return directions[index]
+      }
+    }
+  }
+</script>
+
+<style lang="less">
+  .page-toggle-enter-active{
+    position: absolute !important;
+    animation-duration: 0.8s !important;
+    width: calc(100%) !important;
+  }
+  .page-toggle-leave-active{
+    position: absolute !important;
+    animation-duration: 0.8s !important;
+    width: calc(100%) !important;
+  }
+  .page-toggle-enter{
+  }
+  .page-toggle-leave-to{
+  }
+</style>

package/src/config/CreateQueryConfig.js

@@ -44,6 +44,9 @@ module.exports = {
     {
       label: '多选框', key: 'checkbox'
     },
+    {
+      label: '树形选择框', key: 'treeSelect'
+    },
     {
       label: '地点搜索框', key: 'addressSearch'
     },
@@ -149,7 +152,7 @@ module.exports = {
     {
       label: '不设置',
       key: 'default',
-      match: ['input', 'select', 'selects', 'checkbox', 'radio', 'addressSearch', 'citySelect']
+      match: ['input', 'select', 'selects', 'checkbox', 'radio', 'addressSearch', 'citySelect', 'treeSelect']
     },
     {
       label: '文本溢出省略',
@@ -229,12 +232,12 @@ module.exports = {
     {
       label: '包含[in]',
       key: 'IN',
-      match: ['checkbox']
+      match: ['checkbox', 'treeSelect']
     },
     {
       label: '不包含[not in]',
       key: 'NOT_IN',
-      match: ['checkbox']
+      match: ['checkbox', 'treeSelect']
     },
     {
       label: '之间[between]',
@@ -294,7 +297,7 @@ module.exports = {
     {
       label: '字典键',
       key: 'key',
-      noMatch: ['selects', 'cascader']
+      noMatch: ['selects', 'cascader', 'treeSelect']
     },
     {
       label: '固定集合',

package/src/config/default/admin.config.js

@@ -1,18 +1,18 @@
-// admin 配置
-const ADMIN = {
-  palettes: ['#f5222d', '#fa541c', '#fadb14', '#3eaf7c', '#13c2c2', '#1890ff', '#722ed1', '#eb2f96', '#507CAD'],
-  animates: require('./animate.config').preset,
-  theme: {
-    mode: {
-      DARK: 'dark',
-      LIGHT: 'light',
-      NIGHT: 'night'
-    }
-  },
-  layout: {
-    SIDE: 'side',
-    HEAD: 'head'
-  }
-}
-
-module.exports = ADMIN
+// admin 配置
+const ADMIN = {
+  palettes: ['#f5222d', '#fa541c', '#fadb14', '#3eaf7c', '#13c2c2', '#1890ff', '#722ed1', '#eb2f96', '#507CAD'],
+  animates: require('./animate.config').preset,
+  theme: {
+    mode: {
+      DARK: 'dark',
+      LIGHT: 'light',
+      NIGHT: 'night'
+    }
+  },
+  layout: {
+    SIDE: 'side',
+    HEAD: 'head'
+  }
+}
+
+module.exports = ADMIN

package/src/config/default/setting.config.js

@@ -1,44 +1,44 @@
-// 此配置为系统默认设置
-module.exports = {
-  lang: 'CN', // 语言，可选 CN(简体)、HK(繁体)、US(英语)，也可扩展其它语言
-  theme: { // 主题
-    color: '#1890ff', // 主题色
-    mode: 'dark', // 主题模式 可选 dark、 light 和 night
-    success: '#52c41a', // 成功色
-    warning: '#faad14', // 警告色
-    error: '#f5222f' // 错误色
-  },
-  layout: 'side', // 导航布局，可选 side 和 head，分别为侧边导航和顶部导航
-  fixedHeader: true, // 固定头部状态栏，true:固定，false:不固定
-  fixedSideBar: true, // 固定侧边栏，true:固定，false:不固定
-  fixedTabs: true, // 固定页签头，true:固定，false:不固定
-  pageWidth: 'fixed', // 内容区域宽度，fixed:固定宽度，fluid:流式宽度
-  weekMode: false, // 色弱模式，true:开启，false:不开启
-  multiPage: true, // 多页签模式，true:开启，false:不开启
-  cachePage: true, // 是否缓存页面数据，仅多页签模式下生效，true 缓存, false 不缓存
-  hideSetting: false, // 隐藏设置抽屉，true:隐藏，false:不隐藏
-  homePage: '/dashboard/workplace', // 首页路由, 登陆后默认打开
-  ticketPage: '/submitTicket', // 提交工单路由
-  systemName: 'V4基础组件平台', // 系统名称
-  logoSrc: '/defaultLogo.png', // LOGO路径
-  systemNameFontSize: '20px', // 系统名称字体大小
-  systemDesc: '为PC端中、后台系统业务开发提供支持', // 系统描述
-  copyright: '2022 AoFengSoft', // copyright
-  copyrightStyle: undefined,
-  asyncRoutes: true, // 异步加载路由，true:开启，false:不开启
-  showPageTitle: true, // 是否显示页面标题（PageLayout 布局中的页面标题），true:显示，false:不显示
-  filterMenu: true, // 根据权限过滤菜单，true:过滤，false:不过滤
-  animate: { // 动画设置
-    disabled: true, // 禁用动画，true:禁用，false:启用
-    name: 'lightSpeed', // 动画效果，支持的动画效果可参考 ./animate.config.js
-    direction: 'left' // 动画方向，切换页面时动画的方向，参考 ./animate.config.js
-  },
-  footerLinks: [ // 页面底部链接，{link: '链接地址', name: '名称/显示文字', icon: '图标，支持 ant design vue 图标库'}
-  ],
-  // 旧系统路径
-  iframeSrc: '../singlepage/page.html',
-  // 兼容旧版本 V3(最新V3产品)  OA(公司OA)
-  compatible: 'V3',
-  // 路由资源名称
-  routeName: '智慧燃气'
-}
+// 此配置为系统默认设置
+module.exports = {
+  lang: 'CN', // 语言，可选 CN(简体)、HK(繁体)、US(英语)，也可扩展其它语言
+  theme: { // 主题
+    color: '#1890ff', // 主题色
+    mode: 'dark', // 主题模式 可选 dark、 light 和 night
+    success: '#52c41a', // 成功色
+    warning: '#faad14', // 警告色
+    error: '#f5222f' // 错误色
+  },
+  layout: 'side', // 导航布局，可选 side 和 head，分别为侧边导航和顶部导航
+  fixedHeader: true, // 固定头部状态栏，true:固定，false:不固定
+  fixedSideBar: true, // 固定侧边栏，true:固定，false:不固定
+  fixedTabs: true, // 固定页签头，true:固定，false:不固定
+  pageWidth: 'fixed', // 内容区域宽度，fixed:固定宽度，fluid:流式宽度
+  weekMode: false, // 色弱模式，true:开启，false:不开启
+  multiPage: true, // 多页签模式，true:开启，false:不开启
+  cachePage: true, // 是否缓存页面数据，仅多页签模式下生效，true 缓存, false 不缓存
+  hideSetting: false, // 隐藏设置抽屉，true:隐藏，false:不隐藏
+  homePage: '/dashboard/workplace', // 首页路由, 登陆后默认打开
+  ticketPage: '/submitTicket', // 提交工单路由
+  systemName: 'V4基础组件平台', // 系统名称
+  logoSrc: '/defaultLogo.png', // LOGO路径
+  systemNameFontSize: '20px', // 系统名称字体大小
+  systemDesc: '为PC端中、后台系统业务开发提供支持', // 系统描述
+  copyright: '2022 AoFengSoft', // copyright
+  copyrightStyle: undefined,
+  asyncRoutes: true, // 异步加载路由，true:开启，false:不开启
+  showPageTitle: true, // 是否显示页面标题（PageLayout 布局中的页面标题），true:显示，false:不显示
+  filterMenu: true, // 根据权限过滤菜单，true:过滤，false:不过滤
+  animate: { // 动画设置
+    disabled: true, // 禁用动画，true:禁用，false:启用
+    name: 'lightSpeed', // 动画效果，支持的动画效果可参考 ./animate.config.js
+    direction: 'left' // 动画方向，切换页面时动画的方向，参考 ./animate.config.js
+  },
+  footerLinks: [ // 页面底部链接，{link: '链接地址', name: '名称/显示文字', icon: '图标，支持 ant design vue 图标库'}
+  ],
+  // 旧系统路径
+  iframeSrc: '../singlepage/page.html',
+  // 兼容旧版本 V3(最新V3产品)  OA(公司OA)
+  compatible: 'V3',
+  // 路由资源名称
+  routeName: '智慧燃气'
+}