vue2-client 1.2.49 → 1.2.52

package/src/pages/login/Login.vue

@@ -60,9 +60,9 @@ import { loadRoutes, funcToRouter } from '@vue2-client/utils/routerUtil'
 import { mapMutations, mapState } from 'vuex'
 import JSEncrypt from 'jsencrypt'
 import { ACCESS_TOKEN } from '@vue2-client/store/mutation-types'
-import Vue from 'vue'
 import { positions } from '@vue2-client/mock/common'
 import { timeFix } from '@vue2-client/utils/util'
+import { loginStart } from '@vue2-client/base-client/plugins/compatible/LoginServiceOA'
 
 export default {
   name: 'Login',
@@ -75,7 +75,7 @@ export default {
     }
   },
   computed: {
-    ...mapState('setting', ['systemName', 'systemDesc', 'homePage', 'ticketPage'])
+    ...mapState('setting', ['systemName', 'systemDesc', 'homePage', 'ticketPage', 'compatible'])
   },
   methods: {
     ...mapMutations('account', ['setUser', 'setPermissions', 'setRoles']),
@@ -86,10 +86,27 @@ export default {
           this.logging = true
           const name = this.form.getFieldValue('name')
           const password = this.form.getFieldValue('password')
-          login(name, password).then(this.afterLogin)
+          switch (this.compatible) {
+            case 'V3': {
+              login(name, password).then(this.afterLogin)
+              break
+            }
+            case 'OA' : {
+              loginStart(name, password).then(this.afterLoginOA).finally(() => { this.logging = false })
+             break
+            }
+          }
         }
       })
     },
+    afterLoginOA (result) {
+      // 默认第一个是旧OA地址
+      result.functions[0].navigate = result.functions[0].link
+      result.functions[0].link = null
+      this.afterGeneral(result)
+      this.setACCESSTOKEN(result.password)
+      this.$router.push(this.homePage).catch(() => {})
+    },
     afterLogin (res) {
       const name = this.form.getFieldValue('name')
       const password = this.form.getFieldValue('password')
@@ -99,37 +116,51 @@ export default {
         const encrypt = new JSEncrypt()
         encrypt.setPublicKey('MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCqPvovSfXcwBbW8cKMCgwqNpsYuzF8RPAPFb7LGsnVo44JhM/xxzDyzoYtdfNmtbIuKVi9PzIsyp6rg+09gbuI6UGwBZ5DWBDBMqv5MPdOF5dCQkB2Bbr5yPfURPENypUz+pBFBg41d+BC+rwRiXELwKy7Y9caD/MtJyHydj8OUwIDAQAB')
         const data = encrypt.encrypt(JSON.stringify({ username: name, password: password }))
-        localStorage.setItem(ACCESS_TOKEN, data)
         // 获取路由配置
         getRoutesConfig(data).then(result => {
-          Vue.$login.login(result).then(() => {
-            const user = Object.assign({
-              username: result.ename,
-              name: result.name,
-              avatar: 'https://gw.alipayobjects.com/zos/rmsportal/jZUIxmJycoymBprLOUbT.png',
-              address: '西安市',
-              position: positions[0]
-            }, result)
-            this.setUser(user)
-            this.setPermissions([{ id: 'queryForm', operation: ['add', 'edit'] }])
-            this.setRoles([{ id: 'admin', operation: ['add', 'edit', 'delete'] }])
-            let timestamp = new Date().getTime()// 当前的时间戳
-            timestamp = timestamp + 60 * 60 * 1000
-            // 格式化时间获取年月日, 登陆过期时间
-            const dateAfter = new Date(timestamp)
-            setAuthorization({ token: data, expireAt: dateAfter })
-            loadRoutes(funcToRouter(user.functions))
+          this.$login.login(result).then(() => {
+            // V3任何情况首位加入资源管理
+            const resourceManageMain = {
+              name: '资源管理',
+              icon: 'api',
+              position: 1,
+              link: 'resourceManageMain'
+            }
+            result.functions.unshift(resourceManageMain)
+            this.afterGeneral(result)
+            this.setACCESSTOKEN(data)
             if (result.deps === '用户工单登记') {
               this.$router.push(this.ticketPage).catch(() => {})
             } else {
               this.$router.push(this.homePage).catch(() => {})
             }
-            this.$message.success(timeFix().CN + '，欢迎回来', 3)
           })
         })
       } else {
         this.error = loginRes
       }
+    },
+    afterGeneral (result) {
+      const user = Object.assign({
+        username: result.ename,
+        name: result.name,
+        avatar: 'https://gw.alipayobjects.com/zos/rmsportal/jZUIxmJycoymBprLOUbT.png',
+        address: '西安市',
+        position: positions[0]
+      }, result)
+      this.setUser(user)
+      this.setPermissions([{ id: 'queryForm', operation: ['add', 'edit'] }])
+      this.setRoles([{ id: 'admin', operation: ['add', 'edit', 'delete'] }])
+      loadRoutes(funcToRouter(user.functions))
+      this.$message.success(timeFix().CN + `，${result.name} 欢迎回来`, 3)
+    },
+    setACCESSTOKEN (data) {
+      localStorage.setItem(ACCESS_TOKEN, data)
+      let timestamp = new Date().getTime()// 当前的时间戳
+      timestamp = timestamp + 60 * 60 * 1000
+      // 格式化时间获取年月日, 登陆过期时间
+      const dateAfter = new Date(timestamp)
+      setAuthorization({ token: data, expireAt: dateAfter })
     }
   }
 }

