vue2-client 1.8.182 → 1.8.184-test

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.8.182",
+  "version": "1.8.184-test",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/common/XForm/XFormItem.vue

@@ -41,7 +41,9 @@
           </a-select-option>
         </template>
         <template v-else>
-          <template v-if="attr.keyName.indexOf('logic@') !== -1 || attr.keyName.indexOf('config@') !== -1">
+          <template
+            v-if="attr.keyName.indexOf('logic@') !== -1 || attr.keyName.indexOf('config@') !== -1
+              ||attr.keyName.indexOf('search@') !== -1 || attr.keyName.indexOf('search@') !== -1">
             <a-select-option
               v-for="(item,index) in option"
               :key="index.value"
@@ -119,7 +121,9 @@
           </a-select-option>
         </template>
         <template v-else>
-          <template v-if="attr.keyName.indexOf('logic@') !== -1 || attr.keyName.indexOf('config@') !== -1">
+          <template
+            v-if="attr.keyName.indexOf('logic@') !== -1 || attr.keyName.indexOf('config@') !== -1
+              ||attr.keyName.indexOf('search@') !== -1 || attr.keyName.indexOf('search@') !== -1">
             <a-select-option
               v-for="(item,index) in option"
               :key="index"
@@ -171,7 +175,9 @@
           </a-radio>
         </template>
         <template v-else>
-          <template v-if="attr.keyName.indexOf('logic@') !== -1 || attr.keyName.indexOf('config@') !== -1">
+          <template
+            v-if="attr.keyName.indexOf('logic@') !== -1 || attr.keyName.indexOf('config@') !== -1
+              ||attr.keyName.indexOf('search@') !== -1 || attr.keyName.indexOf('search@') !== -1">
             <a-radio v-for="(item,index) in option" :key="index" :value="item.value">
               {{ item.label }}
             </a-radio>
@@ -323,6 +329,8 @@ import Upload from '@vue2-client/base-client/components/common/Upload'
 import moment from 'moment'
 import XTreeSelect from '@vue2-client/base-client/components/common/XForm/XTreeSelect'
 import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
+import { searchToOption } from '@vue2-client/services/v3Api'
+import { mapState } from 'vuex'
 
 export default {
   name: 'XFormItem',
@@ -410,6 +418,9 @@ export default {
   created () {
     this.init()
   },
+  computed: {
+    ...mapState('account', { currUser: 'user' })
+  },
   watch: {
     attr: {
       handler () {
@@ -419,8 +430,8 @@ export default {
     },
     form: {
       handler (newVal) {
-        const value = newVal[this.attr.model]
-        const isEmpty = !value || !value.toString()
+        // const value = newVal[this.attr.model]
+        // const isEmpty = !value || !value.toString()
         // 查询表单点击重置按钮时清空树形选择框选中状态
         // if (this.$refs.xTreeSelect && this.attr.type === 'treeSelect' && isEmpty) {
         //   this.$refs.xTreeSelect.setValue(undefined)
@@ -443,6 +454,12 @@ export default {
       }
       if (this.attr.keyName && this.attr.keyName.indexOf('logic@') !== -1) {
         this.getData({}, res => this.getDataCallback(res))
+      } if (this.attr.keyName && this.attr.keyName.indexOf('search@') !== -1) {
+        // `tool.getFullTree(this.getRights().where(row.getType()==$organization$))`
+        this.getDataCallback(searchToOption({
+          source: this.attr.keyName.substring(6),
+          userid: this.currUser.id
+        }))
       } else if (this.attr.keyName && this.attr.keyName.indexOf('config@') !== -1) {
         const configName = this.attr.keyName.substring(7)
         getConfigByName(configName, this.serviceName, res => {

package/src/base-client/components/common/XFormTable/XFormTable.vue

@@ -1,6 +1,6 @@
 <template>
-  <a-row type="flex" :gutter="48">
-    <a-col :span="6" v-if="xTreeConfigName">
+  <a-row type="flex" :gutter="16">
+    <a-col :span="6" v-if="xTreeConfigName" :style="{ maxWidth: '300px' }">
       <x-tree
         :config-name="xTreeConfigName"
         :env="env"
@@ -9,7 +9,7 @@
         ref="xtree"
       ></x-tree>
     </a-col>
-    <a-col :span="xTreeConfigName?18:24">
+    <a-col :span="xTreeConfigName ? 18 : 24" :style="{ flex: xTreeConfigName ? '1' : 'none' }">
       <a-skeleton :loading="loading" :paragraph="{ rows: 4 }"/>
       <div v-show="!loading">
         <template v-if="!loadError">

package/src/pages/Example/index.vue

@@ -14,6 +14,9 @@ export default {
   components: {
     XReport
   },
+  mounted () {
+    console.log(this.$route)
+    },
   data () {
     return {
       test: {

package/src/router/guards.js

@@ -51,8 +51,9 @@ const loginGuard = (to, from, next, options) => {
     const { store, message, router } = options
     if (
       (!loginIgnore.includes(to) || to.name === '404') &&
-      !checkSingleAuthorization()
+      !checkSingleAuthorization('SinglePage', token)
     ) {
+      localStorage.setItem('SinglePage_TOKEN', token)
       startLogin({
         ...info,
         pathname: window.location.pathname,
@@ -61,7 +62,12 @@ const loginGuard = (to, from, next, options) => {
       })
     } else {
       const roles = store.getters['account/roles']
-      const user = localStorage.getItem(process.env.VUE_APP_USER_KEY)
+      let user = {}
+      try {
+        user = JSON.parse(localStorage.getItem(process.env.VUE_APP_USER_KEY))
+      } catch (e) {
+        user = localStorage.getItem(process.env.VUE_APP_USER_KEY)
+      }
       const setUser = store._mutations['account/setUser'][0]
       setUser(user)
       if (roles.length === 0 && !loginIgnore.includes(to)) {

package/src/services/v3Api.js

@@ -0,0 +1,18 @@
+import { METHOD, request } from '@vue2-client/utils/request'
+
+export async function searchToOption (params) {
+  return search(params).then(res => {
+    return res.data.map(item => {
+      return {
+        label: item.name,
+        value: item.id
+      }
+    })
+  })
+}
+
+export async function search (params) {
+  return request('/rs/search', METHOD.POST, params)
+}
+
+export default { searchToOption, search }

package/src/utils/login.js

@@ -13,17 +13,20 @@ import {
 // 认证类型
 const AUTH_TYPE = {
   BEARER: 'Bearer',
+  SinglePage: 'SinglePage',
   BASIC: 'basic',
   AUTH1: 'auth1',
   AUTH2: 'auth2',
 }
-export function checkSingleAuthorization (authType = AUTH_TYPE.BEARER) {
+export function checkSingleAuthorization (authType = AUTH_TYPE.BEARER, token) {
   switch (authType) {
     case AUTH_TYPE.BEARER:
       if (localStorage.getItem(V4_ACCESS_TOKEN)) {
         return true
       }
       break
+    case AUTH_TYPE.SinglePage:
+        return token === localStorage.getItem('SinglePage_TOKEN')
     case AUTH_TYPE.BASIC:
     case AUTH_TYPE.AUTH1:
     case AUTH_TYPE.AUTH2: