vue2-client 1.15.87 → 1.15.88

package/src/services/dataSource.js

@@ -1,12 +1,12 @@
-import { GOODS, GOODS_COLUMNS } from './api'
-import { METHOD, request } from '@vue2-client/utils/request'
-
-export async function goodsList (params) {
-  return request(GOODS, METHOD.GET, params)
-}
-
-export async function goodsColumns () {
-  return request(GOODS_COLUMNS, METHOD.GET)
-}
-
-export default { goodsList, goodsColumns }
+import { GOODS, GOODS_COLUMNS } from './api'
+import { METHOD, request } from '@vue2-client/utils/request'
+
+export async function goodsList (params) {
+  return request(GOODS, METHOD.GET, params)
+}
+
+export async function goodsColumns () {
+  return request(GOODS_COLUMNS, METHOD.GET)
+}
+
+export default { goodsList, goodsColumns }

package/src/services/index.js

@@ -1,7 +1,7 @@
-import userService from './user'
-import dataSource from './dataSource'
-
-export {
-  userService,
-  dataSource
-}
+import userService from './user'
+import dataSource from './dataSource'
+
+export {
+  userService,
+  dataSource
+}

package/src/services/user.js

@@ -1,92 +1,92 @@
-import {
-  LOGIN,
-  MODIFY_PASSWORD,
-  ROUTES,
-  V4_GET_INFO,
-  V4_LOGIN,
-  V4_LOGOUT
-} from '@vue2-client/services/apiService'
-import { request, METHOD, removeAuthorization } from '@vue2-client/utils/request'
-import EncryptUtil from '@vue2-client/utils/EncryptUtil'
-import axios from 'axios'
-import { V4_SESSION_KEY } from '@vue2-client/store/mutation-types'
-
-/**
- * 登录服务
- * @param name 账户名
- * @param password 账户密码
- * @returns {Promise<AxiosResponse<T>>}
- */
-export async function login (name, password) {
-  let data = {
-    name: name,
-    password: password
-  }
-  data = '$' + EncryptUtil.RSAEncrypt(JSON.stringify(data))
-  return request(LOGIN, METHOD.POST, data)
-}
-
-export async function modifyPassword (name, password, newPassword) {
-  return request(MODIFY_PASSWORD, METHOD.POST, {
-    data: {
-      ename: name,
-      password: password,
-      newpassword: newPassword,
-      affirmpassword: newPassword
-    }
-  })
-}
-
-export async function V4Login (name, password, routeName) {
-  return request(V4_LOGIN, METHOD.POST, {
-    username: name,
-    password: password,
-    resourceName: routeName
-  })
-}
-
-export async function V4RefreshToken () {
-  const { AESDecrypt } = EncryptUtil
-  const info = AESDecrypt(localStorage.getItem('SinglePage_TOKEN'), '3KMKqvgwR8ULbR8Z')
-  return axios.post(V4_LOGIN, {
-    username: info.name,
-    password: info.password,
-    resourceName: '智慧燃气'
-  })
-}
-
-export async function V4GetInfo () {
-  return request(V4_GET_INFO, METHOD.POST, {})
-}
-
-export async function getRoutesConfig (value, routeName = '智慧燃气') {
-  return request(ROUTES + '/' + routeName, METHOD.POST, value)
-}
-
-/**
- * 退出登录
- */
-export function logout () {
-  if (window.__MICRO_APP_ENVIRONMENT__) {
-    window.microApp.dispatch({ type: 'logout' })
-  }
-  return new Promise((resolve, reject) => {
-    request(V4_LOGOUT, METHOD.DELETE, {}).then(() => {
-      resolve()
-    }).catch(error => {
-      reject(error)
-    }).finally(() => {
-      localStorage.removeItem(process.env.VUE_APP_ROUTES_KEY)
-      localStorage.removeItem(process.env.VUE_APP_PERMISSIONS_KEY)
-      localStorage.removeItem(process.env.VUE_APP_ROLES_KEY)
-      localStorage.removeItem(V4_SESSION_KEY)
-      removeAuthorization()
-    })
-  })
-}
-export default {
-  login,
-  logout,
-  getRoutesConfig,
-  V4RefreshToken
-}
+import {
+  LOGIN,
+  MODIFY_PASSWORD,
+  ROUTES,
+  V4_GET_INFO,
+  V4_LOGIN,
+  V4_LOGOUT
+} from '@vue2-client/services/apiService'
+import { request, METHOD, removeAuthorization } from '@vue2-client/utils/request'
+import EncryptUtil from '@vue2-client/utils/EncryptUtil'
+import axios from 'axios'
+import { V4_SESSION_KEY } from '@vue2-client/store/mutation-types'
+
+/**
+ * 登录服务
+ * @param name 账户名
+ * @param password 账户密码
+ * @returns {Promise<AxiosResponse<T>>}
+ */
+export async function login (name, password) {
+  let data = {
+    name: name,
+    password: password
+  }
+  data = '$' + EncryptUtil.RSAEncrypt(JSON.stringify(data))
+  return request(LOGIN, METHOD.POST, data)
+}
+
+export async function modifyPassword (name, password, newPassword) {
+  return request(MODIFY_PASSWORD, METHOD.POST, {
+    data: {
+      ename: name,
+      password: password,
+      newpassword: newPassword,
+      affirmpassword: newPassword
+    }
+  })
+}
+
+export async function V4Login (name, password, routeName) {
+  return request(V4_LOGIN, METHOD.POST, {
+    username: name,
+    password: password,
+    resourceName: routeName
+  })
+}
+
+export async function V4RefreshToken () {
+  const { AESDecrypt } = EncryptUtil
+  const info = AESDecrypt(localStorage.getItem('SinglePage_TOKEN'), '3KMKqvgwR8ULbR8Z')
+  return axios.post(V4_LOGIN, {
+    username: info.name,
+    password: info.password,
+    resourceName: '智慧燃气'
+  })
+}
+
+export async function V4GetInfo () {
+  return request(V4_GET_INFO, METHOD.POST, {})
+}
+
+export async function getRoutesConfig (value, routeName = '智慧燃气') {
+  return request(ROUTES + '/' + routeName, METHOD.POST, value)
+}
+
+/**
+ * 退出登录
+ */
+export function logout () {
+  if (window.__MICRO_APP_ENVIRONMENT__) {
+    window.microApp.dispatch({ type: 'logout' })
+  }
+  return new Promise((resolve, reject) => {
+    request(V4_LOGOUT, METHOD.DELETE, {}).then(() => {
+      resolve()
+    }).catch(error => {
+      reject(error)
+    }).finally(() => {
+      localStorage.removeItem(process.env.VUE_APP_ROUTES_KEY)
+      localStorage.removeItem(process.env.VUE_APP_PERMISSIONS_KEY)
+      localStorage.removeItem(process.env.VUE_APP_ROLES_KEY)
+      localStorage.removeItem(V4_SESSION_KEY)
+      removeAuthorization()
+    })
+  })
+}
+export default {
+  login,
+  logout,
+  getRoutesConfig,
+  V4RefreshToken
+}

