vue2-client 1.8.158 → 1.8.160

package/package.json

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

package/src/base-client/components/common/XReport/XReportTrGroup.vue

@@ -225,13 +225,13 @@
               :style="'width:' + (cell.inputWidth ? cell.inputWidth : '100') + '%'"/>
           </template>
           <template v-else-if="cell.listType === 'value'">
-            {{cell.content[listIndex]}}
+            {{ cell.content[listIndex] }}
           </template>
         </template>
         <template v-else-if="cell.type === 'images'">
           <div>
             <upload
-              :model="{type: 'image', accept: ['*'], resUploadStock: 1, pathKey: 'cs'}"
+              :model="{type: 'image', accept: ['*'], resUploadStock: 1, pathKey: 'cs', resUploadMode: 'oss'}"
               service-name="af-system"
               :images="configData.images[cell.dataIndex]"
               :outer-container-index="cell.dataIndex"
@@ -374,7 +374,7 @@ export default {
     }
   },
   methods: {
-    handleInputDeepChange (event, dataIndex) {
+    handleInputDeepChange () {
       this.$forceUpdate()
     },
     getDeepObject (obj, strPath) {

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

@@ -93,7 +93,7 @@ const GetAppDataService = {
       if (Object.prototype.hasOwnProperty.call(result, value)) {
         return result[value]
       } else {
-        return {status: 'none', text: value}
+        return { status: 'none', text: value }
       }
     }
     return null

package/src/pages/Example/index.vue

@@ -2,8 +2,9 @@
   <div>
     <!--    <XReport :config-name="'test_tableConfig'" :activated-slot-name="'test_tableConfig_slot'"/>-->
     <!--        <XReport :config-name="'test_tableConfig'" :local-config="test_config_withoutSlot" :config-data="test_config_data"/>-->
-<!--        <XReport :config-name="'test_tableConfig'" :local-config="test_yangchun_json" :config-data="test_yangchun_data" :dont-format="true"/>-->
-    <XReport :config-name="'test_tableConfig'" :local-config="test_yangchun_json" :config-data="test_yangchun_jsonData" :dont-format="true"/>
+    <!--        <XReport :config-name="'test_tableConfig'" :local-config="test_yangchun_json" :config-data="test_yangchun_data" :dont-format="true"/>-->
+    <!--    <XReport :config-name="'test_tableConfig'" :local-config="test_yangchun_json" :config-data="test_yangchun_jsonData" :dont-format="true"/>-->
+    <XReport :config-name="'test_tableConfig'" :local-config="test_upload" :dont-format="true"/>
     <!--            <XReport :config-name="'test_table_config_forEditor'" :dont-format="true"/>-->
     <!--    <XReport config-name="test_tableConfig" :local-config="test_config_json" :config-data="test_config_json_data"/>-->
   </div>
@@ -1244,6 +1245,40 @@ export default {
         ],
         id: 35917,
         f_type: '改管维修'
+      },
+      test_upload: {
+        slotsDefine: {},
+        subTitle: [],
+        slotsDeclare: [],
+        data: {
+          images: []
+        },
+        columns: [
+          [
+            {
+              rowSpan: 1,
+              colSpan: 12,
+              text: '测试上传',
+              originalRowIndex: 0,
+              type: 'column',
+              originalCellIndex: 0
+            }
+          ],
+          [
+            {
+              rowSpan: 1,
+              colSpan: 12,
+              dataIndex: 'imgs',
+              originalRowIndex: 1,
+              type: 'images',
+              originalCellIndex: 0
+            }
+          ]
+        ],
+        width: 'auto',
+        style: {},
+        title: '',
+        designMode: 'VisualTable'
       }
     }
   },

package/src/router/guards.js

@@ -1,6 +1,6 @@
 import { hasAuthority } from '@vue2-client/utils/authority-utils'
 import { loginIgnore } from '@vue2-client/router/index'
