vue2-client 1.4.29 → 1.4.30

package/src/services/api/cas.js

@@ -1,70 +1,74 @@
-import { post } from '@vue2-client/services/api/restTools'
-import notification from 'ant-design-vue/lib/notification'
-import { logout } from '@vue2-client/services/user'
-import Cookie from 'js-cookie'
-
-const casApi = {
-  // 根据用户信息校验服务访问权限并生成ST
-  createSTByUserInfo: '/api/af-sso/logic/createSTByUserInfo',
-  // 根据TGC生成ST
-  createSTByTGC: '/api/af-sso/logic/createSTByTGC',
-  // 验证ST
-  serviceValidate: '/api/af-sso/logic/serviceValidate'
-}
-
-function setTGTCookie (cookie) {
-  return Cookie.set('TGT-Cookie', cookie)
-}
-function removeTGTCookie () {
-  return Cookie.remove('TGT-Cookie')
-}
-export function getTGTCookie () {
-  return Cookie.get('TGT-Cookie')
-}
-
-export function CASLoginByAuth (serviceKey) {
-  return new Promise((resolve, reject) => {
-    post(casApi.createSTByUserInfo, {
-      serviceKey: serviceKey
-    }).then(res => {
-      setTGTCookie(res.tgc)
-      resolve(res)
-    }).catch(msg => {
-      reject(msg)
-    })
-  })
-}
-
-export function CASLogin (serviceKey, ticket) {
-  // 从第三方跳转登录
-  const tgc = getTGTCookie()
-  if (tgc && !ticket) {
-    return new Promise((resolve, reject) => {
-      post(casApi.createSTByTGC, {
-        serviceKey: serviceKey,
-        tgc: tgc
-      }).then(res => {
-        resolve(res)
-      }).catch(msg => {
-        if (msg === '当前操作没有权限') {
-          removeTGTCookie()
-          notification.error({
-            message: '授权已过期，请重新登录',
-            description: '2秒后自动跳转回登陆页面'
-          })
-          logout().then(() => {
-            setTimeout(() => {
-              window.location.href = '/login?serviceKey=' + serviceKey
-            }, 1500)
-          })
-        } else {
-          reject(msg)
-        }
-      })
-    })
-  } else {
-    return CASLoginByAuth(serviceKey)
-  }
-}
-
-export default casApi
+import { post } from '@vue2-client/services/api/restTools'
+import notification from 'ant-design-vue/lib/notification'
+import { logout } from '@vue2-client/services/user'
+import Cookie from 'js-cookie'
+
+const casApi = {
+  // 根据用户信息校验服务访问权限并生成ST
+  createSTByUserInfo: '/api/af-sso/logic/createSTByUserInfo',
+  // 根据TGC生成ST
+  createSTByTGC: '/api/af-sso/logic/createSTByTGC',
+  // 验证ST
+  serviceValidate: '/api/af-sso/logic/serviceValidate'
+}
+
+function setTGTCookie (cookie) {
+  return Cookie.set('TGT-Cookie', cookie)
+}
+function removeTGTCookie () {
+  return Cookie.remove('TGT-Cookie')
+}
+export function getTGTCookie () {
+  return Cookie.get('TGT-Cookie')
+}
+
+export function CASLoginByAuth (serviceKey) {
+  return new Promise((resolve, reject) => {
+    post(casApi.createSTByUserInfo, {
+      serviceKey: serviceKey
+    }).then(res => {
+      setTGTCookie(res.tgc)
+      resolve(res)
+    }).catch(msg => {
+      reject(msg)
+    })
+  })
+}
+
+export function CASLogin (serviceKey, inner) {
+  // 从第三方跳转登录
+  const tgc = getTGTCookie()
+  if (tgc) {
+    return new Promise((resolve, reject) => {
+      post(casApi.createSTByTGC, {
+        serviceKey: serviceKey,
+        tgc: tgc
+      }).then(res => {
+        resolve(res)
+      }).catch(msg => {
+        if (msg === '当前操作没有权限') {
+          removeTGTCookie()
+          notification.error({
+            message: '授权已过期，请重新登录',
+            description: '2秒后自动跳转回登陆页面'
+          })
+          logout().then(() => {
+            setTimeout(() => {
+              if (inner) {
+                window.location.href = '/login'
+              } else {
+                window.location.href = '/login?serviceKey=' + serviceKey
+              }
+            }, 1500)
+          })
+        } else {
+          reject(msg)
+        }
+      })
+    })
+  } else {
+    return CASLoginByAuth(serviceKey)
+  }
+}
+
+export default casApi