package/src/services/v3Api.js

@@ -1,116 +1,116 @@
-import { METHOD, request } from '@vue2-client/utils/request'
-import { runLogic } from '@vue2-client/services/api/common'
-
-function getLeafNodes (nodes) {
-  // 确保 nodes 是数组
-  const nodeArray = Array.isArray(nodes) ? nodes : [nodes]
-  return nodeArray.reduce((leaves, node) => {
-    if (node.children && node.children.length) {
-      // 递归处理子节点并合并结果
-      leaves.push(...getLeafNodes(node.children))
-    } else {
-      // 当前节点是叶子节点时，直接加入结果
-      leaves.push(node)
-    }
-    return leaves
-  }, [])
-}
-
-function getLeafNodesByCondition (type, nodes, parent = null) {
-  // 确保 nodes 是数组
-  const nodeArray = Array.isArray(nodes) ? nodes : [nodes]
-
-  return nodeArray.reduce((leaves, node) => {
-    const isValidNode = node.resourcetype === type && node.name !== '组织机构'
-    const updatedParent = node.name === '组织机构' ? null : node.name
-
-    if (node.children && node.children.length) {
-      // 当前节点符合条件时，加入叶子节点列表
-      if (isValidNode) {
-        leaves.push({
-          ...node,
-          name: parent ? `${node.name}-${parent}` : node.name,
-        })
-      }
-      // 递归处理子节点
-      leaves.push(...getLeafNodesByCondition(type, node.children, updatedParent))
-    } else if (isValidNode) {
-      // 无子节点但符合条件时，直接加入叶子节点列表
-      leaves.push({
-        ...node,
-        name: parent ? `${node.name}-${parent}` : node.name,
-      })
-    }
-
-    return leaves
-  }, [])
-}
-
-function transformData (inputData) {
-  function transform (node) {
-    return {
-      label: node.name,
-      value: node.id,
-      f_organization_id: node.f_organization_id,
-      parentid: node.parentid || node.parentId || node.parent_id,
-      orgid: node.orgid,
-      children: node.children ? node.children.map(transform) : []
-    }
-  }
-
-  return inputData.map(transform)
-}
-
-function getResData (params, toCallback) {
-  const data = { userId: params.userid, roleName: params.roleName, filter: params.filter, filterType: params.filterType }
-  if (params.source === '获取分公司') {
-    runLogic('getOrgBySearch', data, 'af-system').then(res => toCallback(res))
-  } else if (params.source === '获取部门') {
-    runLogic('getDepBySearch', data, 'af-system').then(res => toCallback(res))
-  } else if (params.source === '获取人员') {
-    runLogic('getUserBySearch', data, 'af-system').then(res => toCallback(res))
-  } else if (params.source === '根据角色获取人员') {
-    runLogic('getUserBySearchRole', data, 'af-system').then(res => toCallback(res))
-  } else {
-    return search(params).then(res => toCallback(res))
-  }
-}
-
-export async function searchToOption (params, callback) {
-  function toCallback (res) {
-    if (res.length) {
-      if (res[0].children && res[0].children.length) {
-        if (res[0].children[0].children) {
-          callback(transformData(res[0].children[0].children))
-        } else {
-          callback(transformData(res[0].children))
-        }
-      } else {
-        callback(res[0].children)
-      }
-    } else {
-      callback(res)
-    }
-  }
-
-  await getResData(params, toCallback)
-}
-
-export async function searchToListOption (params, callback) {
-  function toCallback (res) {
-    if (params.source.includes('人员')) {
-      callback(transformData(getLeafNodes(res)))
-    } else {
-      const type = params.source.includes('公司') ? 'organization' : 'department'
-      callback(transformData(getLeafNodesByCondition(type, res)))
-    }
-  }
-
-  await getResData(params, toCallback)
-}
-
-export async function search (params) {
-  return request('/rs/search', METHOD.POST, params)
-}
-
-export default { searchToOption, search }
+import { METHOD, request } from '@vue2-client/utils/request'
+import { runLogic } from '@vue2-client/services/api/common'
+
+function getLeafNodes (nodes) {
+  // 确保 nodes 是数组
+  const nodeArray = Array.isArray(nodes) ? nodes : [nodes]
+  return nodeArray.reduce((leaves, node) => {
+    if (node.children && node.children.length) {
+      // 递归处理子节点并合并结果
+      leaves.push(...getLeafNodes(node.children))
+    } else {
+      // 当前节点是叶子节点时，直接加入结果
+      leaves.push(node)
+    }
+    return leaves
+  }, [])
+}
+
+function getLeafNodesByCondition (type, nodes, parent = null) {
+  // 确保 nodes 是数组
+  const nodeArray = Array.isArray(nodes) ? nodes : [nodes]
+
+  return nodeArray.reduce((leaves, node) => {
+    const isValidNode = node.resourcetype === type && node.name !== '组织机构'
+    const updatedParent = node.name === '组织机构' ? null : node.name
+
+    if (node.children && node.children.length) {
+      // 当前节点符合条件时，加入叶子节点列表
+      if (isValidNode) {
+        leaves.push({
+          ...node,
+          name: parent ? `${node.name}-${parent}` : node.name,
+        })
+      }
+      // 递归处理子节点
+      leaves.push(...getLeafNodesByCondition(type, node.children, updatedParent))
+    } else if (isValidNode) {
+      // 无子节点但符合条件时，直接加入叶子节点列表
+      leaves.push({
+        ...node,
+        name: parent ? `${node.name}-${parent}` : node.name,
+      })
+    }
+
+    return leaves
+  }, [])
+}
+
+function transformData (inputData) {
+  function transform (node) {
+    return {
+      label: node.name,
+      value: node.id,
+      f_organization_id: node.f_organization_id,
+      parentid: node.parentid || node.parentId || node.parent_id,
+      orgid: node.orgid,
+      children: node.children ? node.children.map(transform) : []
+    }
+  }
+
+  return inputData.map(transform)
+}
+
+function getResData (params, toCallback) {
+  const data = { userId: params.userid, roleName: params.roleName, filter: params.filter, filterType: params.filterType }
+  if (params.source === '获取分公司') {
+    runLogic('getOrgBySearch', data, 'af-system').then(res => toCallback(res))
+  } else if (params.source === '获取部门') {
+    runLogic('getDepBySearch', data, 'af-system').then(res => toCallback(res))
+  } else if (params.source === '获取人员') {
+    runLogic('getUserBySearch', data, 'af-system').then(res => toCallback(res))
+  } else if (params.source === '根据角色获取人员') {
+    runLogic('getUserBySearchRole', data, 'af-system').then(res => toCallback(res))
+  } else {
+    return search(params).then(res => toCallback(res))
+  }
+}
+
+export async function searchToOption (params, callback) {
+  function toCallback (res) {
+    if (res.length) {
+      if (res[0].children && res[0].children.length) {
+        if (res[0].children[0].children) {
+          callback(transformData(res[0].children[0].children))
+        } else {
+          callback(transformData(res[0].children))
+        }
+      } else {
+        callback(res[0].children)
+      }
+    } else {
+      callback(res)
+    }
+  }
+
+  await getResData(params, toCallback)
+}
+
+export async function searchToListOption (params, callback) {
+  function toCallback (res) {
+    if (params.source.includes('人员')) {
+      callback(transformData(getLeafNodes(res)))
+    } else {
+      const type = params.source.includes('公司') ? 'organization' : 'department'
+      callback(transformData(getLeafNodesByCondition(type, res)))
+    }
+  }
+
+  await getResData(params, toCallback)
+}
+
+export async function search (params) {
+  return request('/rs/search', METHOD.POST, params)
+}
+
+export default { searchToOption, search }