-import { checkAuthorization } from '@vue2-client/utils/request'
+import { checkAuthorization, METHOD, request } from '@vue2-client/utils/request'
 import NProgress from 'nprogress'
 import { logout } from '@vue2-client/services/user'
 import {
@@ -10,6 +10,7 @@ import {
 import AES from '@vue2-client/utils/EncryptUtil'
 import Vue from 'vue'
 import { funcToRouter, loadRoutes } from '@vue2-client/utils/routerUtil'
+import { LOGIN } from '@vue2-client/services/apiService'
 
 NProgress.configure({ showSpinner: false })
 
@@ -39,7 +40,11 @@ const loginGuard = (to, from, next, options) => {
     window.microApp.dispatch({ type: '子应用发送给主应用的数据', to: to.path })
   }
   const urlParams = new URLSearchParams(window.location.search)
+  // 如果是需要我们自己登陆的项目
   const token = urlParams.get('token')
+  // 如果是v2 的项目 资源管理和营收分开库的那种项目 传递用户信息进来
+  const tokenV2 = urlParams.get('tokenV2')
+  // 如果是 v4 的父项目，通过localStorage传递信息
   const V4_LOGIN_DATA_KEY = localStorage.getItem('v4LoginData')
   if (token) {
     const { AESDecrypt } = AES
@@ -69,6 +74,34 @@ const loginGuard = (to, from, next, options) => {
         next()
       }
     }
+  } else if (tokenV2) {
+    const { AESDecrypt } = AES
+    const info = AESDecrypt(tokenV2, '3KMKqvgwR8ULbR8Z')
+    request(`/rs/user/${info.name}/${info.password}/智慧燃气`, METHOD.GET).then(
+      res => {
+        const curUser = {
+          name: res.name,
+          username: res.name,
+          orgid: res.name,
+          avatar: '',
+          ename: res.ename,
+          id: res.id,
+          orgName: res.f_fengongsi,
+          contact: '',
+          phone: '',
+          orgs: res.orgs
+        }
+        Vue.$store.commit('account/setUser', Object.assign(curUser, res))
+        const login = {
+          f: res,
+          jwt: res.id,
+          r: res.roles
+        }
+        Vue.$store.commit('account/setLogin', login)
+        loadRoutes(funcToRouter(res.functions))
+        next()
+      }
+    )
   } else if (V4_LOGIN_DATA_KEY) {
     const v4LoginData = JSON.parse(localStorage.getItem('userInfo'))
     const curUser = {

package/vue.config.js

@@ -14,6 +14,9 @@ const isProd = process.env.NODE_ENV === 'production'
 const v3Server = 'http://121.36.106.17:8400'
 const gateway = 'http://192.168.50.67:31467'
 const testUpload = 'http://123.60.214.109:8406'
+const OSSServerDev = 'http://192.168.50.67:30351'
+// const OSSServerProd = 'http://192.168.50.67:31351'
+// const testUploadLocal = 'http://127.0.0.1:9001'
 // v3 铜川
 // const v3Server = 'http://61.134.55.234:8405'
 // const gateway = 'http://61.134.55.234:8456/webmeter'
@@ -34,6 +37,11 @@ module.exports = {
         ws: false,
         changeOrigin: true
       },
+      // '/api/af-system/resource': {
+      //   pathRewrite: { '^/api/af-system': '/' },
+      //   target: testUpload,
+      //   changeOrigin: true
+      // },
       '/api': {
         // v3用
         // pathRewrite: { '^/api/af-system/': '/rs/', '^/api/af-iot/': '/rs/' },
@@ -50,6 +58,11 @@ module.exports = {
         pathRewrite: { '^/ai': '/' },
         changeOrigin: true
       },
+      '/oss': {
+        target: OSSServerDev,
+        pathRewrite: { '^/oss': '/' },
+        changeOrigin: true
+      },
     },
     client: {
       overlay: false
@@ -74,7 +87,8 @@ module.exports = {
     config.resolve = {
       extensions: ['.js', '.vue', '.json'],
       alias: {
-        '@vue2-client': path.resolve('src')
+        '@vue2-client': path.resolve('src'),
+        '@': path.resolve('src')
       }
     }
     config.entry.app = ['core-js/stable', 'regenerator-runtime/runtime', 'whatwg-fetch', './src/main.js']