agilebuilder-ui 1.1.39-sit1 → 1.1.39

package/packages/super-grid/src/search-form-item.vue

@@ -213,18 +213,7 @@
       :style="column.searchControlWidth"
       @keyup.enter="submitForm('searchForm')"
       @input="setValueToModelProp(column.prop, $event)"
-      @focus="showEmpty()"
-      @blur="hiddenEmpty()"
-    >
-      <template #suffix>
-        <el-tooltip
-          :content="$t('superGrid.searchEmpty')"
-          placement="bottom"
-        >
-          <el-checkbox v-if="isShowEmtpty" v-model="checkedEmpty" @change="checkEmptyChange"/>
-        </el-tooltip>
-      </template>
-    </el-input>
+    />
   </el-form-item>
 </template>
 
@@ -292,9 +281,7 @@ export default {
       dataTwo: null,
       moduleConfig: {},
       dateVal: this.getFormItemValue(this.column.prop),
-      controlConfig: getControlConfig(this.column),
-      isShowEmtptyFlag: false,
-      // checkedEmpty: false,
+      controlConfig: getControlConfig(this.column)
     }
   },
   computed: {
@@ -304,23 +291,6 @@ export default {
         return data.listToolbarFormData
       }
       return null
-    },
-    isShowEmtpty() {
-      return this.isShowEmtptyFlag
-    },
-    checkedEmpty(){
-      if(this.column._emptyValue  && this.column._emptyValue === '#blank#'){
-        return true
-      }
-      if(this.column._resetValue || this.column._resetValue === undefined){
-        if(this.column._resetValue){
-          this.column._resetValue = undefined
-          this.isShowEmtptyFlag = false
-        }
-        return false
-      } else {
-        return true
-      }
     }
   },
   created() {
@@ -510,25 +480,12 @@ export default {
       if (arr.indexOf('saveAll') !== -1) {
         if (this.searchForm[this.column.prop] && typeof this.searchForm[this.column.prop] === 'string') {
           this.searchForm[this.column.prop] = this.searchForm[this.column.prop].split(',')
+        } else {
+          this.searchForm[this.column.prop] = []
         }
       } else {
         this.searchForm[this.column.prop] = arr
       }
-    },
-    showEmpty(){
-      this.isShowEmtptyFlag = true
-    },
-    hiddenEmpty(){
-      if(!this.checkedEmpty){
-        this.isShowEmtptyFlag = false
-      }
-    },
-    checkEmptyChange(newValue) {
-      if(newValue){
-        this.column._emptyValue='#blank#'
-      } else {
-        this.column._emptyValue=undefined
-      }
     }
   },
   emits: ['submit-form']

package/packages/super-grid/src/search-form-mobile.vue

@@ -157,11 +157,6 @@ export default {
 					}
 					this.setDefaultQueryValue(column, this.searchForm)
 				}
-				// 清空空值状态
-				if(column._emptyValue){
-					column._emptyValue=undefined
-					column._resetValue=true
-				}
 			})
 			// 取消当前选中的条件列表的信息
 			// this.$refs.searchConditionList.editConditionId = null

package/packages/super-grid/src/search-form-ordinarySearch.vue

@@ -162,11 +162,6 @@ export default {
 					}
 					this.setDefaultQueryValue(column, this.searchForm)
 				}
-				// 清空空值状态
-				if(column._emptyValue){
-					column._emptyValue=undefined
-					column._resetValue=true
-				}
 			})
 			// 取消当前选中的条件列表的信息
 			// this.$refs.searchConditionList.editConditionId = null

package/packages/super-grid/src/search-methods.js

