vue2-client 1.15.87 → 1.15.89

package/src/base-client/plugins/__tests__/selectValueTypeHelper.test.js

@@ -1,154 +1,154 @@
-/**
- * selectValueTypeHelper 工具函数测试
- */
-import {
-  processOptionsForValueType,
-  findLabelByValue,
-  processBothModeData,
-  processLabelModeData,
-  getOriginValue
-} from '../selectValueTypeHelper'
-
-describe('selectValueTypeHelper', () => {
-  const mockOptions = [
-    { value: '1', label: '选项1' },
-    { value: '2', label: '选项2' },
-    { key: 'key1', title: '标题1' },
-    { value: 'val1', text: '文本1' }
-  ]
-
-  const mockTreeOptions = [
-    {
-      value: 'parent1',
-      label: '父级1',
-      children: [
-        { value: 'child1', label: '子级1' },
-        { value: 'child2', label: '子级2' }
-      ]
-    }
-  ]
-
-  describe('processOptionsForValueType', () => {
-    test('value模式应该返回原始数据', () => {
-      const result = processOptionsForValueType(mockOptions, 'value')
-      expect(result).toEqual(mockOptions)
-    })
-
-    test('label模式应该交换value和label', () => {
-      const result = processOptionsForValueType(mockOptions, 'label')
-      expect(result[0]).toEqual({
-        value: '选项1',
-        label: '选项1',
-        originValue: '1'
-      })
-    })
-
-    test('both模式应该返回原始数据', () => {
-      const result = processOptionsForValueType(mockOptions, 'both')
-      expect(result).toEqual(mockOptions)
-    })
-
-    test('应该处理树形结构', () => {
-      const result = processOptionsForValueType(mockTreeOptions, 'label')
-      expect(result[0].children[0]).toEqual({
-        value: '子级1',
-        label: '子级1',
-        originValue: 'child1'
-      })
-    })
-  })
-
-  describe('findLabelByValue', () => {
-    test('应该找到对应的label', () => {
-      const result = findLabelByValue('1', mockOptions)
-      expect(result).toBe('选项1')
-    })
-
-    test('应该处理数组值（多选）', () => {
-      const result = findLabelByValue(['1', '2'], mockOptions)
-      expect(result).toEqual(['选项1', '选项2'])
-    })
-
-    test('找不到时应该返回原值', () => {
-      const result = findLabelByValue('notfound', mockOptions)
-      expect(result).toBe('notfound')
-    })
-
-    test('应该处理null和undefined', () => {
-      expect(findLabelByValue(null, mockOptions)).toBeNull()
-      expect(findLabelByValue(undefined, mockOptions)).toBeNull()
-    })
-  })
-
-  describe('processBothModeData', () => {
-    test('应该在labelData中创建label字段', () => {
-      const form = { status: '1' }
-      const mockSetField = jest.fn()
-
-      processBothModeData(form, 'status', '1', mockOptions, mockSetField)
-
-      expect(mockSetField).toHaveBeenCalledWith(form, 'labelData', {})
-      expect(mockSetField).toHaveBeenCalledWith(form.labelData, 'status', '选项1')
-    })
-
-    test('当labelData已存在时不应该重复创建', () => {
-      const form = { status: '1', labelData: {} }
-      const mockSetField = jest.fn()
-
-      processBothModeData(form, 'status', '1', mockOptions, mockSetField)
-
-      expect(mockSetField).toHaveBeenCalledWith(form.labelData, 'status', '选项1')
-      expect(mockSetField).toHaveBeenCalledTimes(1)
-    })
-  })
-
-  describe('processLabelModeData', () => {
-    test('应该在originData中创建原始值字段', () => {
-      const labelModeOptions = [
-        { value: '选项1', originValue: '1', label: '选项1' }
-      ]
-      const form = { status: '选项1' }
-      const mockSetField = jest.fn()
-
-      processLabelModeData(form, 'status', '选项1', labelModeOptions, mockSetField)
-
-      expect(mockSetField).toHaveBeenCalledWith(form, 'originData', {})
-      expect(mockSetField).toHaveBeenCalledWith(form.originData, 'status', '1')
-    })
-
-    test('当originData已存在时不应该重复创建', () => {
-      const labelModeOptions = [
-        { value: '选项1', originValue: '1', label: '选项1' }
-      ]
-      const form = { status: '选项1', originData: {} }
-      const mockSetField = jest.fn()
-
-      processLabelModeData(form, 'status', '选项1', labelModeOptions, mockSetField)
-
-      expect(mockSetField).toHaveBeenCalledWith(form.originData, 'status', '1')
-      expect(mockSetField).toHaveBeenCalledTimes(1)
-    })
-  })
-
-  describe('getOriginValue', () => {
-    const labelModeOptions = [
-      { value: '选项1', originValue: '1', label: '选项1' },
-      { value: '选项2', originValue: '2', label: '选项2' }
-    ]
-
-    test('应该获取原始值', () => {
-      const result = getOriginValue('选项1', labelModeOptions)
-      expect(result).toBe('1')
-    })
-
-    test('应该处理数组值', () => {
-      const result = getOriginValue(['选项1', '选项2'], labelModeOptions)
-      expect(result).toEqual(['1', '2'])
-    })
-
-    test('没有originValue时应该返回原值', () => {
-      const result = getOriginValue('test', mockOptions)
-      expect(result).toBe('test')
-    })
-  })
-})
+/**
+ * selectValueTypeHelper 工具函数测试
+ */
+import {
+  processOptionsForValueType,
+  findLabelByValue,
+  processBothModeData,
+  processLabelModeData,
+  getOriginValue
+} from '../selectValueTypeHelper'
+
+describe('selectValueTypeHelper', () => {
+  const mockOptions = [
+    { value: '1', label: '选项1' },
+    { value: '2', label: '选项2' },
+    { key: 'key1', title: '标题1' },
+    { value: 'val1', text: '文本1' }
+  ]
+
+  const mockTreeOptions = [
+    {
+      value: 'parent1',
+      label: '父级1',
+      children: [
+        { value: 'child1', label: '子级1' },
+        { value: 'child2', label: '子级2' }
+      ]
+    }
+  ]
+
+  describe('processOptionsForValueType', () => {
+    test('value模式应该返回原始数据', () => {
+      const result = processOptionsForValueType(mockOptions, 'value')
+      expect(result).toEqual(mockOptions)
+    })
+
+    test('label模式应该交换value和label', () => {
+      const result = processOptionsForValueType(mockOptions, 'label')
+      expect(result[0]).toEqual({
+        value: '选项1',
+        label: '选项1',
+        originValue: '1'
+      })
+    })
+
+    test('both模式应该返回原始数据', () => {
+      const result = processOptionsForValueType(mockOptions, 'both')
+      expect(result).toEqual(mockOptions)
+    })
+
+    test('应该处理树形结构', () => {
+      const result = processOptionsForValueType(mockTreeOptions, 'label')
+      expect(result[0].children[0]).toEqual({
+        value: '子级1',
+        label: '子级1',
+        originValue: 'child1'
+      })
+    })
+  })
+
+  describe('findLabelByValue', () => {
+    test('应该找到对应的label', () => {
+      const result = findLabelByValue('1', mockOptions)
+      expect(result).toBe('选项1')
+    })
+
+    test('应该处理数组值（多选）', () => {
+      const result = findLabelByValue(['1', '2'], mockOptions)
+      expect(result).toEqual(['选项1', '选项2'])
+    })
+
+    test('找不到时应该返回原值', () => {
+      const result = findLabelByValue('notfound', mockOptions)
+      expect(result).toBe('notfound')
+    })
+
+    test('应该处理null和undefined', () => {
+      expect(findLabelByValue(null, mockOptions)).toBeNull()
+      expect(findLabelByValue(undefined, mockOptions)).toBeNull()
+    })
+  })
+
+  describe('processBothModeData', () => {
+    test('应该在labelData中创建label字段', () => {
+      const form = { status: '1' }
+      const mockSetField = jest.fn()
+
+      processBothModeData(form, 'status', '1', mockOptions, mockSetField)
+
+      expect(mockSetField).toHaveBeenCalledWith(form, 'labelData', {})
+      expect(mockSetField).toHaveBeenCalledWith(form.labelData, 'status', '选项1')
+    })
+
+    test('当labelData已存在时不应该重复创建', () => {
+      const form = { status: '1', labelData: {} }
+      const mockSetField = jest.fn()
+
+      processBothModeData(form, 'status', '1', mockOptions, mockSetField)
+
+      expect(mockSetField).toHaveBeenCalledWith(form.labelData, 'status', '选项1')
+      expect(mockSetField).toHaveBeenCalledTimes(1)
+    })
+  })
+
+  describe('processLabelModeData', () => {
+    test('应该在originData中创建原始值字段', () => {
+      const labelModeOptions = [
+        { value: '选项1', originValue: '1', label: '选项1' }
+      ]
+      const form = { status: '选项1' }
+      const mockSetField = jest.fn()
+
+      processLabelModeData(form, 'status', '选项1', labelModeOptions, mockSetField)
+
+      expect(mockSetField).toHaveBeenCalledWith(form, 'originData', {})
+      expect(mockSetField).toHaveBeenCalledWith(form.originData, 'status', '1')
+    })
+
+    test('当originData已存在时不应该重复创建', () => {
+      const labelModeOptions = [
+        { value: '选项1', originValue: '1', label: '选项1' }
+      ]
+      const form = { status: '选项1', originData: {} }
+      const mockSetField = jest.fn()
+
+      processLabelModeData(form, 'status', '选项1', labelModeOptions, mockSetField)
+
+      expect(mockSetField).toHaveBeenCalledWith(form.originData, 'status', '1')
+      expect(mockSetField).toHaveBeenCalledTimes(1)
+    })
+  })
+
+  describe('getOriginValue', () => {
+    const labelModeOptions = [
+      { value: '选项1', originValue: '1', label: '选项1' },
+      { value: '选项2', originValue: '2', label: '选项2' }
+    ]
+
+    test('应该获取原始值', () => {
+      const result = getOriginValue('选项1', labelModeOptions)
+      expect(result).toBe('1')
+    })
+
+    test('应该处理数组值', () => {
+      const result = getOriginValue(['选项1', '选项2'], labelModeOptions)
+      expect(result).toEqual(['1', '2'])
+    })
+
+    test('没有originValue时应该返回原值', () => {
+      const result = getOriginValue('test', mockOptions)
+      expect(result).toBe('test')
+    })
+  })
+})

