doway-coms 1.4.55 → 1.4.57

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doway-coms",
-  "version": "1.4.55",
+  "version": "1.4.57",
   "description": "doway组件库",
   "author": "dowaysoft",
   "main": "packages/index.js",

package/packages/BaseGrid/src/index.vue

@@ -243,20 +243,7 @@
           <a-button
             type="link"
             @click="operationButtonClick(item, scope)"
-            v-show="
-              item.visible === true &&
-              !(scope.row['sysOperationDisVisible_' + item.field] === true) &&
-              item.visibleStatuss != undefined
-                ? item.visibleStatuss.indexOf(scope.row.status) != -1
-                : true &&
-              item.visibleState != undefined &&
-                item.visibleState.field != undefined &&
-                item.visibleState.visibleStatuss != undefined
-                ? item.visibleState.visibleStatuss.indexOf(
-                  scope.row[item.visibleState.field]
-                ) != -1
-                : true
-            "
+            v-show="operationEdit(item, scope)"
             v-for="item in scope.column.params.columns"
             :key="item.field"
           >
@@ -1732,6 +1719,19 @@ export default {
       }
       this.$emit("operationBtnClick", btn, scope.row, this);
     },
+    operationEdit(item, scope) {
+      let isShow =
+        item.visible === true &&
+        !(scope.row["sysOperationDisVisible_" + item.field] === true) &&
+        (item.visibleState != undefined &&
+        item.visibleState.field != undefined &&
+        item.visibleState.visibleStatuss != undefined
+          ? item.visibleState.visibleStatuss.indexOf(
+              scope.row[item.visibleState.field]
+            ) != -1
+          : true);
+      return isShow;
+    },
     activeCellMethod({ row, column }) {
       let emitData ={
         row:row,

package/packages/utils/api.js

@@ -12,24 +12,35 @@ export function loadViewInfo(moduleCode) {
 
 export function saveUserModuleDataFieldApi(data) {
   return request({
-    url:  store.getters.umsUrl + '/v1/user/saveUserModuleDataField',
+    url: store.getters.umsUrl + '/v1/user/saveUserModuleDataField',
     method: 'post',
     data: data
   })
 }
 
 export function attachGetAttachUrlApi() {
-    return  store.getters.msgUrl + '/v1/Attach'
-  }
-  
-  /**
-   * 获取cust信息列表
-   * @param postData 提交的数据，分页信息
-   */
-  export function attachSearchApi(postData) {
-    return request({
-      url:   store.getters.msgUrl + '/v1/Attach/Search',
-      method: 'post',
-      data: postData
-    })
-  }
+  return store.getters.msgUrl + '/v1/Attach'
+}
+
+/**
+ * 获取cust信息列表
+ * @param postData 提交的数据，分页信息
+ */
+export function attachSearchApi(postData) {
+  return request({
+    url: store.getters.msgUrl + '/v1/Attach/Search',
+    method: 'post',
+    data: postData
+  })
+}
+
+/**
+ * 验证
+ */
+export function licenseAuthorizeApi(data) {
+  return request({
+    url: store.getters.identityUrl + '/oauth/licenseAuthorize',
+    method: 'post',
+    data: data
+  })
+}

package/packages/utils/request.js

@@ -1,5 +1,6 @@
 import axios from 'axios'
-import { notification } from 'ant-design-vue'
+import { licenseAuthorizeApi } from './api'
+import { notification, message, Modal, Input } from 'ant-design-vue'
 import Vue from 'vue'
 import store from './store'
 import moment from 'moment'
@@ -55,6 +56,69 @@ service.interceptors.response.use(
     if (res.status === 200 || res.code === 200) {
       return response.data
     }
+    if (res.code == 60001) {
+      return new Promise((resolve, reject) => {
+        let inputVal = '';
+        Modal.info({
+          zIndex: 3100,
+          title: '授权',
+          okText: '授权',
+          destroyOnClose: true,
+          keyboard: true,
+          content:  h => {
+            return h('div', null, [
+              h(Input, {
+                attrs: {
+                  type: 'text',
+                  placeholder: "请输入许可",
+                },
+                on: {
+                  input: event => {
+                    inputVal = event.target.value;
+                  },
+                },
+              }),
+            ]);
+          },
+          async onOk() {
+            try {
+              let data = {
+                system: store.state.webAppCode,
+                license: inputVal
+              }
+              let info =  await licenseAuthorizeApi(data)
+              Modal.info({
+                zIndex: 4000,
+                title: '成功信息',
+                content:  h => {
+                  return h('div', null, [
+                    h('div', null, `验证成功,许可有效期至:${info.content},请重新登录`),
+                  ]);
+                },
+                onOk() {
+                  // 返回登录页
+                  store.dispatch('logOut')
+                }
+              });
+            }
+            catch (error) {
+              Modal.error({
+                zIndex: 4000,
+                title: '错误信息',
+                destroyOnClose: true,
+                keyboard: true,
+                content:  h => {
+                  return h('div', null, [
+                    h('div', null, error),
+                  ]);
+                },
+              })
+              return Promise.reject(error)
+            }
+          },
+        });
+      })
+    }
     if (res.status === undefined && res.code === undefined) {
       return response.data
     }

package/packages/utils/store.js

@@ -11,6 +11,7 @@ export default new Vuex.Store({
     state: {
         umsUrl:'',
         msgUrl:'',
+        identityUrl:'',
         token: '',
         industryVersion:'',//行业版本
         custPriceNotTaxPrecision:0,
@@ -92,7 +93,7 @@ export default new Vuex.Store({
           state.newId = id
         },
         SET_UMS_URL:(state,url) => {
-            state.umsUrl = url
+          state.umsUrl = url
         },
         SET_CUST_PRICE_NOT_TAX_PRECISION:(state,custPriceNotTaxPrecision)=>{
           state.custPriceNotTaxPrecision = custPriceNotTaxPrecision
@@ -107,8 +108,11 @@ export default new Vuex.Store({
           state.supplyPricePrecision = supplyPricePrecision
         },
         SET_MSG_URL:(state,url) => {
-            state.msgUrl = url
-        }
+          state.msgUrl = url
+        },
+        SET_IDENTITY_URL:(state,url) => {
+          state.identityUrl = url
+        },
       },
       actions: {
         /**
@@ -177,6 +181,7 @@ export default new Vuex.Store({
         isGenerateMatCode:state=>state.isGenerateMatCode,
         umsUrl:state=>state.umsUrl,
         msgUrl:state=>state.msgUrl,
+        identityUrl:state=>state.identityUrl,
         token: state => state.token,
         webAppCode: state => state.webAppCode,
         moduleViewInfo: state => state.moduleViewInfo,