@@ -27,7 +27,6 @@ const searchMethods = {
                 param.formatter = column.formatter
                     ? JSON.parse(JSON.stringify(column.formatter))
                     : column.formatter
-                param.isEmptyValue= column._emptyValue && column._emptyValue === '#blank#'?true:false
                 const values = this.getFormItemValue(column.prop)
                 if (column.dataType === 'DATE' || column.dataType === 'TIME') {
                     // 日期 或 时间类型
@@ -441,11 +440,10 @@ const searchMethods = {
                 num++
             })
         } else if (
-            param.isEmptyValue || (
             typeof value !== 'undefined' &&
             value !== '' &&
             value !== null &&
-            !Array.isArray(value))
+            !Array.isArray(value)
         ) {
             // 不是数组
             param.propValue = value

package/packages/utils/organization.ts

@@ -1,5 +1,5 @@
 // 将选中的部门节点添加到结果集合中
-export function addSelectedUserInfo(selectNodeInfo, userData, containBranch) {
+export function addSelectedUserInfo (selectNodeInfo, userData, containBranch) {
   if (selectNodeInfo.userIds.indexOf(userData.id) < 0) {
     // 表示集合中不存在该用户
     selectNodeInfo.userIds.push(userData.id)
@@ -28,7 +28,7 @@ export function addSelectedUserInfo(selectNodeInfo, userData, containBranch) {
     selectNodeInfo.userEnNames.push(userData.enName ? userData.enName : '')
   }
 }
-export function packageSelectResult(user, containBranch) {
+export function packageSelectResult (user, containBranch) {
   let name = user.name
   if (user.enName && user.enName.trim() !== '') {
     name = name + '(' + user.enName + ')'
@@ -47,42 +47,29 @@ export function packageSelectResult(user, containBranch) {
     containBranch: containBranch,
     user: user,
     enName: user.enName ? user.enName : '',
-    subCompanyName: user.subCompanyName,
-    divisionManager: user.divisionManager,
-    divisionManagerName: user.divisionManagerName
+    subCompanyName: user.subCompanyName
   }
   // 表示是勾选单选按钮或 选中树节点
   return selectNodeInfo
 }
 // 根据指定用户信息获得用户集合
-function getSelectUsers(searchField, selectUserInfo, separator) {
+function getSelectUsers (searchField, selectUserInfo, separator) {
   return new Promise((resolve, reject) => {
     if (!searchField) {
       resolve([])
     } else if (!selectUserInfo) {
       resolve([])
     } else {
-      window['$vueApp'].config.globalProperties.$http
-        .get(
-          window['$vueApp'].config.globalProperties.baseAPI +
-            '/component/organization-trees/select-users-mobile?searchField=' +
-            searchField +
-            '&selectUserInfo=' +
-            selectUserInfo +
-            '&separator=' +
-            separator
-        )
-        .then((users) => {
-          resolve(users)
-        })
-        .catch((error) => {
-          reject(error)
-        })
+      window['$vueApp'].config.globalProperties.$http.get(window['$vueApp'].config.globalProperties.baseAPI + '/component/organization-trees/select-users-mobile?searchField=' + searchField + '&selectUserInfo=' + selectUserInfo + '&separator=' + separator).then(users => {
+        resolve(users)
+      }).catch(error => {
+        reject(error)
+      })
     }
   })
 }
 // 部门人员树选中了组织结构树的根节点
-function packageAllUser() {
+function packageAllUser () {
   // 表示集合中不存在该用户，则封装该用户
   const tenantNodeId = -1
   var allUser = {
@@ -92,7 +79,7 @@ function packageAllUser() {
   return allUser
 }
 // 工作组人员树选中了组织结构树的根节点
-function packageAllWgUser() {
+function packageAllWgUser () {
   // 表示集合中不存在该用户，则封装该用户
   const tenantNodeId = -1
   var allUser = {
@@ -101,7 +88,7 @@ function packageAllWgUser() {
   }
   return allUser
 }
-export function initSelectUsers(searchField, selectUserInfo, separator) {
+export function initSelectUsers (searchField, selectUserInfo, separator) {
   return new Promise((resolve, reject) => {
     const selectDepts = []
     if (selectUserInfo) {
@@ -114,13 +101,11 @@ export function initSelectUsers(searchField, selectUserInfo, separator) {
         resolve(selectDepts)
       } else {
         // 表示不是选择的所有用户
-        getSelectUsers(searchField, selectUserInfo, separator)
-          .then((users) => {
-            resolve(users)
-          })
-          .catch((error) => {
-            reject(error)
-          })
+        getSelectUsers(searchField, selectUserInfo, separator).then(users => {
+          resolve(users)
+        }).catch(error => {
+          reject(error)
+        })
       }
     } else {
       resolve(selectDepts)
@@ -128,8 +113,9 @@ export function initSelectUsers(searchField, selectUserInfo, separator) {
   })
 }
 
+
 // import {getLanguageWithLocale} from '../../../src/utils/util'
-export function resizeScrollTargetHeightUtil() {
+export function resizeScrollTargetHeightUtil () {
   const pagePadding = 16
   let height = window.innerHeight - pagePadding
   const header = document.querySelector('.el-page-header')
@@ -143,31 +129,29 @@ export function resizeScrollTargetHeightUtil() {
   return height
 }
 
-export function getUserMainDeptName(user) {
-  let deptShowName = ''
-  if (user && user.data) {
-    const userData = JSON.parse(user.data)
-    if (
-      userData.mainDepartmentEnName &&
-      userData.mainDepartmentEnName !== '' &&
-      window['$locale'] &&
-      window['$locale'] !== 'cn'
-    ) {
-      deptShowName = userData.mainDepartmentEnName
-    } else {
-      if (userData.mainDepartmentName && userData.mainDepartmentName !== '') {
-        deptShowName = userData.mainDepartmentName
-      }
+
+export function  getUserMainDeptName (user) {
+let deptShowName = ''
+if (user && user.data) {
+  const userData = JSON.parse(user.data)
+  if (userData.mainDepartmentEnName && userData.mainDepartmentEnName !== '' && window['$locale'] && window['$locale'] !== 'cn') {
+    deptShowName = userData.mainDepartmentEnName
+  } else {
+    if (userData.mainDepartmentName && userData.mainDepartmentName !== '') {
+      deptShowName = userData.mainDepartmentName
     }
   }
-  return deptShowName
+}
+return deptShowName
 }
 
-export function getDeptNamePath(dept) {
-  let deptShowName = ''
-  if (dept && dept.data) {
-    const deptData = JSON.parse(dept.data)
-    deptShowName = deptData.namePath
-  }
-  return deptShowName
+
+
+export function  getDeptNamePath (dept) {
+let deptShowName = ''
+if (dept && dept.data) {
+  const deptData = JSON.parse(dept.data)
+  deptShowName = deptData.namePath
+}
+return deptShowName
 }

package/packages/workflow-history-list/src/workflow-history-list.vue

@@ -15,7 +15,7 @@
     row-key="uuid"
     style="width: 100%"
   >
-    <el-table-column :label="$t('workflowHistoryList.index')" align="center" width="80">
+    <el-table-column :label="$t('workflowHistoryList.index')" align="left" width="80px">
       <template v-slot="scope">
         {{ scope.$index + 1 }}
       </template>
@@ -35,13 +35,13 @@
         }}</span>
       </template>
     </el-table-column>
-    <el-table-column :label="$t('workflowHistoryList.operator')" align="left" width="120">
+    <el-table-column :label="$t('workflowHistoryList.operator')" align="left" width="250">
       <template v-slot="scope">
         <span v-if="scope.row.historyType && scope.row.historyType === 'PROCESS_END'" />
         <span v-else>{{ scope.row.creatorName }}</span>
       </template>
     </el-table-column>
-    <el-table-column :label="$t('workflowHistoryList.operatorLg')" align="left" width="160">
+    <el-table-column :label="$t('workflowHistoryList.operatorLg')" align="left" width="250">
       <template v-slot="scope">
         <span v-if="scope.row.historyType && scope.row.historyType === 'PROCESS_END'" />
         <span v-else>{{ scope.row.creator }}</span>
@@ -59,28 +59,6 @@
         <span v-else>{{ scope.row.formatCreatedTime }}</span>
       </template>
     </el-table-column>
-    <el-table-column :label="$t('workflowHistoryList.taskState')" align="left" width="100">
-      <template v-slot="scope">
-        <span v-if="scope.row.historyType && scope.row.historyType === 'PROCESS_END'" />
-        <el-tag v-else-if="scope.row.current" type="warning">{{$t('workflowHistoryList.taskStateDoing')}}</el-tag>
-        <el-tag v-else type="success">{{$t('workflowHistoryList.taskStateDone')}}</el-tag>
-      </template>
-    </el-table-column>
-    <el-table-column :label="$t('workflowHistoryList.processingDuration')" align="center" width="120">
-      <template v-slot="scope">
-        <span v-if="scope.row.historyType && scope.row.historyType === 'PROCESS_END'" />
-        <span v-else-if="!scope.row.copyTask">{{ scope.row.processingDuration }}</span>
-      </template>
-    </el-table-column>
-    <el-table-column :label="$t('workflowHistoryList.isOverdue')" align="center" width="100">
-      <template v-slot="scope">
-        <span v-if="scope.row.historyType && scope.row.historyType === 'PROCESS_END'" />
-        <span v-else>
-          <div v-if="scope.row.overdueDuration && scope.row.overdueDuration > 0" class="red-circle"/>
-          <div v-else class="green-circle"/>
-        </span>
-      </template>
-    </el-table-column>
     <el-table-column :label="$t('workflowHistoryList.operation')" align="left" width="400">
       <template v-slot="scope">
         <span v-if="scope.row.historyType && scope.row.historyType === 'PROCESS_END'" />
@@ -308,19 +286,3 @@ export default {
   }
 }
 </script>
-<style scoped>
-.red-circle {
-  width: 20px;         /* 圆圈的宽度 */
-  height: 20px;        /* 圆圈的高度 */
-  background-color: red; /* 背景色设置为红色 */
-  border-radius: 50%;   /* 边框半径设置为50%，使元素变为圆形 */
-  display: inline-block; /* 确保元素以块级元素显示 */
-}
-.green-circle {
-  width: 20px;         /* 圆圈的宽度 */
-  height: 20px;        /* 圆圈的高度 */
-  background-color: rgb(11, 177, 121); /* 背景色设置为红色 */
-  border-radius: 50%;   /* 边框半径设置为50%，使元素变为圆形 */
-  display: inline-block; /* 确保元素以块级元素显示 */
-}
-</style>

package/src/directives/permission/permission.js

@@ -6,15 +6,9 @@ export default {
 
     if (value) {
       // console.log('-----v-permission---init----')
-      let permissionCodes = value
-      let systemCode
-      if(value instanceof Object) {
-        permissionCodes = value.codes
-        systemCode = value.systemCode
-      }
       // 页面组件预览时不需要权限控制，系统中使用页面组件时需要使用权限控制，所以当是预览是资源编码传'true'
       // 工作流按钮组件中也使用了资源编码为'true'的情况
-      if (permissionCodes !== 'true' && !checkPermission(permissionCodes, systemCode)) {
+      if (value !== 'true' && !checkPermission(value)) {
         el.parentNode && el.parentNode.removeChild(el)
       }
     } else {

package/src/i18n/langs/cn.js

@@ -83,8 +83,7 @@ const cn = {
     forbiddenExceptionLinkUser: '如有疑问请联系',
     uploadFileTip: '上传的文件不超过{fileSize}M',
     asyncExportJumpMsg: '或点击我跳转到下载页面',
-    mustFill: '{label} 必须填写',
-    filePathNotFound: '文件UUID未找到，请检查配置',
+    mustFill: '{label} 必须填写'
   },
   // 列表组件
   superGrid: {
@@ -135,8 +134,7 @@ const cn = {
     fold: '收起',
     prevRow: '上一行',
     nextRow: '下一行',
-    detail: '详情',
-    searchEmpty:'查询空值'
+    detail: '详情'
   },
   // 部门树组件
   departmentTree: {},
@@ -257,12 +255,7 @@ const cn = {
     operationTime: '操作时间',
     history_draw_dept_task: '{key_1}领取了部门[{key_2}]的任务',
     history_abandon_draw_dept_task: '{key_1}放弃领取部门[{key_2}]的任务',
-    remark: '备注',
-    taskState: '节点状态',
-    processingDuration: '处理时长(H)',
-    isOverdue: '是否超期',
-    taskStateDoing: '进行中',
-    taskStateDone: '已完成'
+    remark: '备注'
   },
   gateway: {
     timeout: '接口调用超时',

package/src/i18n/langs/en.js

@@ -84,8 +84,7 @@ const en = {
     forbiddenExceptionLinkUser: 'if you have any questions,please contact',
     uploadFileTip: 'The file size should lower {fileSize}M',
     asyncExportJumpMsg: 'Or click me to jump to download page.',
-    mustFill: '{label} must fill',
-    filePathNotFound: 'File UUID not found, please check the configuration'
+    mustFill: '{label} must fill'
   },
   superGrid: {
     editablePlaceholder: 'Please click to input',
@@ -135,8 +134,7 @@ const en = {
     fold: 'Fold',
     prevRow: 'Prev Row',
     nextRow: 'Next Row',
-    detail: 'Detail',
-    searchEmpty:'Search Empty'
+    detail: 'Detail'
   },
   departmentTree: {},
   departmentTreeInline: {
@@ -256,12 +254,7 @@ const en = {
     operationTime: 'Operation Time',
     history_draw_dept_task: '{key_1} Received tasks from department [{key_2}]',
     history_abandon_draw_dept_task: '{key_1} Abandon the task of receiving department [{key_2}]',
-    remark: 'remark',
-    taskState: 'Task State',
-    processingDuration: 'Processing Duration(H)',
-    isOverdue: 'Is Overdue',
-    taskStateDoing: 'Doing',
-    taskStateDone: 'Done'
+    remark: 'remark'
   },
   gateway: {
     timeout: 'Interface call timeout',

package/src/utils/file-util.ts

@@ -4,25 +4,21 @@ const iconList = [
   'amb-color-icon-XLSX',
   'amb-color-icon-DOC',
   'amb-color-icon-DOCX',
-  'amb-color-icon-PPT',
   'amb-color-icon-PDF',
   'amb-color-icon-TXT',
   'amb-color-icon-JPG',
   'amb-color-icon-PNG',
   'amb-color-icon-ZIP',
-  'amb-color-icon-AVI',
-  'amb-color-icon-MP4',
-  'amb-color-icon-qita'
+  'amb-color-icon-unknown'
 ]
 // 列表_5215278368.xls
 export function getFileIconByName(fileName: string): string {
-  const qitaIcon = 'amb-color-icon-qita'
   if (!fileName) {
-    return qitaIcon
+    return 'amb-color-icon-unknown'
   }
   let fileType = fileName.substring(fileName.lastIndexOf('.') + 1) // 获取文件名
   if (!fileType) {
-    return qitaIcon
+    return 'amb-color-icon-unknown'
   }
   switch (fileType) {
     case 'xlsx':
@@ -32,9 +28,5 @@ export function getFileIconByName(fileName: string): string {
       fileType = 'DOC'
       break
   }
-  const finalIconName = 'amb-color-icon-' + fileType.toUpperCase()
-  if (iconList.includes(finalIconName)) {
-    return finalIconName
-  }
-  return qitaIcon
+  return 'amb-color-icon-' + fileType.toUpperCase()
 }

package/src/utils/jump-page-utils.js

@@ -79,7 +79,6 @@ export function initialization(
       }
       return { visible: false }
     } else {
-      result.displayTextJudge = jumpPage.displayTextJudge
       if (jumpPage.displayTextJudge) {
         // 例如：${obj.menu_code}-#-#${input.---}-#-#${context.currentTransactor}
         const label = analysisValue(

package/src/utils/permission.js

@@ -5,7 +5,7 @@ import { getTotalPermissions, isDevpAccess } from './permissionAuth'
  * @param {String} permission 多个资源编码以逗号隔开
  * @returns {Boolean}
  */
-export default function checkPermission(permission, systemCode) {
+export default function checkPermission(permission) {
   if (permission) {
     // 是否是预览项目时开发平台用户
     const isDevpPermission= isDevpAccess()
@@ -14,7 +14,7 @@ export default function checkPermission(permission, systemCode) {
       return true
     }
     let hasPermission = false
-    const storeCurrentUserPermissions = getTotalPermissions(systemCode)
+    const storeCurrentUserPermissions = getTotalPermissions()
     if (
       typeof storeCurrentUserPermissions !== 'undefined' &&
       storeCurrentUserPermissions !== null

package/src/utils/permissionAuth.js

@@ -50,7 +50,7 @@ export function getPermissions(systemCode) {
   return totalPermissions
 }
 
-export function getTotalPermissions(systemCode) {
+export function getTotalPermissions() {
   const a = new Date().getTime()
   let runPermissionsObj
   const runPermissions = getSessionCache(_RUN_PERMISSION)
@@ -58,9 +58,7 @@ export function getTotalPermissions(systemCode) {
     runPermissionsObj = JSON.parse(runPermissions)
   }
   let sysetemPermissionsObj
-  if (!systemCode || systemCode+''==='null') {
-    systemCode = getSystemCode()
-  }
+  const systemCode = getSystemCode()
   const sysetemPermissions = localStorage.getItem(permissionKey + systemCode)
   if (sysetemPermissions) {
     sysetemPermissionsObj = JSON.parse(sysetemPermissions)

package/src/views/dsc-component/Sidebar/Item.vue

@@ -88,8 +88,8 @@ export default defineComponent({
 </script>
 
 <style lang="scss" scoped>
-:deep(.super-icon) {
-  width: 20px !important;
-  height: 20px !important;
+.super-icon {
+  width: 16px;
+  height: 16px;
 }
 </style>

package/src/views/dsc-component/Sidebar/index.vue

@@ -71,9 +71,11 @@ export default {
 					this.firstLeafMenu.pageType === 'iframe'
 			) {
 				const iframeSrc = this.firstLeafMenu.fullPath
+				const path = this.firstLeafMenu.path
 				const query = {
 					src: iframeSrc,
 					customSystem: this.systemCode,
+					path: path,
 					_menuCode: this.firstLeafMenu.code,
 					_menuName: getI18nName(this.firstLeafMenu),
 					isNewPage: this.firstLeafMenu.newPage

package/src/views/layout/components/Menubar/Item.vue

@@ -99,9 +99,3 @@ export default defineComponent({
   }
 })
 </script>
-<style lang="scss" scoped>
-:deep(.super-icon) {
-  width: 20px !important;
-  height: 20px !important;
-}
-</style>

package/src/views/layout/components/Menubar/SidebarItem.vue

@@ -53,7 +53,6 @@ import { getI18nName } from "../../../../utils/menu";
 import tabJs from "../../../../api/tab";
 import { getSystemCode } from "../../../../utils/permissionAuth";
 import authApi from "../../../../utils/auth-api";
-import { getSystemFrontendUrl } from '../../../../utils/common-util';
 
 export default {
   name: "SidebarItem",
@@ -158,22 +157,7 @@ export default {
         toPathObj.query.customSystem = getSystemCode();
         toPathObj.query._menuCode = menu.code;
         toPathObj.query._menuName = getI18nName(menu);
-      } else if(menu.openWay && menu.openWay === 'NEW_PAGE_OPEN'){
-        // 新页签打开菜单时
-        routePath = menu.fullPath
-        if(routePath.indexOf('http:') < 0 && routePath.indexOf('https:') < 0){
-          // 表示不是全路径
-          let frontUrl = getSystemFrontendUrl(window.$vueApp.config.globalProperties.frontUrl)
-          if(frontUrl.lastIndexOf("/") < frontUrl.length -1 ){
-            // 表示最后不是斜线结尾的，需要添加斜线结尾
-            frontUrl = frontUrl + '/'
-          }
-          routePath = frontUrl + "#" + routePath
-        }
-        toPathObj.query = {}
-        toPathObj.query._menuCode = menu.code;
-        toPathObj.path=routePath
-      }else{
+      } else {
         routePath = menu.fullPath;
         if(!routePath) {
           routePath = ''
@@ -233,30 +217,26 @@ export default {
     clickMenu(toPathObj) {
       if (
         toPathObj.openWay &&
-        toPathObj.openWay === "NEW_PAGE_OPEN"
+        toPathObj.openWay === "NEW_PAGE_OPEN" &&
+        toPathObj.query
       ) {
         // 新页签打开菜单
-        if(toPathObj.query && toPathObj.query.src){
-          let url = toPathObj.query.src;
-          if (url && url.indexOf("?") > 0) {
-            url += "&";
-          } else {
-            url += "?";
-          }
-          if (toPathObj.query.customSystem) {
-            url += "customSystem=" + toPathObj.query.customSystem;
-          }
-          if (toPathObj.query._menuCode) {
-            url += "_menuCode=" + toPathObj.query._menuCode;
-          }
-          if (toPathObj.query._menuCode) {
-            url += "_menuName=" + toPathObj.query._menuName;
-          }
-          window.open(url, toPathObj.query._menuCode)
+        let url = toPathObj.query.src;
+        if (url && url.indexOf("?") > 0) {
+          url += "&";
         } else {
-          const url = toPathObj.path;
-          window.open(url, toPathObj.query._menuCode)
+          url += "?";
+        }
+        if (toPathObj.query.customSystem) {
+          url += "customSystem=" + toPathObj.query.customSystem;
+        }
+        if (toPathObj.query._menuCode) {
+          url += "_menuCode=" + toPathObj.query._menuCode;
+        }
+        if (toPathObj.query._menuCode) {
+          url += "_menuName=" + toPathObj.query._menuName;
         }
+        window.open(url, toPathObj.query._menuCode);
       } else {
         // 刷新页签打开菜单
         this.addTabs(