package/src/base-client/plugins/authority-plugin.js

@@ -1,167 +1,167 @@
-/**
- * 获取路由需要的权限
- * @param permissions
- * @param route
- * @returns {Permission}
- */
-const getRoutePermission = (permissions, route) => permissions.find(item => item.id === route.meta.authority.permission)
-/**
- * 获取路由需要的角色
- * @param roles
- * @param route
- * @returns {Array[Role]}
- */
-const getRouteRole = (roles, route) => {
-  const requiredRoles = route.meta.authority.role
-  return requiredRoles ? roles.filter(item => requiredRoles.findIndex(required => required === item.id) !== -1) : []
-}
-/**
- * 判断是否已为方法注入权限认证
- * @param method
- * @returns {boolean}
- */
-const hasInjected = (method) => method.toString().indexOf('//--auth-inject') !== -1
-
-/**
- * 操作权限校验
- * @param authConfig
- * @param permission
- * @param role
- * @param permissions
- * @param roles
- * @returns {boolean}
- */
-const auth = function (authConfig, permission, role, permissions, roles) {
-  const { check, type } = authConfig
-  if (check && typeof check === 'function') {
-    return check.apply(this, [permission, role, permissions, roles])
-  }
-  if (type === 'permission') {
-    return checkFromPermission(check, permission)
-  } else if (type === 'role') {
-    return checkFromRoles(check, role)
-  } else {
-    return checkFromPermission(check, permission) || checkFromRoles(check, role)
-  }
-}
-
-/**
- * 检查权限是否有操作权限
- * @param check 需要检查的操作权限
- * @param permission 权限
- * @returns {boolean}
- */
-const checkFromPermission = function (check, permission) {
-  return permission && permission.operation && permission.operation.indexOf(check) !== -1
-}
-
-/**
- * 检查 roles 是否有操作权限
- * @param check 需要检查的操作权限
- * @param roles 角色数组
- * @returns {boolean}
- */
-const checkFromRoles = function (check, roles) {
-  if (!roles) {
-    return false
-  }
-  for (const role of roles) {
-    const { operation } = role
-    if (operation && operation.indexOf(check) !== -1) {
-      return true
-    }
-  }
-  return false
-}
-
-const checkInject = function (el, binding, vnode) {
-  const type = binding.arg
-  const check = binding.value
-  const instance = vnode.context
-  const $auth = instance.$auth
-  if (!$auth || !$auth(check, type)) {
-    addDisabled(el)
-  } else {
-    removeDisabled(el)
-  }
-}
-
-const addDisabled = function (el) {
-  if (el.tagName === 'BUTTON') {
-    el.disabled = true
-  } else {
-    el.classList.add('disabled')
-  }
-  el.setAttribute('title', '无此权限')
-}
-
-const removeDisabled = function (el) {
-  el.disabled = false
-  el.classList.remove('disabled')
-  el.removeAttribute('title')
-}
-
-const AuthorityPlugin = {
-  install (Vue) {
-    Vue.directive('auth', {
-      bind (el, binding, vnode) {
-        setTimeout(() => checkInject(el, binding, vnode), 10)
-      },
-      componentUpdated (el, binding, vnode) {
-        setTimeout(() => checkInject(el, binding, vnode), 10)
-      },
-      unbind (el) {
-        removeDisabled(el)
-      }
-    })
-    Vue.mixin({
-      beforeCreate () {
-        if (this.$options.authorize) {
-          const authorize = this.$options.authorize
-          Object.keys(authorize).forEach(key => {
-            if (this.$options.methods[key]) {
-              const method = this.$options.methods[key]
-              if (!hasInjected(method)) {
-                let authConfig = authorize[key]
-                authConfig = (typeof authConfig === 'string') ? { check: authConfig } : authConfig
-                const { check, type, onFailure } = authConfig
-                this.$options.methods[key] = function () {
-                  // --auth-inject
-                  if (this.$auth(check, type)) {
-                    return method.apply(this, arguments)
-                  } else {
-                    if (onFailure && typeof onFailure === 'function') {
-                      this[`$${check}Failure`] = onFailure
-                      return this[`$${check}Failure`](check)
-                    } else {
-                      this.$message.error(`对不起，您没有操作权限：${check}`)
-                    }
-                    return 0
-                  }
-                }
-              }
-            }
-          })
-        }
-      },
-      methods: {
-        /**
-         * 操作权限校验
-         * @param check 需要校验的操作名
-         * @param type 校验类型，通过 permission 校验，还是通过 role 校验。
-         * 如未设置，则自动识别，如匹配到当前路由 permission 则 type = permission，否则 type = role
-         * @returns {boolean} 是否校验通过
-         */
-        $auth (check, type) {
-          const permissions = this.$store.getters['account/permissions']
-          const roles = this.$store.getters['account/roles']
-          const permission = getRoutePermission(permissions, this.$route)
-          const role = getRouteRole(roles, this.$route)
-          return auth.apply(this, [{ check, type }, permission, role, permissions, roles])
-        }
-      }
-    })
-  }
-}
-
-export default AuthorityPlugin
+/**
+ * 获取路由需要的权限
+ * @param permissions
+ * @param route
+ * @returns {Permission}
+ */
+const getRoutePermission = (permissions, route) => permissions.find(item => item.id === route.meta.authority.permission)
+/**
+ * 获取路由需要的角色
+ * @param roles
+ * @param route
+ * @returns {Array[Role]}
+ */
+const getRouteRole = (roles, route) => {
+  const requiredRoles = route.meta.authority.role
+  return requiredRoles ? roles.filter(item => requiredRoles.findIndex(required => required === item.id) !== -1) : []
+}
+/**
+ * 判断是否已为方法注入权限认证
+ * @param method
+ * @returns {boolean}
+ */
+const hasInjected = (method) => method.toString().indexOf('//--auth-inject') !== -1
+
+/**
+ * 操作权限校验
+ * @param authConfig
+ * @param permission
+ * @param role
+ * @param permissions
+ * @param roles
+ * @returns {boolean}
+ */
+const auth = function (authConfig, permission, role, permissions, roles) {
+  const { check, type } = authConfig
+  if (check && typeof check === 'function') {
+    return check.apply(this, [permission, role, permissions, roles])
+  }
+  if (type === 'permission') {
+    return checkFromPermission(check, permission)
+  } else if (type === 'role') {
+    return checkFromRoles(check, role)
+  } else {
+    return checkFromPermission(check, permission) || checkFromRoles(check, role)
+  }
+}
+
+/**
+ * 检查权限是否有操作权限
+ * @param check 需要检查的操作权限
+ * @param permission 权限
+ * @returns {boolean}
+ */
+const checkFromPermission = function (check, permission) {
+  return permission && permission.operation && permission.operation.indexOf(check) !== -1
+}
+
+/**
+ * 检查 roles 是否有操作权限
+ * @param check 需要检查的操作权限
+ * @param roles 角色数组
+ * @returns {boolean}
+ */
+const checkFromRoles = function (check, roles) {
+  if (!roles) {
+    return false
+  }
+  for (const role of roles) {
+    const { operation } = role
+    if (operation && operation.indexOf(check) !== -1) {
+      return true
+    }
+  }
+  return false
+}
+
+const checkInject = function (el, binding, vnode) {
+  const type = binding.arg
+  const check = binding.value
+  const instance = vnode.context
+  const $auth = instance.$auth
+  if (!$auth || !$auth(check, type)) {
+    addDisabled(el)
+  } else {
+    removeDisabled(el)
+  }
+}
+
+const addDisabled = function (el) {
+  if (el.tagName === 'BUTTON') {
+    el.disabled = true
+  } else {
+    el.classList.add('disabled')
+  }
+  el.setAttribute('title', '无此权限')
+}
+
+const removeDisabled = function (el) {
+  el.disabled = false
+  el.classList.remove('disabled')
+  el.removeAttribute('title')
+}
+
+const AuthorityPlugin = {
+  install (Vue) {
+    Vue.directive('auth', {
+      bind (el, binding, vnode) {
+        setTimeout(() => checkInject(el, binding, vnode), 10)
+      },
+      componentUpdated (el, binding, vnode) {
+        setTimeout(() => checkInject(el, binding, vnode), 10)
+      },
+      unbind (el) {
+        removeDisabled(el)
+      }
+    })
+    Vue.mixin({
+      beforeCreate () {
+        if (this.$options.authorize) {
+          const authorize = this.$options.authorize
+          Object.keys(authorize).forEach(key => {
+            if (this.$options.methods[key]) {
+              const method = this.$options.methods[key]
+              if (!hasInjected(method)) {
+                let authConfig = authorize[key]
+                authConfig = (typeof authConfig === 'string') ? { check: authConfig } : authConfig
+                const { check, type, onFailure } = authConfig
+                this.$options.methods[key] = function () {
+                  // --auth-inject
+                  if (this.$auth(check, type)) {
+                    return method.apply(this, arguments)
+                  } else {
+                    if (onFailure && typeof onFailure === 'function') {
+                      this[`$${check}Failure`] = onFailure
+                      return this[`$${check}Failure`](check)
+                    } else {
+                      this.$message.error(`对不起，您没有操作权限：${check}`)
+                    }
+                    return 0
+                  }
+                }
+              }
+            }
+          })
+        }
+      },
+      methods: {
+        /**
+         * 操作权限校验
+         * @param check 需要校验的操作名
+         * @param type 校验类型，通过 permission 校验，还是通过 role 校验。
+         * 如未设置，则自动识别，如匹配到当前路由 permission 则 type = permission，否则 type = role
+         * @returns {boolean} 是否校验通过
+         */
+        $auth (check, type) {
+          const permissions = this.$store.getters['account/permissions']
+          const roles = this.$store.getters['account/roles']
+          const permission = getRoutePermission(permissions, this.$route)
+          const role = getRouteRole(roles, this.$route)
+          return auth.apply(this, [{ check, type }, permission, role, permissions, roles])
+        }
+      }
+    })
+  }
+}
+
+export default AuthorityPlugin