package/src/services/api/commonTempTable.js

@@ -1,10 +1,10 @@
-const CommonTempTable = {
-  // 初始化子表
-  initApplySubTable: '/api/af-system/logic/initApplySubTable',
-  // 创建临时表，根据配置文件动态生成
-  createTempTable: '/api/af-system/logic/createTempTable',
-  // 向临时表中插入数据
-  insertDataToTempTable: '/api/af-system/logic/insertDataToTempTable'
-}
-
-export { CommonTempTable }
+const CommonTempTable = {
+  // 初始化子表
+  initApplySubTable: '/api/af-system/logic/initApplySubTable',
+  // 创建临时表，根据配置文件动态生成
+  createTempTable: '/api/af-system/logic/createTempTable',
+  // 向临时表中插入数据
+  insertDataToTempTable: '/api/af-system/logic/insertDataToTempTable'
+}
+
+export { CommonTempTable }

package/src/services/api/index.js

@@ -1,17 +1,17 @@
-import { commonApi, getColumnsJson, query, addOrModify, remove } from '@vue2-client/services/api/common'
-import { QueryParamsDetailsViewApi } from '@vue2-client/services/api/QueryParamsDetailsViewApi'
-import { DictionaryDetailsViewApi } from '@vue2-client/services/api/DictionaryDetailsViewApi'
-import { LogDetailsViewApi } from '@vue2-client/services/api/LogDetailsViewApi'
-import { manageApi } from '@vue2-client/services/api/manage'
-import { get, post } from '@vue2-client/services/api/restTools'
-import { TicketDetailsViewApi } from '@vue2-client/services/api/TicketDetailsViewApi'
-
-export {
-  commonApi, getColumnsJson, query, addOrModify, remove,
-  DictionaryDetailsViewApi,
-  LogDetailsViewApi,
-  manageApi,
-  QueryParamsDetailsViewApi,
-  get, post,
-  TicketDetailsViewApi
-}
+import { commonApi, getColumnsJson, query, addOrModify, remove } from '@vue2-client/services/api/common'
+import { QueryParamsDetailsViewApi } from '@vue2-client/services/api/QueryParamsDetailsViewApi'
+import { DictionaryDetailsViewApi } from '@vue2-client/services/api/DictionaryDetailsViewApi'
+import { LogDetailsViewApi } from '@vue2-client/services/api/LogDetailsViewApi'
+import { manageApi } from '@vue2-client/services/api/manage'
+import { get, post } from '@vue2-client/services/api/restTools'
+import { TicketDetailsViewApi } from '@vue2-client/services/api/TicketDetailsViewApi'
+
+export {
+  commonApi, getColumnsJson, query, addOrModify, remove,
+  DictionaryDetailsViewApi,
+  LogDetailsViewApi,
+  manageApi,
+  QueryParamsDetailsViewApi,
+  get, post,
+  TicketDetailsViewApi
+}

package/src/services/api/manage.js

@@ -1,8 +1,8 @@
-const manageApi = {
-  // 查询：获取字典键列表
-  getDictionaryValue: '/api/af-system/logic/getDictionaryValue',
-  // 查询：获取省市区街道三级分类
-  getDivisionsOhChina: '/api/af-system/logic/getDivisionsOhChina'
-}
-
-export { manageApi }
+const manageApi = {
+  // 查询：获取字典键列表
+  getDictionaryValue: '/api/af-system/logic/getDictionaryValue',
+  // 查询：获取省市区街道三级分类
+  getDivisionsOhChina: '/api/af-system/logic/getDivisionsOhChina'
+}
+
+export { manageApi }

package/src/services/apiService.js

@@ -1,13 +1,13 @@
-// 跨域代理前缀
-// const API_PROXY_PREFIX='/api'
-// const BASE_URL = process.env.NODE_ENV === 'production' ? process.env.VUE_APP_API_BASE_URL : API_PROXY_PREFIX
-
-module.exports = {
-  LOGIN: `/rs/logic/getLogin`,
-  V4_LOGIN: '/auth/login',
-  V4_LOGOUT: '/auth/logout',
-  ROUTES: `/rs/user/userLogin/智慧燃气`,
-  SEARCH: `/rs/search`,
-  GOODS: `/goods`,
-  GOODS_COLUMNS: `/columns`
-}
+// 跨域代理前缀
+// const API_PROXY_PREFIX='/api'
+// const BASE_URL = process.env.NODE_ENV === 'production' ? process.env.VUE_APP_API_BASE_URL : API_PROXY_PREFIX
+
+module.exports = {
+  LOGIN: `/rs/logic/getLogin`,
+  V4_LOGIN: '/auth/login',
+  V4_LOGOUT: '/auth/logout',
+  ROUTES: `/rs/user/userLogin/智慧燃气`,
+  SEARCH: `/rs/search`,
+  GOODS: `/goods`,
+  GOODS_COLUMNS: `/columns`
+}

