vue2-client 1.22.2 → 1.22.4

package/src/base-client/components/system/DictionaryDetailsView/DictionaryDetailsView.vue

@@ -1,232 +1,232 @@
-<template>
-  <a-drawer
-    title="字典详情"
-    placement="right"
-    :width="isMobile ? screenWidth : screenWidth * 0.85"
-    :visible="visible"
-    @close="onClose"
-  >
-    <a-spin :spinning="loadDetails">
-      <a-page-header
-        :title="'字典名称：' + details.f_name"
-      >
-        <div class="row">
-          <div class="content">
-            <a-descriptions size="small" :column="isMobile ? 1 : 2">
-              <a-descriptions-item label="字典编号">{{ details.id }}</a-descriptions-item>
-              <a-descriptions-item label="字典键">{{ details.f_key }}</a-descriptions-item>
-              <a-descriptions-item label="备注">{{ details.f_remark }}</a-descriptions-item>
-              <a-descriptions-item label="创建时间">{{ format(details.f_input_date) }}</a-descriptions-item>
-            </a-descriptions>
-          </div>
-          <div class="extra">
-            <a-row class="status-list">
-              <a-col :xs="12" :sm="24">
-              </a-col>
-            </a-row>
-          </div>
-        </div>
-        <!-- actions -->
-        <template #extra>
-          <a-button-group style="margin-right: 4px;">
-            <a-button type="dashed" @click="initView" :loading="loadDetails">刷新</a-button>
-          </a-button-group>
-        </template>
-        <template slot="footer">
-          <a-tabs :default-active-key="tabActiveKey" :activeKey="tabActiveKey" @change="handleTabChange" style="margin-bottom: 23px;">
-            <template v-for="value in tabList">
-              <a-tab-pane :key="value.key" :tab="value.tab"/>
-            </template>
-          </a-tabs>
-          <div v-if="!loadDetails">
-            <template v-if="tabActiveKey === '1'">
-              <x-form-table
-                title="字典数据配置"
-                :fixed-add-form="fixedAddForm"
-                :fixed-query-form="fixedQueryForm"
-                serviceName="af-system"
-                queryParamsName="crud_dictionary_value_manage"
-                @afterSubmit="afterSubmit"
-              >
-              </x-form-table>
-            </template>
-          </div>
-        </template>
-      </a-page-header>
-    </a-spin>
-  </a-drawer>
-</template>
-
-<script>
-import { DictionaryDetailsViewApi, post } from '@vue2-client/services/api'
-import { mapState } from 'vuex'
-import { formatDate } from '@vue2-client/utils/util'
-import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
-
-export default {
-  name: 'DictionaryDetailsView',
-  components: {
-    XFormTable
-  },
-  data () {
-    return {
-      // 页面宽度
-      screenWidth: document.documentElement.clientWidth,
-      // Tab页签
-      tabActiveKey: '1',
-      // 字典详情
-      details: {
-        id: 0,
-        f_name: '',
-        f_key: '',
-        f_remark: '',
-        f_input_date: '',
-        f_state: 0
-      },
-      tabList: [
-        { key: '1', tab: '字典数据' }
-      ],
-      // 固定新增数据
-      fixedAddForm: {},
-      // 固定查询数据
-      fixedQueryForm: {},
-      // 详情加载
-      loadDetails: true
-    }
-  },
-  mounted () {
-    this.initView()
-  },
-  computed: {
-    ...mapState('account', { currUser: 'user' }),
-    ...mapState('setting', ['isMobile'])
-  },
-  props: {
-    id: {
-      type: String,
-      required: true
-    },
-    visible: {
-      type: Boolean,
-      default: false
-    }
-  },
-  methods: {
-    // 初始化组件
-    initView () {
-      this.tabActiveKey = '1'
-      this.fixedQueryForm.v_f_dictionary_id = this.id
-      this.fixedAddForm.v_f_dictionary_id = this.id
-      this.getDetails(this.id)
-    },
-    onClose () {
-      this.$emit('update:visible', false)
-    },
-    // 获取详情信息
-    getDetails (userId) {
-      this.loadDetails = true
-      return post(DictionaryDetailsViewApi.getDictionaryDetails, {
-        id: userId
-      })
-        .then(res => {
-          this.details = res
-          this.loadDetails = false
-        }, err => {
-          this.loadDetails = false
-          console.error(err)
-        })
-    },
-    // Tab切换
-    handleTabChange (key) {
-      this.tabActiveKey = key
-    },
-    // 日期格式化
-    format (date, format) {
-      return formatDate(date, format)
-    },
-    afterSubmit () {
-      this.$appdata.load()
-    }
-  },
-  watch: {
-    'visible' (val) {
-      if (val) {
-        this.initView()
-      }
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-.business {
-  color: #ffffff;
-}
-.business:enabled:hover {
-  background-color: #85CE61 !important;
-  border-color: #85CE61 !important;
-}
-.business:enabled {
-  background-color: #67c23a;
-  border-color: #67c23a;
-}
-.business:disabled {
-  color: rgba(0, 0, 0, 0.25);
-}
-.detail-layout {
-  margin-left: 44px;
-}
-.text {
-  color: rgba(0, 0, 0, .45);
-}
-
-.heading {
-  color: rgba(0, 0, 0, .85);
-  font-size: 20px;
-}
-
-.no-data {
-  color: rgba(0, 0, 0, .25);
-  text-align: center;
-  line-height: 64px;
-  font-size: 16px;
-
-  i {
-    font-size: 24px;
-    margin-right: 16px;
-    position: relative;
-    top: 3px;
-  }
-}
-
-.mobile {
-  .detail-layout {
-    margin-left: unset;
-  }
-  .text {
-
-  }
-  .status-list {
-    text-align: left;
-  }
-}
-
-.row {
-  display: flex;
-
-  .content {
-    -webkit-box-flex: 1;
-    flex: auto;
-    -ms-flex: auto;
-  }
-
-  .extra {
-    flex: 0 1 auto;
-    -webkit-box-flex: 0;
-    -ms-flex: 0 1 auto;
-    min-width: 242px;
-    margin-left: 88px;
-    text-align: right;
-  }
-}
-</style>
+<template>
+  <a-drawer
+    title="字典详情"
+    placement="right"
+    :width="isMobile ? screenWidth : screenWidth * 0.85"
+    :visible="visible"
+    @close="onClose"
+  >
+    <a-spin :spinning="loadDetails">
+      <a-page-header
+        :title="'字典名称：' + details.f_name"
+      >
+        <div class="row">
+          <div class="content">
+            <a-descriptions size="small" :column="isMobile ? 1 : 2">
+              <a-descriptions-item label="字典编号">{{ details.id }}</a-descriptions-item>
+              <a-descriptions-item label="字典键">{{ details.f_key }}</a-descriptions-item>
+              <a-descriptions-item label="备注">{{ details.f_remark }}</a-descriptions-item>
+              <a-descriptions-item label="创建时间">{{ format(details.f_input_date) }}</a-descriptions-item>
+            </a-descriptions>
+          </div>
+          <div class="extra">
+            <a-row class="status-list">
+              <a-col :xs="12" :sm="24">
+              </a-col>
+            </a-row>
+          </div>
+        </div>
+        <!-- actions -->
+        <template #extra>
+          <a-button-group style="margin-right: 4px;">
+            <a-button type="dashed" @click="initView" :loading="loadDetails">刷新</a-button>
+          </a-button-group>
+        </template>
+        <template slot="footer">
+          <a-tabs :default-active-key="tabActiveKey" :activeKey="tabActiveKey" @change="handleTabChange" style="margin-bottom: 23px;">
+            <template v-for="value in tabList">
+              <a-tab-pane :key="value.key" :tab="value.tab"/>
+            </template>
+          </a-tabs>
+          <div v-if="!loadDetails">
+            <template v-if="tabActiveKey === '1'">
+              <x-form-table
+                title="字典数据配置"
+                :fixed-add-form="fixedAddForm"
+                :fixed-query-form="fixedQueryForm"
+                serviceName="af-system"
+                queryParamsName="crud_dictionary_value_manage"
+                @afterSubmit="afterSubmit"
+              >
+              </x-form-table>
+            </template>
+          </div>
+        </template>
+      </a-page-header>
+    </a-spin>
+  </a-drawer>
+</template>
+
+<script>
+import { DictionaryDetailsViewApi, post } from '@vue2-client/services/api'
+import { mapState } from 'vuex'
+import { formatDate } from '@vue2-client/utils/util'
+import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
+
+export default {
+  name: 'DictionaryDetailsView',
+  components: {
+    XFormTable
+  },
+  data () {
+    return {
+      // 页面宽度
+      screenWidth: document.documentElement.clientWidth,
+      // Tab页签
+      tabActiveKey: '1',
+      // 字典详情
+      details: {
+        id: 0,
+        f_name: '',
+        f_key: '',
+        f_remark: '',
+        f_input_date: '',
+        f_state: 0
+      },
+      tabList: [
+        { key: '1', tab: '字典数据' }
+      ],
+      // 固定新增数据
+      fixedAddForm: {},
+      // 固定查询数据
+      fixedQueryForm: {},
+      // 详情加载
+      loadDetails: true
+    }
+  },
+  mounted () {
+    this.initView()
+  },
+  computed: {
+    ...mapState('account', { currUser: 'user' }),
+    ...mapState('setting', ['isMobile'])
+  },
+  props: {
+    id: {
+      type: String,
+      required: true
+    },
+    visible: {
+      type: Boolean,
+      default: false
+    }
+  },
+  methods: {
+    // 初始化组件
+    initView () {
+      this.tabActiveKey = '1'
+      this.fixedQueryForm.v_f_dictionary_id = this.id
+      this.fixedAddForm.v_f_dictionary_id = this.id
+      this.getDetails(this.id)
+    },
+    onClose () {
+      this.$emit('update:visible', false)
+    },
+    // 获取详情信息
+    getDetails (userId) {
+      this.loadDetails = true
+      return post(DictionaryDetailsViewApi.getDictionaryDetails, {
+        id: userId
+      })
+        .then(res => {
+          this.details = res
+          this.loadDetails = false
+        }, err => {
+          this.loadDetails = false
+          console.error(err)
+        })
+    },
+    // Tab切换
+    handleTabChange (key) {
+      this.tabActiveKey = key
+    },
+    // 日期格式化
+    format (date, format) {
+      return formatDate(date, format)
+    },
+    afterSubmit () {
+      this.$appdata.load()
+    }
+  },
+  watch: {
+    'visible' (val) {
+      if (val) {
+        this.initView()
+      }
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.business {
+  color: #ffffff;
+}
+.business:enabled:hover {
+  background-color: #85CE61 !important;
+  border-color: #85CE61 !important;
+}
+.business:enabled {
+  background-color: #67c23a;
+  border-color: #67c23a;
+}
+.business:disabled {
+  color: rgba(0, 0, 0, 0.25);
+}
+.detail-layout {
+  margin-left: 44px;
+}
+.text {
+  color: rgba(0, 0, 0, .45);
+}
+
+.heading {
+  color: rgba(0, 0, 0, .85);
+  font-size: 20px;
+}
+
+.no-data {
+  color: rgba(0, 0, 0, .25);
+  text-align: center;
+  line-height: 64px;
+  font-size: 16px;
+
+  i {
+    font-size: 24px;
+    margin-right: 16px;
+    position: relative;
+    top: 3px;
+  }
+}
+
+.mobile {
+  .detail-layout {
+    margin-left: unset;
+  }
+  .text {
+
+  }
+  .status-list {
+    text-align: left;
+  }
+}
+
+.row {
+  display: flex;
+
+  .content {
+    -webkit-box-flex: 1;
+    flex: auto;
+    -ms-flex: auto;
+  }
+
+  .extra {
+    flex: 0 1 auto;
+    -webkit-box-flex: 0;
+    -ms-flex: 0 1 auto;
+    min-width: 242px;
+    margin-left: 88px;
+    text-align: right;
+  }
+}
+</style>

package/src/base-client/plugins/Config.js

@@ -1,19 +1,19 @@
-const asyncReady = async function (vm, name) {
-  // 获取配置信息
-  try {
-    const res = await vm.$resetget('/rs/vue/' + name + '.json', { resolveMsg: null, rejectMsg: null })
-    Object.assign(vm.config, res)
-  } catch (error) {
-    // 忽略704,文件找不到异常
-    if (error.status !== 704) {
-      throw error
-    }
-  }
-}
-export default {
-  install (Vue) {
-    Vue.getConfig = Vue.prototype.$getConfig = function (vm, name) {
-      return asyncReady(vm, name)
-    }
-  }
-}
+const asyncReady = async function (vm, name) {
+  // 获取配置信息
+  try {
+    const res = await vm.$resetget('/rs/vue/' + name + '.json', { resolveMsg: null, rejectMsg: null })
+    Object.assign(vm.config, res)
+  } catch (error) {
+    // 忽略704,文件找不到异常
+    if (error.status !== 704) {
+      throw error
+    }
+  }
+}
+export default {
+  install (Vue) {
+    Vue.getConfig = Vue.prototype.$getConfig = function (vm, name) {
+      return asyncReady(vm, name)
+    }
+  }
+}

package/src/base-client/plugins/GetLoginInfoService.js

@@ -133,12 +133,12 @@ function searchFun (fun, name) {
   }
 }
 
-const loginGen = async function (response) {
+const loginGen = async function (response, jwt) {
   Vue.$login.f = response
   await Promise.all([Vue.$appdata.load(), getViewDetails(Vue.$login.f.id)])
   const login = {
     f: Vue.$login.f,
-    jwt: Vue.$login.f.id,
+    jwt: jwt || Vue.$login.f.id,
     r: Vue.$login.r
   }
 
@@ -154,8 +154,8 @@ const GetLoginInfoService = {
 
   },
 
-  login (response) {
-    return loginGen(response)
+  login (response, jwt) {
+    return loginGen(response, jwt)
   },
   required (param) {
     if (typeof param === 'number' && param === 0) {

package/src/base-client/plugins/tabs-page-plugin.js

@@ -1,39 +1,39 @@
-const TabsPagePlugin = {
-  install (Vue) {
-    Vue.mixin({
-      methods: {
-        $closePage (closeRoute, nextRoute) {
-          const event = new CustomEvent('page:close', { detail: { closeRoute, nextRoute } })
-          window.dispatchEvent(event)
-        },
-        $refreshPage (route) {
-          const path = typeof route === 'object' ? route.path : route
-          const event = new CustomEvent('page:refresh', { detail: { pageKey: path } })
-          window.dispatchEvent(event)
-        },
-        $openPage (route, title) {
-          this.$setPageTitle(route, title)
-          this.$router.push(route)
-        },
-        $setPageTitle (route, title) {
-          if (title) {
-            // let path = typeof route === 'object' ? route.path : route
-            // path = path && path.split('?')[0]
-            const path = typeof route === 'object' ? this.$router.resolve(route).route.fullPath : route
-            this.$store.commit('setting/setCustomTitle', { path, title })
-          }
-        }
-      },
-      computed: {
-        customTitle () {
-          const customTitles = this.$store.state.setting.customTitles
-          // const path = this.$route.path.split('?')[0]
-          const custom = customTitles.find(item => item.path === this.$route.fullPath)
-          return custom && custom.title
-        }
-      }
-    })
-  }
-}
-
-export default TabsPagePlugin
+const TabsPagePlugin = {
+  install (Vue) {
+    Vue.mixin({
+      methods: {
+        $closePage (closeRoute, nextRoute) {
+          const event = new CustomEvent('page:close', { detail: { closeRoute, nextRoute } })
+          window.dispatchEvent(event)
+        },
+        $refreshPage (route) {
+          const path = typeof route === 'object' ? route.path : route
+          const event = new CustomEvent('page:refresh', { detail: { pageKey: path } })
+          window.dispatchEvent(event)
+        },
+        $openPage (route, title) {
+          this.$setPageTitle(route, title)
+          this.$router.push(route)
+        },
+        $setPageTitle (route, title) {
+          if (title) {
+            // let path = typeof route === 'object' ? route.path : route
+            // path = path && path.split('?')[0]
+            const path = typeof route === 'object' ? this.$router.resolve(route).route.fullPath : route
+            this.$store.commit('setting/setCustomTitle', { path, title })
+          }
+        }
+      },
+      computed: {
+        customTitle () {
+          const customTitles = this.$store.state.setting.customTitles
+          // const path = this.$route.path.split('?')[0]
+          const custom = customTitles.find(item => item.path === this.$route.fullPath)
+          return custom && custom.title
+        }
+      }
+    })
+  }
+}
+
+export default TabsPagePlugin