doway-coms 2.10.11 → 2.10.13

package/package.json

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

package/packages/BaseGrid/src/index.vue

@@ -1701,7 +1701,8 @@ export default {
                     this.$emit('paste', row)
                   })
               }  else {
-                 this.copySaveRow.id= this.$store.getters.newId() + ''
+                delete this.copySaveRow['_X_ROW_KEY']
+                this.copySaveRow.id= this.$store.getters.newId() + ''
                 $table.insertAt(this.copySaveRow, -1)
                   .then(({ row }) => {
                     this.$emit('paste', row)

package/packages/utils/api.js

@@ -1,13 +1,11 @@
 import request from './request'
 import store from './store'
 import axios from 'axios'
-export function loadViewInfo(moduleCode) {
+export function loadViewInfo(params) {
   return request({
     url: store.getters.umsUrl + '/v1/module/loadViewInfo',
     method: 'get',
-    params: {
-      moduleCode: moduleCode
-    }
+    params
   })
 }
 export function loadLangInfo(moduleCode,moduleLangCacheHash) {
@@ -105,4 +103,4 @@ export function userResetApi(data) {
     method: 'get',
     params: data
   })
-}
+}

package/packages/utils/common.js

@@ -59,7 +59,7 @@ export function replaceParamString(
       tempStr = tempStr.substr(
         tempStr.indexOf(tempReplaceParam) + tempReplaceParam.length
       )
-  
+
       if (typeof tempReplaceValue === 'string') {
         paramString = paramString.replace(
           tempReplaceParam,
@@ -73,7 +73,7 @@ export function replaceParamString(
     }
     return paramString
   }
-  
+
   /**
    * 替换掩码参数字符串
    * @param {参数字符串} paramString
@@ -104,7 +104,7 @@ export function replaceParamString(
       tempStr = tempStr.substr(
         tempStr.indexOf(tempReplaceParam) + tempReplaceParam.length
       )
-  
+
       // if (typeof tempReplaceValue === 'string') {
       //  paramString = paramString.replace(
       //   tempReplaceParam,
@@ -239,7 +239,7 @@ export function replaceParamString(
     const gridErrors = await gridView.fullValidate()
     return gridErrors
   }
-  
+
   export function routeBeforeEach(to, from, next){
     if(to.params.aliveCacheKey){
         to.meta['aliveCacheKey'] = to.params.aliveCacheKey
@@ -263,7 +263,7 @@ export function replaceParamString(
         //    next()
         // }))
         store
-          .dispatch('moduleLoadViewInfo', { moduleCode: to.meta.moduleCode })
+          .dispatch('moduleLoadViewInfo', { moduleCode: to.meta.moduleCode,companyId: store.getters.company.id })
           .then(() => {
             next()
           })
@@ -493,7 +493,7 @@ export function custUnitPriceNotTaxAmount(rowInfo, taxRate, colInfo) {
 }
 /**
  * 设置行业属性字段信息
- * @param {字段} fields 
+ * @param {字段} fields
  */
 export function setIndustryVersionFields(fields){
     let length = fields.length
@@ -614,9 +614,9 @@ export function getGridPagerButton(datas,dataCode){
 }
 /**
  * 获取最大排序步长
- * @param {} datas 
- * @param {*} fieldCode 
- * @param {*} step 
+ * @param {} datas
+ * @param {*} fieldCode
+ * @param {*} step
  */
 export function getStepMaxValue(datas,fieldCode,step){
   let tempSortStep = step
@@ -633,4 +633,4 @@ export function getStepMaxValue(datas,fieldCode,step){
   tempDtlMaxSort = XEUtils.add(tempDtlMaxSort, 1)
   tempDtlMaxSort = XEUtils.multiply(tempDtlMaxSort, tempSortStep)
   return tempDtlMaxSort
-}
+}

package/packages/utils/store.js

@@ -30,6 +30,7 @@ export default new Vuex.Store({
         userId: '',
         userName: '',
         staffId: '',
+        company: {},
     },
     mutations: {
         SET_TOKEN: (state, token) => {
@@ -187,6 +188,9 @@ export default new Vuex.Store({
         SET_DEFAULT_DEP: (state, defaultDep) => {
             state.defaultDep = defaultDep
         },
+        SET_COMPANY: (state, company) => {
+            state.company = company
+        },
     },
     actions: {
         /**
@@ -231,7 +235,10 @@ export default new Vuex.Store({
         moduleLoadViewInfo({commit, state}, dataInfo) {
             let vm = this
             return new Promise((resolve, reject) => {
-                loadViewInfo(dataInfo.moduleCode)
+                loadViewInfo({
+                    moduleCode: dataInfo.moduleCode,
+                    companyId: dataInfo.companyId,
+                })
                     .then(reponseData => {
                         commit('SET_MODULE_VIEW_INFO', {
                             moduleCode: dataInfo.moduleCode,
@@ -312,6 +319,7 @@ export default new Vuex.Store({
         userName: state => state.userName,
         staffId: state => state.staffId,
         baseSetting: state => state.baseSetting,
-        defaultDep: state => state.defaultDep
+        defaultDep: state => state.defaultDep,
+        company: state => state.company
     }
 })