package/src/services/user.js

@@ -1,53 +1,53 @@
-import { LOGIN, ROUTES, V4_GET_INFO, V4_LOGIN, V4_LOGOUT } from '@vue2-client/services/apiService'
-import { request, METHOD, removeAuthorization } from '@vue2-client/utils/request'
-
-/**
- * 登录服务
- * @param name 账户名
- * @param password 账户密码
- * @returns {Promise<AxiosResponse<T>>}
- */
-export async function login (name, password) {
-  return request(LOGIN, METHOD.POST, {
-    name: name,
-    password: password
-  })
-}
-
-export async function V4Login (name, password) {
-  return request(V4_LOGIN, METHOD.POST, {
-    username: name,
-    password: password
-  })
-}
-
-export async function V4GetInfo () {
-  return request(V4_GET_INFO, METHOD.POST, {})
-}
-
-export async function getRoutesConfig (value) {
-  return request(ROUTES, METHOD.POST, value)
-}
-
-/**
- * 退出登录
- */
-export function 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)
-      removeAuthorization()
-    })
-  })
-}
-export default {
-  login,
-  logout,
-  getRoutesConfig
-}
+import { LOGIN, ROUTES, V4_GET_INFO, V4_LOGIN, V4_LOGOUT } from '@vue2-client/services/apiService'
+import { request, METHOD, removeAuthorization } from '@vue2-client/utils/request'
+
+/**
+ * 登录服务
+ * @param name 账户名
+ * @param password 账户密码
+ * @returns {Promise<AxiosResponse<T>>}
+ */
+export async function login (name, password) {
+  return request(LOGIN, METHOD.POST, {
+    name: name,
+    password: password
+  })
+}
+
+export async function V4Login (name, password) {
+  return request(V4_LOGIN, METHOD.POST, {
+    username: name,
+    password: password
+  })
+}
+
+export async function V4GetInfo () {
+  return request(V4_GET_INFO, METHOD.POST, {})
+}
+
+export async function getRoutesConfig (value) {
+  return request(ROUTES, METHOD.POST, value)
+}
+
+/**
+ * 退出登录
+ */
+export function 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)
+      removeAuthorization()
+    })
+  })
+}
+export default {
+  login,
+  logout,
+  getRoutesConfig
+}

package/src/store/modules/index.js

@@ -1,4 +1,4 @@
-import account from './account'
-import setting from './setting'
-
-export default { account, setting }
+import account from './account'
+import setting from './setting'
+
+export default { account, setting }

package/src/theme/default/nprogress.less

