doway-coms 2.8.5 → 2.8.7

package/package.json

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

package/packages/BaseGrid/src/index.vue

@@ -1664,31 +1664,33 @@ export default {
         case 'copyRow':
           if(this.gridEdit){
             this.copySaveRow=JSON.parse(JSON.stringify(row))
+            
           }
           break
-          case 'paste':
-        if (this.copySaveRow && this.gridEdit) {
-          if (this.treeConfig) {
-              let parentField = this.treeConfig.parentField ? this.treeConfig.parentField : 'parentId'
-              let childrenField = this.treeConfig.childrenField ? this.treeConfig.childrenField : 'children'
-              //树情况下 分批插入
-              this.copySaveRow.id= this.$store.getters.newId() + ''
-              let tmpRow = JSON.parse(JSON.stringify(this.copySaveRow))
-              delete tmpRow['_X_ROW_KEY']
-              delete tmpRow[childrenField]
-              tmpRow[parentField]=row==null?null:row.id
-              $table.insertAt(tmpRow, -1)
-                .then(({ row }) => {
-                  pasteChildren(this.copySaveRow, childrenField,parentField)
-                  this.$emit('paste', row)
-                })
-            }  else {
-              $table.insertAt(this.copySaveRow, -1)
-                .then(({ row }) => {
-                  this.$emit('paste', row)
-                })
+        case 'paste':
+          if (this.copySaveRow && this.gridEdit) {
+            if (this.treeConfig) {
+                let parentField = this.treeConfig.parentField ? this.treeConfig.parentField : 'parentId'
+                let childrenField = this.treeConfig.childrenField ? this.treeConfig.childrenField : 'children'
+                //树情况下 分批插入
+                this.copySaveRow.id= this.$store.getters.newId() + ''
+                let tmpRow = JSON.parse(JSON.stringify(this.copySaveRow))
+                delete tmpRow['_X_ROW_KEY']
+                delete tmpRow[childrenField]
+                tmpRow[parentField]=row==null?null:row.id
+                $table.insertAt(tmpRow, -1)
+                  .then(({ row }) => {
+                    pasteChildren(this.copySaveRow, childrenField,parentField)
+                    this.$emit('paste', row)
+                  })
+              }  else {
+                 this.copySaveRow.id= this.$store.getters.newId() + ''
+                $table.insertAt(this.copySaveRow, -1)
+                  .then(({ row }) => {
+                    this.$emit('paste', row)
+                  })
+              }
             }
-          }
           break
         case 'clearFilter':
           // 示例

package/packages/utils/store.js

@@ -1,39 +1,39 @@
-
-import {loadViewInfo,loadLangInfo} from './api'
+import {loadViewInfo, loadLangInfo} from './api'
 import XEUtils from 'xe-utils'
 import Vue from 'vue'
 import Vuex from 'vuex'
 import {stringUrlQuery} from './common'
-import { controlType } from './enum'
+import {controlType} from './enum'
+
 Vue.use(Vuex)
 
 export default new Vuex.Store({
     state: {
-        moduleLangUrl:'',
-        umsUrl:'',
-        baseUrl:'',
-        msgUrl:'',
-        wmsUrl:'',
-        identityUrl:'',
+        moduleLangUrl: '',
+        umsUrl: '',
+        baseUrl: '',
+        msgUrl: '',
+        wmsUrl: '',
+        identityUrl: '',
         token: '',
-        industryVersion:'',//行业版本
-        custPriceNotTaxPrecision:0,
-        custPricePrecision:0,
-        supplyPriceNotTaxPrecision:0,
-        supplyPricePrecision:0,
-        isGenerateMatCode:'false',//是否生成物料编码
+        industryVersion: '',//行业版本
+        custPriceNotTaxPrecision: 0,
+        custPricePrecision: 0,
+        supplyPriceNotTaxPrecision: 0,
+        supplyPricePrecision: 0,
+        isGenerateMatCode: 'false',//是否生成物料编码
         webAppCode: '',
         moduleViewInfo: {},
-        moduleLangInfo:{},
+        moduleLangInfo: {},
         controlSize: 'small',
         newId: 0,//明细新增id
         userId: '',
         userName: '',
         staffId: '',
-      },
-      mutations: {
+    },
+    mutations: {
         SET_TOKEN: (state, token) => {
-          state.token = token
+            state.token = token
         },
         SET_USERID: (state, userId) => {
             state.userId = userId
@@ -44,212 +44,214 @@ export default new Vuex.Store({
         SET_STAFFID: (state, staffId) => {
             state.staffId = staffId
         },
-        SET_INDUSTRY_VERSION:(state,industryVersion)=>{
-          state.industryVersion = industryVersion
+        SET_INDUSTRY_VERSION: (state, industryVersion) => {
+            state.industryVersion = industryVersion
         },
-        SET_IS_GENERATE_MAT_CODE:(state,isGenerateMatCode)=>{
-          state.isGenerateMatCode = isGenerateMatCode
+        SET_IS_GENERATE_MAT_CODE: (state, isGenerateMatCode) => {
+            state.isGenerateMatCode = isGenerateMatCode
         },
         SET_WEB_APP_CODE: (state, webAppCode) => {
-          state.webAppCode = webAppCode
+            state.webAppCode = webAppCode
         },
-        SET_MODULE_LANG_INFO:(state,data)=>{
-          state.moduleLangInfo[data.moduleCode] = data.info
+        SET_MODULE_LANG_INFO: (state, data) => {
+            state.moduleLangInfo[data.moduleCode] = data.info
         },
         SET_MODULE_VIEW_INFO: (state, data) => {
-          let tempDataInfo = {}
-          XEUtils.arrayEach(data.info.datas,loopData=>{
-            let tempFields = []
-            let tempPagerButtons = []
-            tempDataInfo[loopData.code] = {code:'',name:'',fields:[]}
-            tempDataInfo[loopData.code].code = loopData.code
-            tempDataInfo[loopData.code].name = loopData.name
-            tempDataInfo[loopData.code].extraInfo = loopData.extraInfo
-            let operationFields = []
-            XEUtils.arrayEach(loopData.fields,loopField=>{
-                let tempField = {
-                  field: loopField.boundField,
-                  title: loopField.name,
-                  width: loopField.width,
-                  visible: !loopField.hidden,
-                  filters: loopField.isFilter,
-                  sortable: loopField.isSortable,
-                  controlType: loopField.controlType,
-                  edit:loopField.edit,
-                  sysVisible:!loopField.sysHidden
-                }
-                if(tempField.sysVisible===false){
-                  tempField.visible = false
-                }
-                //页面状态控制
-                if(loopField.editStates){
-                  tempField['editStates'] = loopField.editStates.split(',')
-                  tempField['visibleStates'] = loopField.editStates.split(',')
-                }
-                //单据状态控制
-                if(loopField.editStatuss){
-                  tempField['editStatuss'] = loopField.editStatuss.split(',')
-                  tempField['visibleStatuss'] = loopField.editStatuss.split(',')
-                }
-                let extraInfo = loopField.extraInfo
-                    ? JSON.parse(loopField.extraInfo)
-                    : {}
-                let userExtraInfo = loopField.userExtraInfo
-                    ? JSON.parse(loopField.userExtraInfo)
-                    : {}
-                extraInfo = {...extraInfo, ...userExtraInfo}
-                //存在额外参数，就赋值
-                if (Object.keys(extraInfo).length) {
-                    if (Object.hasOwn(extraInfo,'api')){
-                        extraInfo['api'] = state[extraInfo['url']] + extraInfo['api']
+            let tempDataInfo = {}
+            XEUtils.arrayEach(data.info.datas, loopData => {
+                let tempFields = []
+                let tempPagerButtons = []
+                tempDataInfo[loopData.code] = {code: '', name: '', fields: []}
+                tempDataInfo[loopData.code].code = loopData.code
+                tempDataInfo[loopData.code].name = loopData.name
+                tempDataInfo[loopData.code].extraInfo = loopData.extraInfo
+                let operationFields = []
+                XEUtils.arrayEach(loopData.fields, loopField => {
+                    let tempField = {
+                        field: loopField.boundField,
+                        title: loopField.name,
+                        width: loopField.width,
+                        visible: !loopField.hidden,
+                        filters: loopField.isFilter,
+                        sortable: loopField.isSortable,
+                        controlType: loopField.controlType,
+                        edit: loopField.edit,
+                        sysVisible: !loopField.sysHidden
+                    }
+                    if (tempField.sysVisible === false) {
+                        tempField.visible = false
+                    }
+                    //页面状态控制
+                    if (loopField.editStates) {
+                        tempField['editStates'] = loopField.editStates.split(',')
+                        tempField['visibleStates'] = loopField.editStates.split(',')
+                    }
+                    //单据状态控制
+                    if (loopField.editStatuss) {
+                        tempField['editStatuss'] = loopField.editStatuss.split(',')
+                        tempField['visibleStatuss'] = loopField.editStatuss.split(',')
+                    }
+                    let extraInfo = loopField.extraInfo
+                        ? JSON.parse(loopField.extraInfo)
+                        : {}
+                    let userExtraInfo = loopField.userExtraInfo
+                        ? JSON.parse(loopField.userExtraInfo)
+                        : {}
+                    extraInfo = {...extraInfo, ...userExtraInfo}
+                    //存在额外参数，就赋值
+                    if (Object.keys(extraInfo).length) {
+                        if (Object.hasOwn(extraInfo, 'api')) {
+                            extraInfo['api'] = state[extraInfo['url']] + extraInfo['api']
+                        }
+                        tempField = XEUtils.assign(extraInfo, tempField)
+                    }
+                    if (tempField.controlType === controlType.select) {
+                        tempField['dataSource'] = XEUtils.filter(
+                            data.info.dictItems,
+                            p => p.dictCode === extraInfo.dataSource
+                        )
                     }
-                    tempField = XEUtils.assign(extraInfo, tempField)
-                }
-                if (tempField.controlType === controlType.select) {
-                  tempField['dataSource'] = XEUtils.filter(
-                    data.info.dictItems,
-                    p => p.dictCode === extraInfo.dataSource
-                  )
-                }
-
-                if(tempField.controlType === controlType.pager_button){
-                  tempPagerButtons.push(tempField)
-                }else if(tempField.controlType===controlType.operation){
-                   //操作按钮列
-                    // 动态加载 visibleConditional 函数 来控制操作按钮是否显示
-                  if (tempField.visibleConditional){
-                      tempField.visibleConditional = eval(`(${tempField.visibleConditional})`);
-                  }
-                  operationFields.push(tempField)
 
-                }
-                else{
-                  tempFields.push(tempField)
-                }
-            })
+                    if (tempField.controlType === controlType.pager_button) {
+                        tempPagerButtons.push(tempField)
+                    } else if (tempField.controlType === controlType.operation) {
+                        //操作按钮列
+                        // 动态加载 visibleConditional 函数 来控制操作按钮是否显示
+                        if (tempField.visibleConditional) {
+                            tempField.visibleConditional = eval(`(${tempField.visibleConditional})`);
+                        }
+                        operationFields.push(tempField)
 
-            tempDataInfo[loopData.code]['pagerButtons'] = tempPagerButtons
-            if(operationFields.length>0){
-                //添加右侧按钮操作列
-                tempFields.push({
-                  field: controlType.operation,
-                  title: '操作',
-                  width: operationFields[0].width || 100,
-                  fixed: 'right',
-                  showOverflow: true,
-                  controlType: controlType.operation,
-                  params:{
-                     columns:operationFields
-                  }
+                    } else {
+                        tempFields.push(tempField)
+                    }
                 })
-            }
-            tempDataInfo[loopData.code]['fields'] = tempFields
 
-          })
-          data.info['dataInfo'] = tempDataInfo
-          state.moduleViewInfo[data.moduleCode] = data.info
+                tempDataInfo[loopData.code]['pagerButtons'] = tempPagerButtons
+                if (operationFields.length > 0) {
+                    //添加右侧按钮操作列
+                    tempFields.push({
+                        field: controlType.operation,
+                        title: '操作',
+                        width: operationFields[0].width || 100,
+                        fixed: 'right',
+                        showOverflow: true,
+                        controlType: controlType.operation,
+                        params: {
+                            columns: operationFields
+                        }
+                    })
+                }
+                tempDataInfo[loopData.code]['fields'] = tempFields
+
+            })
+            data.info['dataInfo'] = tempDataInfo
+            state.moduleViewInfo[data.moduleCode] = data.info
         },
         SET_NEW_ID: (state, id) => {
-          state.newId = id
+            state.newId = id
+        },
+        SET_UMS_URL: (state, url) => {
+            state.umsUrl = url
+        },
+        SET_MODULE_LANG_URL: (state, url) => {
+            state.moduleLangUrl = url
         },
-        SET_UMS_URL:(state,url) => {
-          state.umsUrl = url
+        SET_BASE_URL: (state, url) => {
+            state.baseUrl = url
         },
-        SET_MODULE_LANG_URL:(state,url) => {
-          state.moduleLangUrl = url
+        SET_WMS_URL: (state, url) => {
+            state.wmsUrl = url
         },
-        SET_BASE_URL:(state,url) => {
-          state.baseUrl = url
+        SET_CUST_PRICE_NOT_TAX_PRECISION: (state, custPriceNotTaxPrecision) => {
+            state.custPriceNotTaxPrecision = custPriceNotTaxPrecision
         },
-        SET_WMS_URL:(state,url) => {
-              state.wmsUrl = url
+        SET_CUST_PRICE_PRECISION: (state, custPricePrecision) => {
+            state.custPricePrecision = custPricePrecision
         },
-        SET_CUST_PRICE_NOT_TAX_PRECISION:(state,custPriceNotTaxPrecision)=>{
-          state.custPriceNotTaxPrecision = custPriceNotTaxPrecision
+        SET_SUPPLY_PRICE_NOT_TAX_PRECISION: (state, supplyPriceNotTaxPrecision) => {
+            state.supplyPriceNotTaxPrecision = supplyPriceNotTaxPrecision
         },
-        SET_CUST_PRICE_PRECISION:(state,custPricePrecision)=>{
-          state.custPricePrecision = custPricePrecision
+        SET_SUPPLY_PRICE_PRECISION: (state, supplyPricePrecision) => {
+            state.supplyPricePrecision = supplyPricePrecision
         },
-        SET_SUPPLY_PRICE_NOT_TAX_PRECISION:(state,supplyPriceNotTaxPrecision)=>{
-          state.supplyPriceNotTaxPrecision = supplyPriceNotTaxPrecision
+        SET_MSG_URL: (state, url) => {
+            state.msgUrl = url
         },
-        SET_SUPPLY_PRICE_PRECISION:(state,supplyPricePrecision)=>{
-          state.supplyPricePrecision = supplyPricePrecision
+        SET_IDENTITY_URL: (state, url) => {
+            state.identityUrl = url
         },
-        SET_MSG_URL:(state,url) => {
-          state.msgUrl = url
+        SET_BASE_SETTING: (state, baseSetting) => {
+            state.baseSetting = baseSetting
         },
-        SET_IDENTITY_URL:(state,url) => {
-          state.identityUrl = url
+        SET_DEFAULT_DEP: (state, defaultDep) => {
+            state.defaultDep = defaultDep
         },
-        SET_BASE_SETTING:(state,baseSetting) => {
-              state.baseSetting = baseSetting
-          },
-      },
-      actions: {
+    },
+    actions: {
         /**
          * 系统登出
          * @param {} param0
          */
-        logOut({commit}){
-          // alert('会话过期3');
-          if(window.$wujie){
-            // alert('会话过期4');
-            //通知主应用会员过期重新登陆
+        logOut({commit}) {
+            // alert('会话过期3');
+            if (window.$wujie) {
+                // alert('会话过期4');
+                //通知主应用会员过期重新登陆
                 window.$wujie.bus.$emit(
-                  'subAppLoginOut',window.$wujie.props.webAppCode
+                    'subAppLoginOut', window.$wujie.props.webAppCode
                 )
             }
         },
-        setTabTitle({ commit }, tabInfo) {
-          if (tabInfo.replaceQuery) {
-            let newRoutePath =
-              tabInfo.path + '?' + stringUrlQuery(tabInfo.replaceQuery)
-            history.replaceState(null,null,(window.$wujie.props.webAppActiveRule + newRoutePath))
-          }
-          //通知父应用修改Tab标签文字描述
-          if(window.$wujie){
-              window.$wujie.bus.$emit('subAppSetTabTitle', {
-                title: tabInfo.title,
-                name: tabInfo.name,
-                query: tabInfo.query,
-                replaceQuery: tabInfo.replaceQuery,
-                path: tabInfo.path
-              })
-          }
+        setTabTitle({commit}, tabInfo) {
+            if (tabInfo.replaceQuery) {
+                let newRoutePath =
+                    tabInfo.path + '?' + stringUrlQuery(tabInfo.replaceQuery)
+                history.replaceState(null, null, (window.$wujie.props.webAppActiveRule + newRoutePath))
+            }
+            //通知父应用修改Tab标签文字描述
+            if (window.$wujie) {
+                window.$wujie.bus.$emit('subAppSetTabTitle', {
+                    title: tabInfo.title,
+                    name: tabInfo.name,
+                    query: tabInfo.query,
+                    replaceQuery: tabInfo.replaceQuery,
+                    path: tabInfo.path
+                })
+            }
         },
-        closeTab({ commit }, fullPath) {
-          if(window.$wujie){
-              window.$wujie.bus.$emit(
-                'subAppCloseTab',
-                window.$wujie.props.webAppActiveRule + fullPath
-              )
-          }
+        closeTab({commit}, fullPath) {
+            if (window.$wujie) {
+                window.$wujie.bus.$emit(
+                    'subAppCloseTab',
+                    window.$wujie.props.webAppActiveRule + fullPath
+                )
+            }
         },
-        moduleLoadViewInfo({ commit, state }, dataInfo) {
-          let vm = this
-          return new Promise((resolve, reject) => {
-            loadViewInfo(dataInfo.moduleCode)
-              .then(reponseData => {
-                commit('SET_MODULE_VIEW_INFO', {
-                  moduleCode: dataInfo.moduleCode,
-                  info: reponseData.content
-                })
-                loadLangInfo(dataInfo.moduleCode,reponseData.content.moduleLangCacheHash)
-                .then(langData=>{
-                  commit('SET_MODULE_LANG_INFO', {
-                    moduleCode: dataInfo.moduleCode,
-                    info: langData.data
-                  })
-                  resolve()
-                }).catch(()=>{
-                   resolve()
-                })
-              })
-              .catch(error => {
-                reject(error)
-              })
-          })
+        moduleLoadViewInfo({commit, state}, dataInfo) {
+            let vm = this
+            return new Promise((resolve, reject) => {
+                loadViewInfo(dataInfo.moduleCode)
+                    .then(reponseData => {
+                        commit('SET_MODULE_VIEW_INFO', {
+                            moduleCode: dataInfo.moduleCode,
+                            info: reponseData.content
+                        })
+                        loadLangInfo(dataInfo.moduleCode, reponseData.content.moduleLangCacheHash)
+                            .then(langData => {
+                                commit('SET_MODULE_LANG_INFO', {
+                                    moduleCode: dataInfo.moduleCode,
+                                    info: langData.data
+                                })
+                                resolve()
+                            }).catch(() => {
+                            resolve()
+                        })
+                    })
+                    .catch(error => {
+                        reject(error)
+                    })
+            })
         },
         // moduleLoadLangInfo({ commit, state }, dataInfo) {
         //   let vm = this
@@ -269,46 +271,47 @@ export default new Vuex.Store({
         //   })
         // },
         // 固定返回工作台，并根据条件决定是否关闭其余标签
-        goWorkbench({ commit }, tabsAllClose) {
-          if(window.$wujie){
-            window.$wujie.bus.$emit('subAppGoWorkbench', tabsAllClose==false?false:true)
-          }
+        goWorkbench({commit}, tabsAllClose) {
+            if (window.$wujie) {
+                window.$wujie.bus.$emit('subAppGoWorkbench', tabsAllClose == false ? false : true)
+            }
         },
         // 替换页面
-        replaceTab({ commit }, fullPath) {
-          if(window.$wujie){
-            window.$wujie.bus.$emit(
-              'subAppReplaceTab',
-              window.$wujie.props.webAppActiveRule + fullPath
-            )
-          }
+        replaceTab({commit}, fullPath) {
+            if (window.$wujie) {
+                window.$wujie.bus.$emit(
+                    'subAppReplaceTab',
+                    window.$wujie.props.webAppActiveRule + fullPath
+                )
+            }
         },
-      },
-      modules:{},
-      getters: {
-        custPriceNotTaxPrecision:state=>state.custPriceNotTaxPrecision,
-        custPricePrecision:state=>state.custPricePrecision,
-        supplyPriceNotTaxPrecision:state=>state.supplyPriceNotTaxPrecision,
-        supplyPricePrecision:state=>state.supplyPricePrecision,
-        industryVersion:state=>state.industryVersion,
-        isGenerateMatCode:state=>state.isGenerateMatCode,
-        umsUrl:state=>state.umsUrl,
-        moduleLangUrl:state=>state.moduleLangUrl,
-        baseUrl:state=>state.baseUrl,
-        msgUrl:state=>state.msgUrl,
-        identityUrl:state=>state.identityUrl,
+    },
+    modules: {},
+    getters: {
+        custPriceNotTaxPrecision: state => state.custPriceNotTaxPrecision,
+        custPricePrecision: state => state.custPricePrecision,
+        supplyPriceNotTaxPrecision: state => state.supplyPriceNotTaxPrecision,
+        supplyPricePrecision: state => state.supplyPricePrecision,
+        industryVersion: state => state.industryVersion,
+        isGenerateMatCode: state => state.isGenerateMatCode,
+        umsUrl: state => state.umsUrl,
+        moduleLangUrl: state => state.moduleLangUrl,
+        baseUrl: state => state.baseUrl,
+        msgUrl: state => state.msgUrl,
+        identityUrl: state => state.identityUrl,
         token: state => state.token,
         webAppCode: state => state.webAppCode,
         moduleViewInfo: state => state.moduleViewInfo,
         moduleLangInfo: state => state.moduleLangInfo,
         controlSize: state => state.controlSize,
         newId: state => () => {
-          state.newId = state.newId + 1
-          return state.newId
+            state.newId = state.newId + 1
+            return state.newId
         },
         userId: state => state.userId,
         userName: state => state.userName,
         staffId: state => state.staffId,
         baseSetting: state => state.baseSetting,
-      }
+        defaultDep: state => state.defaultDep
+    }
 })