vue2-client 1.15.5 → 1.15.6

package/src/theme/default/style.less

@@ -1,58 +1,58 @@
-.week-mode{
-  overflow: hidden;
-  filter: invert(80%);
-}
-
-.split-right{
-  &:not(:last-child) {
-    border-right: 1px solid rgba(98, 98, 98, 0.2);
-  }
-}
-.disabled{
-  cursor: not-allowed;
-  color: @disabled-color;
-  pointer-events: none;
-}
-
-.beauty-scroll{
-  -ms-overflow-style:none;
-  position: relative;
-  &::-webkit-scrollbar{
-    width: 3px;
-  }
-  &::-webkit-scrollbar-thumb {
-    border-radius: 3px;
-    background: @primary-color;
-  }
-  &::-webkit-scrollbar-track {
-    -webkit-box-shadow: inset 0 0 1px rgba(0,0,0,0);
-    border-radius: 3px;
-    background: @primary-3;
-  }
-}
-
-// 美化滚动条
-::-webkit-scrollbar{
-  width: 7px !important;
-  height: 7px !important;
-}
-
-::-webkit-scrollbar-thumb {
-  border-radius: 10px;
-  background: @primary-3;
-  border-style: dashed;
-  border-color: transparent;
-  border-width: 2px;
-  background-clip: padding-box;
-}
-
-::-webkit-scrollbar-track {
-  -webkit-box-shadow: inset 0 0 1px rgba(0,0,0,0);
-  border-radius: 10px;
-  background: transparent;
-}
-
-::-webkit-scrollbar-thumb:hover {
-  background: @primary-3;
-  border: 0;
-}
+.week-mode{
+  overflow: hidden;
+  filter: invert(80%);
+}
+
+.split-right{
+  &:not(:last-child) {
+    border-right: 1px solid rgba(98, 98, 98, 0.2);
+  }
+}
+.disabled{
+  cursor: not-allowed;
+  color: @disabled-color;
+  pointer-events: none;
+}
+
+.beauty-scroll{
+  -ms-overflow-style:none;
+  position: relative;
+  &::-webkit-scrollbar{
+    width: 3px;
+  }
+  &::-webkit-scrollbar-thumb {
+    border-radius: 3px;
+    background: @primary-color;
+  }
+  &::-webkit-scrollbar-track {
+    -webkit-box-shadow: inset 0 0 1px rgba(0,0,0,0);
+    border-radius: 3px;
+    background: @primary-3;
+  }
+}
+
+// 美化滚动条
+::-webkit-scrollbar{
+  width: 7px !important;
+  height: 7px !important;
+}
+
+::-webkit-scrollbar-thumb {
+  border-radius: 10px;
+  background: @primary-3;
+  border-style: dashed;
+  border-color: transparent;
+  border-width: 2px;
+  background-clip: padding-box;
+}
+
+::-webkit-scrollbar-track {
+  -webkit-box-shadow: inset 0 0 1px rgba(0,0,0,0);
+  border-radius: 10px;
+  background: transparent;
+}
+
+::-webkit-scrollbar-thumb:hover {
+  background: @primary-3;
+  border: 0;
+}

package/src/theme/global.less