@@ -1,76 +1,76 @@
-@import '~ant-design-vue/lib/style/themes/default';
-
-/* Make clicks pass-through */
-#nprogress {
-  pointer-events: none;
-}
-
-#nprogress .bar {
-  background: @primary-color;
-
-  position: fixed;
-  z-index: 1031;
-  top: 0;
-  left: 0;
-
-  width: 100%;
-  height: 2px;
-}
-
-/* Fancy blur effect */
-#nprogress .peg {
-  display: block;
-  position: absolute;
-  right: 0;
-  width: 100px;
-  height: 100%;
-  box-shadow: 0 0 10px @primary-color, 0 0 5px @primary-color;
-  opacity: 1.0;
-
-  -webkit-transform: rotate(3deg) translate(0px, -4px);
-  -ms-transform: rotate(3deg) translate(0px, -4px);
-  transform: rotate(3deg) translate(0px, -4px);
-}
-
-/* Remove these to get rid of the spinner */
-#nprogress .spinner {
-  display: block;
-  position: fixed;
-  z-index: 1031;
-  top: 15px;
-  right: 15px;
-}
-
-#nprogress .spinner-icon {
-  width: 18px;
-  height: 18px;
-  box-sizing: border-box;
-
-  border: solid 2px transparent;
-  border-top-color: @primary-color;
-  border-left-color: @primary-color;
-  border-radius: 50%;
-
-  -webkit-animation: nprogress-spinner 400ms linear infinite;
-  animation: nprogress-spinner 400ms linear infinite;
-}
-
-.nprogress-custom-parent {
-  overflow: hidden;
-  position: relative;
-}
-
-.nprogress-custom-parent #nprogress .spinner,
-.nprogress-custom-parent #nprogress .bar {
-  position: absolute;
-}
-
-@-webkit-keyframes nprogress-spinner {
-  0%   { -webkit-transform: rotate(0deg); }
-  100% { -webkit-transform: rotate(360deg); }
-}
-@keyframes nprogress-spinner {
-  0%   { transform: rotate(0deg); }
-  100% { transform: rotate(360deg); }
-}
-
+@import '~ant-design-vue/lib/style/themes/default';
+
+/* Make clicks pass-through */
+#nprogress {
+  pointer-events: none;
+}
+
+#nprogress .bar {
+  background: @primary-color;
+
+  position: fixed;
+  z-index: 1031;
+  top: 0;
+  left: 0;
+
+  width: 100%;
+  height: 2px;
+}
+
+/* Fancy blur effect */
+#nprogress .peg {
+  display: block;
+  position: absolute;
+  right: 0;
+  width: 100px;
+  height: 100%;
+  box-shadow: 0 0 10px @primary-color, 0 0 5px @primary-color;
+  opacity: 1.0;
+
+  -webkit-transform: rotate(3deg) translate(0px, -4px);
+  -ms-transform: rotate(3deg) translate(0px, -4px);
+  transform: rotate(3deg) translate(0px, -4px);
+}
+
+/* Remove these to get rid of the spinner */
+#nprogress .spinner {
+  display: block;
+  position: fixed;
+  z-index: 1031;
+  top: 15px;
+  right: 15px;
+}
+
+#nprogress .spinner-icon {
+  width: 18px;
+  height: 18px;
+  box-sizing: border-box;
+
+  border: solid 2px transparent;
+  border-top-color: @primary-color;
+  border-left-color: @primary-color;
+  border-radius: 50%;
+
+  -webkit-animation: nprogress-spinner 400ms linear infinite;
+  animation: nprogress-spinner 400ms linear infinite;
+}
+
+.nprogress-custom-parent {
+  overflow: hidden;
+  position: relative;
+}
+
+.nprogress-custom-parent #nprogress .spinner,
+.nprogress-custom-parent #nprogress .bar {
+  position: absolute;
+}
+
+@-webkit-keyframes nprogress-spinner {
+  0%   { -webkit-transform: rotate(0deg); }
+  100% { -webkit-transform: rotate(360deg); }
+}
+@keyframes nprogress-spinner {
+  0%   { transform: rotate(0deg); }
+  100% { transform: rotate(360deg); }
+}
+

package/src/theme/default/style.less

@@ -1,47 +1,47 @@
-.week-mode{
-  overflow: hidden;
-  filter: invert(80%);
-}
-.beauty-scroll{
-  scrollbar-color: @primary-color @primary-2;
-  scrollbar-width: thin;
-  -ms-overflow-style:none;
-  position: relative;
-  &::-webkit-scrollbar{
-    width: 3px;
-    height: 1px;
-  }
-  &::-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;
-  }
-}
-.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;
-}
-
-::-webkit-scrollbar{
-  width: 5px;
-  height: 5px;
-}
-::-webkit-scrollbar-thumb {
-  border-radius: 3px;
-  background: @primary-3;
-}
-::-webkit-scrollbar-track {
-  -webkit-box-shadow: inset 0 0 1px rgba(0,0,0,0);
-  border-radius: 3px;
-  background: @primary-1;
-}
+.week-mode{
+  overflow: hidden;
+  filter: invert(80%);
+}
+.beauty-scroll{
+  scrollbar-color: @primary-color @primary-2;
+  scrollbar-width: thin;
+  -ms-overflow-style:none;
+  position: relative;
+  &::-webkit-scrollbar{
+    width: 3px;
+    height: 1px;
+  }
+  &::-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;
+  }
+}
+.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;
+}
+
+::-webkit-scrollbar{
+  width: 5px;
+  height: 5px;
+}
+::-webkit-scrollbar-thumb {
+  border-radius: 3px;
+  background: @primary-3;
+}
+::-webkit-scrollbar-track {
+  -webkit-box-shadow: inset 0 0 1px rgba(0,0,0,0);
+  border-radius: 3px;
+  background: @primary-1;
+}