package/src/pages/resourceManage/orgListManage.vue

@@ -2,49 +2,49 @@
   <div id="orgListManage">
     <a-card :bordered="false">
       <!--<a-row :gutter="48">-->
-        <!--<a-col>-->
-          <!--<a-space>-->
-            <!--<a-button type="primary" @click="addItem" v-if="!buttonState || buttonState.add">-->
-              <!--<a-icon :style="iconStyle" type="plus"/>新增-->
-            <!--</a-button>-->
-            <!--<a-button-->
-              <!--v-if="!buttonState || buttonState.edit"-->
-              <!--:loading="editDataLoading"-->
-              <!--:disabled="!isModify"-->
-              <!--class="btn-success"-->
-              <!--type="dashed"-->
-              <!--@click="editItem">-->
-              <!--<a-icon :style="iconStyle" type="edit"/>修改-->
-            <!--</a-button>-->
-            <!--<a-button :disabled="!isDelete" type="danger" @click="deleteItem" v-if="!buttonState || buttonState.delete">-->
-              <!--<a-icon :style="iconStyle" type="delete"/>删除-->
-            <!--</a-button>-->
-          <!--</a-space>-->
-          <!--<span :style="{ float: 'right', overflow: 'hidden', marginBottom: '8px' }">-->
-            <!--<a-button-group>-->
-              <!--<a-button @click="toggleIsFormShow">-->
-                <!--<a-icon :style="iconStyle" type="vertical-align-top"/>-->
-              <!--</a-button>-->
-              <!--<a-button @click="refresh(true)">-->
-                <!--<a-icon :style="iconStyle" type="reload" />-->
-              <!--</a-button>-->
-              <!--<a-button @click="showDrawer">-->
-                <!--<a-icon :style="iconStyle" type="table" />-->
-              <!--</a-button>-->
-              <!--<a-button @click="exports">-->
-                <!--<a-icon :style="iconStyle" type="cloud-download"/>-->
-              <!--</a-button>-->
-            <!--</a-button-group>-->
-          <!--</span>-->
-        <!--</a-col>-->
+      <!--<a-col>-->
+      <!--<a-space>-->
+      <!--<a-button type="primary" @click="addItem" v-if="!buttonState || buttonState.add">-->
+      <!--<a-icon :style="iconStyle" type="plus"/>新增-->
+      <!--</a-button>-->
+      <!--<a-button-->
+      <!--v-if="!buttonState || buttonState.edit"-->
+      <!--:loading="editDataLoading"-->
+      <!--:disabled="!isModify"-->
+      <!--class="btn-success"-->
+      <!--type="dashed"-->
+      <!--@click="editItem">-->
+      <!--<a-icon :style="iconStyle" type="edit"/>修改-->
+      <!--</a-button>-->
+      <!--<a-button :disabled="!isDelete" type="danger" @click="deleteItem" v-if="!buttonState || buttonState.delete">-->
+      <!--<a-icon :style="iconStyle" type="delete"/>删除-->
+      <!--</a-button>-->
+      <!--</a-space>-->
+      <!--<span :style="{ float: 'right', overflow: 'hidden', marginBottom: '8px' }">-->
+      <!--<a-button-group>-->
+      <!--<a-button @click="toggleIsFormShow">-->
+      <!--<a-icon :style="iconStyle" type="vertical-align-top"/>-->
+      <!--</a-button>-->
+      <!--<a-button @click="refresh(true)">-->
+      <!--<a-icon :style="iconStyle" type="reload" />-->
+      <!--</a-button>-->
+      <!--<a-button @click="showDrawer">-->
+      <!--<a-icon :style="iconStyle" type="table" />-->
+      <!--</a-button>-->
+      <!--<a-button @click="exports">-->
+      <!--<a-icon :style="iconStyle" type="cloud-download"/>-->
+      <!--</a-button>-->
+      <!--</a-button-group>-->
+      <!--</span>-->
+      <!--</a-col>-->
       <!--</a-row>-->
       <a-table
-        rowKey="id"
-        size="middle"
-        bordered
-        :pagination="false"
         :columns="columns"
-        :data-source="funTree">
+        :data-source="funTree"
+        :pagination="false"
+        bordered
+        rowKey="id"
+        size="middle">
       </a-table>
     </a-card>
   </div>