@@ -1,159 +1,159 @@
-@import '~ant-design-vue/es/style/themes/default.less';
-
-html,
-body,
-#app, #root {
-  height: 100%;
-}
-
-.height-fill {
-  height: 100%;
-}
-
-.bg-white {
-  background: #fff;
-}
-
-.colorWeak {
-  filter: invert(80%);
-}
-
-.ant-layout.layout-basic {
-  height: 100vh;
-  min-height: 100vh;
-}
-
-canvas {
-  display: block;
-}
-
-body {
-  text-rendering: optimizeLegibility;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-ul,
-ol {
-  list-style: none;
-}
-
-// 数据列表 样式
-.table-alert {
-  margin-bottom: 16px;
-}
-
-// 数据列表 操作
-.table-operator {
-  margin-bottom: 18px;
-
-  button {
-    margin-right: 8px;
-  }
-}
-
-// 导出组件选择框
-#export-checkbox-group .ant-checkbox-group-item {
-  box-sizing: border-box;
-  width: 33.33333333%;
-  min-height: 1px;
-  font-weight: 700;
-  margin: 2px 0;
-}
-
-// 数据列表 搜索条件 form表单样式
-.table-page-search-wrapper {
-
-  .ant-form-inline {
-    .ant-form-item {
-      display: flex;
-      margin-top: 12px;
-
-      .ant-form-item-control-wrapper {
-        flex: 1 1;
-        display: inline-block;
-        vertical-align: middle;
-      }
-
-      > .ant-form-item-label {
-        line-height: 32px;
-        padding-right: 8px;
-        width: auto;
-        // 保留lable文本中的空格和换行
-        > label {
-          white-space: pre;
-        }
-      }
-
-      .ant-form-item-control {
-        height: 32px;
-        line-height: 32px;
-      }
-    }
-  }
-
-  // 日期选择框的样式
-  .ant-calendar-picker {
-    min-width: 0;
-    width: 100% !important;
-  }
-
-  .table-page-search-submitButtons {
-    display: block;
-    margin: 12px 0;
-    float: right;
-    white-space: nowrap;
-    // 按钮间隔
-    .detailed-condition ~ button {
-      margin-left: 8px
-    }
-  }
-}
-
-.ant-checkbox-inner, .ant-checkbox-input, .ant-checkbox {
-  width: 20px;
-  height: 20px;
-}
-
-.el-checkbox__inner {
-  width: 16px !important;
-  height: 16px !important;
-  margin-top: 1px;
-}
-
-.el-checkbox__inner::after {
-  height: 9px !important;
-  left: 5px !important;
-}
-.el-checkbox__inner::before {
-  top: 6px !important;
-}
-
-.el-checkbox__input .is-checked {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-.ant-layout-footer {
-  display: none;
-}
-
-@media (max-width: @screen-xs) {
-  .ant-table {
-    width: 100%;
-    overflow-x: auto;
-
-    &-thead > tr,
-    &-tbody > tr {
-      > th,
-      > td {
-        white-space: pre;
-
-        > span {
-          display: block;
-        }
-      }
-    }
-  }
-}
+@import '~ant-design-vue/es/style/themes/default.less';
+
+html,
+body,
+#app, #root {
+  height: 100%;
+}
+
+.height-fill {
+  height: 100%;
+}
+
+.bg-white {
+  background: #fff;
+}
+
+.colorWeak {
+  filter: invert(80%);
+}
+
+.ant-layout.layout-basic {
+  height: 100vh;
+  min-height: 100vh;
+}
+
+canvas {
+  display: block;
+}
+
+body {
+  text-rendering: optimizeLegibility;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+ul,
+ol {
+  list-style: none;
+}
+
+// 数据列表 样式
+.table-alert {
+  margin-bottom: 16px;
+}
+
+// 数据列表 操作
+.table-operator {
+  margin-bottom: 18px;
+
+  button {
+    margin-right: 8px;
+  }
+}
+
+// 导出组件选择框
+#export-checkbox-group .ant-checkbox-group-item {
+  box-sizing: border-box;
+  width: 33.33333333%;
+  min-height: 1px;
+  font-weight: 700;
+  margin: 2px 0;
+}
+
+// 数据列表 搜索条件 form表单样式
+.table-page-search-wrapper {
+
+  .ant-form-inline {
+    .ant-form-item {
+      display: flex;
+      margin-top: 12px;
+
+      .ant-form-item-control-wrapper {
+        flex: 1 1;
+        display: inline-block;
+        vertical-align: middle;
+      }
+
+      > .ant-form-item-label {
+        line-height: 32px;
+        padding-right: 8px;
+        width: auto;
+        // 保留lable文本中的空格和换行
+        > label {
+          white-space: pre;
+        }
+      }
+
+      .ant-form-item-control {
+        height: 32px;
+        line-height: 32px;
+      }
+    }
+  }
+
+  // 日期选择框的样式
+  .ant-calendar-picker {
+    min-width: 0;
+    width: 100% !important;
+  }
+
+  .table-page-search-submitButtons {
+    display: block;
+    margin: 12px 0;
+    float: right;
+    white-space: nowrap;
+    // 按钮间隔
+    .detailed-condition ~ button {
+      margin-left: 8px
+    }
+  }
+}
+
+.ant-checkbox-inner, .ant-checkbox-input, .ant-checkbox {
+  width: 20px;
+  height: 20px;
+}
+
+.el-checkbox__inner {
+  width: 16px !important;
+  height: 16px !important;
+  margin-top: 1px;
+}
+
+.el-checkbox__inner::after {
+  height: 9px !important;
+  left: 5px !important;
+}
+.el-checkbox__inner::before {
+  top: 6px !important;
+}
+
+.el-checkbox__input .is-checked {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.ant-layout-footer {
+  display: none;
+}
+
+@media (max-width: @screen-xs) {
+  .ant-table {
+    width: 100%;
+    overflow-x: auto;
+
+    &-thead > tr,
+    &-tbody > tr {
+      > th,
+      > td {
+        white-space: pre;
+
+        > span {
+          display: block;
+        }
+      }
+    }
+  }
+}

package/src/utils/authority-utils.js

@@ -1,85 +1,85 @@
-/**
- * 判断是否有路由的权限
- * @param authority 路由权限配置
- * @param permissions 用户权限集合
- * @returns {boolean|*}
- */
-function hasPermission (authority, permissions) {
-  let required = '*'
-  if (typeof authority === 'string') {
-    required = authority
-  } else if (Array.isArray(authority)) {
-    required = authority
-  } else if (typeof authority === 'object') {
-    required = authority.permission
-  }
-  return required === '*' || hasAnyItem(required, permissions, (r, t) => !!(r === t || r === t.id))
-}
-
-/**
- * 判断是否有路由需要的角色
- * @param authority 路由权限配置
- * @param roles 用户角色集合
- */
-function hasRole (authority, roles) {
-  let required
-  if (typeof authority === 'object') {
-    required = authority.role
-  }
-  return authority === '*' || hasAnyItem(required, roles, (r, t) => !!(r === t || r === t.id))
-}
-
-/**
- * 判断目标数组是否有所需元素
- * @param {String | String[]}required 所需元素，数组或单个元素
- * @param {String[]|Object[]} source 目标数组
- * @param {Function} filter 匹配条件
- * (r: String, s: String|Object) => boolean
- * @returns {boolean}
- */
-function hasAnyItem (required, source, filter) {
-  if (!required) {
-    return false
-  }
-  const checkedList = Array.isArray(required) ? required : [required]
-  return !!source.find(s => checkedList.find(r => filter(r, s)))
-}
-
-/**
- * 路由权限校验
- * @param route 路由
- * @param permissions 用户权限集合
- * @param roles 用户角色集合
- * @returns {boolean}
- */
-function hasAuthority (route, permissions, roles) {
-  const authorities = [...route.meta.pAuthorities, route.meta.authority]
-  for (const authority of authorities) {
-    if (!hasPermission(authority, permissions) && !hasRole(authority, roles)) {
-      return false
-    }
-  }
-  return true
-}
-
-/**
- * 根据权限配置过滤菜单数据
- * @param menuData
- * @param permissions
- * @param roles
- */
-function filterMenu (menuData, permissions, roles) {
-  return menuData.filter(menu => {
-    if (menu.meta && menu.meta.invisible === undefined) {
-      if (!hasAuthority(menu, permissions, roles)) {
-        return false
-      }
-    }
-    if (menu.children && menu.children.length > 0) {
-      menu.children = filterMenu(menu.children, permissions, roles)
-    }
-    return true
-  })
-}
-
-export { filterMenu, hasAuthority }
+/**
+ * 判断是否有路由的权限
+ * @param authority 路由权限配置
+ * @param permissions 用户权限集合
+ * @returns {boolean|*}
+ */
+function hasPermission (authority, permissions) {
+  let required = '*'
+  if (typeof authority === 'string') {
+    required = authority
+  } else if (Array.isArray(authority)) {
+    required = authority
+  } else if (typeof authority === 'object') {
+    required = authority.permission
+  }
+  return required === '*' || hasAnyItem(required, permissions, (r, t) => !!(r === t || r === t.id))
+}
+
+/**
+ * 判断是否有路由需要的角色
+ * @param authority 路由权限配置
+ * @param roles 用户角色集合
+ */
+function hasRole (authority, roles) {
+  let required
+  if (typeof authority === 'object') {
+    required = authority.role
+  }
+  return authority === '*' || hasAnyItem(required, roles, (r, t) => !!(r === t || r === t.id))
+}
+
+/**
+ * 判断目标数组是否有所需元素
+ * @param {String | String[]}required 所需元素，数组或单个元素
+ * @param {String[]|Object[]} source 目标数组
+ * @param {Function} filter 匹配条件
+ * (r: String, s: String|Object) => boolean
+ * @returns {boolean}
+ */
+function hasAnyItem (required, source, filter) {
+  if (!required) {
+    return false
+  }
+  const checkedList = Array.isArray(required) ? required : [required]
+  return !!source.find(s => checkedList.find(r => filter(r, s)))
+}
+
+/**
+ * 路由权限校验
+ * @param route 路由
+ * @param permissions 用户权限集合
+ * @param roles 用户角色集合
+ * @returns {boolean}
+ */
+function hasAuthority (route, permissions, roles) {
+  const authorities = [...route.meta.pAuthorities, route.meta.authority]
+  for (const authority of authorities) {
+    if (!hasPermission(authority, permissions) && !hasRole(authority, roles)) {
+      return false
+    }
+  }
+  return true
+}
+
+/**
+ * 根据权限配置过滤菜单数据
+ * @param menuData
+ * @param permissions
+ * @param roles
+ */
+function filterMenu (menuData, permissions, roles) {
+  return menuData.filter(menu => {
+    if (menu.meta && menu.meta.invisible === undefined) {
+      if (!hasAuthority(menu, permissions, roles)) {
+        return false
+      }
+    }
+    if (menu.children && menu.children.length > 0) {
+      menu.children = filterMenu(menu.children, permissions, roles)
+    }
+    return true
+  })
+}
+
+export { filterMenu, hasAuthority }

package/src/utils/errorCode.js

@@ -1,6 +1,6 @@
-export default {
-  401: '认证失败，无法访问系统资源',
-  403: '当前操作没有权限',
-  404: '访问资源不存在',
-  default: '系统未知错误，请反馈给管理员'
-}
+export default {
+  401: '认证失败，无法访问系统资源',
+  403: '当前操作没有权限',
+  404: '访问资源不存在',
+  default: '系统未知错误，请反馈给管理员'
+}