package/src/store/index.js

@@ -1,5 +1,5 @@
-import modules from './modules'
-
-export {
-  modules
-}
+import modules from './modules'
+
+export {
+  modules
+}

package/src/store/mutation-types.js

@@ -1,4 +1,4 @@
-export const ACCESS_TOKEN = 'Access-Token'
-export const V4_ACCESS_TOKEN = 'Authorization'
-export const SYSTEM_VERSION = 'systemVersion'
-export const V4_SESSION_KEY = 'v4-session-key'
+export const ACCESS_TOKEN = 'Access-Token'
+export const V4_ACCESS_TOKEN = 'Authorization'
+export const SYSTEM_VERSION = 'systemVersion'
+export const V4_SESSION_KEY = 'v4-session-key'

package/src/theme/antd/ant-menu.less

@@ -1,3 +1,3 @@
-.ant-menu-inline-collapsed-tooltip a{
-  color: @text-color-inverse;
+.ant-menu-inline-collapsed-tooltip a{
+  color: @text-color-inverse;
 }

package/src/theme/antd/ant-message.less

@@ -1,3 +1,3 @@
-.ant-message{
-  z-index: 1100;
-}
+.ant-message{
+  z-index: 1100;
+}

package/src/theme/antd/ant-table.less

@@ -1,22 +1,22 @@
-
-.ant-table-thead{
-  tr{
-    th{
-      &.ant-table-column-has-actions{
-        &.ant-table-column-has-sorters:hover{
-          background-color: @background-color-base;
-        }
-        &.ant-table-column-has-filters{
-          &:hover{
-            .anticon-filter, .anticon-filter:hover{
-              background-color: @background-color-base;
-            }
-          }
-          .anticon-filter.ant-table-filter-open{
-            background-color: @background-color-base;
-          }
-        }
-      }
-    }
-  }
-}
+
+.ant-table-thead{
+  tr{
+    th{
+      &.ant-table-column-has-actions{
+        &.ant-table-column-has-sorters:hover{
+          background-color: @background-color-base;
+        }
+        &.ant-table-column-has-filters{
+          &:hover{
+            .anticon-filter, .anticon-filter:hover{
+              background-color: @background-color-base;
+            }
+          }
+          .anticon-filter.ant-table-filter-open{
+            background-color: @background-color-base;
+          }
+        }
+      }
+    }
+  }
+}

package/src/theme/antd/ant-time-picker.less

@@ -1,3 +1,3 @@
-.ant-time-picker-panel-input{
-  background-color: @component-background;
-}
+.ant-time-picker-panel-input{
+  background-color: @component-background;
+}

package/src/theme/antd/index.less

@@ -1,4 +1,4 @@
-@import "ant-time-picker";
-@import "ant-message";
-@import "ant-table";
+@import "ant-time-picker";
+@import "ant-message";
+@import "ant-table";
 @import "ant-menu";

package/src/theme/default/color.less

@@ -1,43 +1,43 @@
-@import '~ant-design-vue/lib/style/themes/default';
-
-@gray-1: #ffffff;
-@gray-2: #fafafa;
-@gray-3: #f5f5f5;
-@gray-4: #f0f0f0;
-@gray-5: #d9d9d9;
-@gray-6: #bfbfbf;
-@gray-7: #8c8c8c;
-@gray-8: #595959;
-@gray-9: #434343;
-@gray-10: #262626;
-@gray-11: #1f1f1f;
-@gray-12: #141414;
-@gray-13: #000000;
-
-@primary-color: @primary-color;
-@success-color: @success-color;
-@warning-color: @warning-color;
-@error-color: @warning-color;
-
-@title-color: @heading-color;
-@text-color: @text-color;
-@text-color-second: @text-color-secondary;
-
-@layout-bg-color: @layout-body-background;
-@base-bg-color: @body-background;
-@hover-bg-color: rgba(0, 0, 0, 0.025);
-@border-color: @border-color-split;
-@shadow-color: @shadow-color;
-
-@text-color-inverse: @text-color-inverse;
-@hover-bg-color-light: @hover-bg-color;
-@hover-bg-color-dark: @primary-7;
-@hover-bg-color-night: rgba(255, 255, 255, 0.025);
-@header-bg-color-dark: @layout-header-background;
-
-@shadow-down: @shadow-1-down;
-@shadow-up: @shadow-1-up;
-@shadow-left: @shadow-1-left;
-@shadow-right: @shadow-1-right;
-
-@theme-list: light, dark, night;
+@import '~ant-design-vue/lib/style/themes/default';
+
+@gray-1: #ffffff;
+@gray-2: #fafafa;
+@gray-3: #f5f5f5;
+@gray-4: #f0f0f0;
+@gray-5: #d9d9d9;
+@gray-6: #bfbfbf;
+@gray-7: #8c8c8c;
+@gray-8: #595959;
+@gray-9: #434343;
+@gray-10: #262626;
+@gray-11: #1f1f1f;
+@gray-12: #141414;
+@gray-13: #000000;
+
+@primary-color: @primary-color;
+@success-color: @success-color;
+@warning-color: @warning-color;
+@error-color: @warning-color;
+
+@title-color: @heading-color;
+@text-color: @text-color;
+@text-color-second: @text-color-secondary;
+
+@layout-bg-color: @layout-body-background;
+@base-bg-color: @body-background;
+@hover-bg-color: rgba(0, 0, 0, 0.025);
+@border-color: @border-color-split;
+@shadow-color: @shadow-color;
+
+@text-color-inverse: @text-color-inverse;
+@hover-bg-color-light: @hover-bg-color;
+@hover-bg-color-dark: @primary-7;
+@hover-bg-color-night: rgba(255, 255, 255, 0.025);
+@header-bg-color-dark: @layout-header-background;
+
+@shadow-down: @shadow-1-down;
+@shadow-up: @shadow-1-up;
+@shadow-left: @shadow-1-left;
+@shadow-right: @shadow-1-right;
+
+@theme-list: light, dark, night;

package/src/theme/default/index.less

@@ -1,3 +1,3 @@
-@import "color";
-@import "style";
-@import "nprogress";
+@import "color";
+@import "style";
+@import "nprogress";