agilebuilder-ui 1.1.38-tmp1 → 1.1.39-sit1

package/src/utils/file-util.ts

@@ -4,21 +4,25 @@ 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-unknown'
+  'amb-color-icon-AVI',
+  'amb-color-icon-MP4',
+  'amb-color-icon-qita'
 ]
 // 列表_5215278368.xls
 export function getFileIconByName(fileName: string): string {
+  const qitaIcon = 'amb-color-icon-qita'
   if (!fileName) {
-    return 'amb-color-icon-unknown'
+    return qitaIcon
   }
   let fileType = fileName.substring(fileName.lastIndexOf('.') + 1) // 获取文件名
   if (!fileType) {
-    return 'amb-color-icon-unknown'
+    return qitaIcon
   }
   switch (fileType) {
     case 'xlsx':
@@ -28,5 +32,9 @@ export function getFileIconByName(fileName: string): string {
       fileType = 'DOC'
       break
   }
-  return 'amb-color-icon-' + fileType.toUpperCase()
+  const finalIconName = 'amb-color-icon-' + fileType.toUpperCase()
+  if (iconList.includes(finalIconName)) {
+    return finalIconName
+  }
+  return qitaIcon
 }

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

@@ -79,6 +79,7 @@ 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) {
+export default function checkPermission(permission, systemCode) {
   if (permission) {
     // 是否是预览项目时开发平台用户
     const isDevpPermission= isDevpAccess()
@@ -14,7 +14,7 @@ export default function checkPermission(permission) {
       return true
     }
     let hasPermission = false
-    const storeCurrentUserPermissions = getTotalPermissions()
+    const storeCurrentUserPermissions = getTotalPermissions(systemCode)
     if (
       typeof storeCurrentUserPermissions !== 'undefined' &&
       storeCurrentUserPermissions !== null

package/src/utils/permissionAuth.js

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

package/src/utils/util.js

@@ -620,6 +620,25 @@ function getAdditionalParamMap(pageContext) {
   }
 }
 
+export function formatCustomParams(customParams, pageContext, row) {
+  const formatCustomParams = {}
+  if (customParams && customParams.length > 0) {
+    customParams.forEach((param) => {
+      if (param.paramValue && param.paramValue.indexOf('${') === 0) {
+        // 表示是动态变量
+        const dynamicValue = getPropValueNew(param.paramValue, pageContext, row)
+        if (dynamicValue !== undefined && dynamicValue !== null) {
+          formatCustomParams[param.paramName] = dynamicValue
+        } else {
+          formatCustomParams[param.paramName] = null
+        }
+      } else {
+        formatCustomParams[param.paramName] = param.paramValue
+      }
+    })
+  }
+  return formatCustomParams
+}
 export function getPropValueNew(propValue, pageContext, row) {
   let value = null
   if (propValue && propValue !== null && propValue !== '') {

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

@@ -21,11 +21,16 @@ export default defineComponent({
     isRoot: {
       type: Boolean,
       default: false
+    },
+    menuLayer: {
+      type: Number,
+      default: null
     }
   },
   render(props) {
-    const { title, hasChildren, isRoot } = props
+    const { title, hasChildren, isRoot} = props
     const icon = props.icon
+    const menuLayer = props.menuLayer
     const vnodes = []
     let iconsData = [h('i', { class: 'amb-iconfont amb-icon-meun_post' })]
     // let iconsData = [h('i', { class: 'amb-color-iconfont amb-color-icon-goal-jichuweihu super-icon' })]
@@ -41,12 +46,18 @@ export default defineComponent({
       //   iconsData = [h('i', { class: icon + ' svg-icon' })]
       // }
     }
-    vnodes.push(h('div', { class: ['smb-sidebar-menu-item-icon'] }, iconsData))
+    let titleClass = ['smb-sidebar-menu-item-title']
+    if(!menuLayer || menuLayer <= 2) {
+      vnodes.push(h('div', { class: ['smb-sidebar-menu-item-icon'] }, iconsData))
+    } else {
+      vnodes.push(h('div', { class: ['smb-sidebar-menu-item-no-icon'] }))
+      titleClass.push('smb-sidebar-menu-item-no-icon-title')
+    }
     if (title) {
       if (isRoot) {
         // 是否是根目录，没有子菜单时
         vnodes.push(
-          h('div', { class: ['smb-sidebar-menu-item-title'] }, [
+          h('div', { class: titleClass }, [
             h(
               'div',
               {
@@ -59,7 +70,7 @@ export default defineComponent({
       } else {
         // 有子菜单时
         vnodes.push(
-          h('div', { class: ['smb-sidebar-menu-item-title'] }, [
+          h('div', { class: titleClass }, [
             h(
               'div',
               {
@@ -77,8 +88,8 @@ export default defineComponent({
 </script>
 
 <style lang="scss" scoped>
-.super-icon {
-  width: 16px;
-  height: 16px;
+:deep(.super-icon) {
+  width: 20px !important;
+  height: 20px !important;
 }
 </style>

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

@@ -7,7 +7,7 @@
           class="smb-sidebar-menu-item"
           :class="{ 'submenu-title-noDropdown': !isNest }"
         >
-          <item :icon="item.iconName" :title="getI18nName(item)" :is-root="true" />
+          <item  :menu-layer="item.layer" :icon="item.iconName" :title="getI18nName(item)" :is-root="true" />
         </el-menu-item>
       </app-link>
     </template>
@@ -22,6 +22,7 @@
     >
       <template v-slot:title>
         <item
+          :menu-layer="item.layer"
           :icon="item.iconName"
           :title="getI18nName(item)"
           :has-children="item.children.length > 0 ? true : false"
@@ -37,7 +38,7 @@
         />
         <app-link v-else :to="toPath(child)" @click="clickMenu(toPath(child))">
           <el-menu-item :index="resolvePath(child.code, child.path, child.pageType, child.newPage)" class="smb-sidebar-menu-item">
-            <item :icon="child.iconName" :title="getI18nName(child)" />
+            <item :menu-layer="child.layer" :icon="child.iconName" :title="getI18nName(child)" />
           </el-menu-item>
         </app-link>
       </template>
@@ -213,6 +214,10 @@ export default {
     width: var(--admin-layout-left-menu-collapse, 54px);
     font-size: 16px;
   }
+
+  :deep(.smb-sidebar-menu-item-no-icon) {
+    width: 20px;
+  }
   :deep(.smb-sidebar-menu-item-title) {
     flex: 0 0 calc(100% - var(--admin-layout-left-menu-collapse, 54px) - 35px);
     overflow: hidden;
@@ -226,6 +231,9 @@ export default {
       text-overflow: ellipsis;
     }
   }
+  :deep(.smb-sidebar-menu-item-no-icon-title) {
+    flex: 0 0 calc(100% - 20px - 20px);
+  }
 }
 </style>
 

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

@@ -71,11 +71,9 @@ 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

@@ -30,23 +30,34 @@ export default defineComponent({
     backlogTotal: {
       type: Number,
       default: 0
+    },
+    menuLayer: {
+      type: Number,
+      default: null
     }
   },
   render(props) {
     const { title, hasChildren, isRoot, code, backlogTotal } = props
     const icon = props.icon
+    const menuLayer = props.menuLayer
     const vnodes = []
     // let iconsData = [h(SvgIcon,{'icon-class': 'meun_post' })]
     let iconsData = [h('i', { class: 'amb-iconfont amb-icon-meun_post' })]
     if (icon) {
       iconsData = [h(SuperIcon, { iconValue: icon })]
     }
-    vnodes.push(h('div', { class: ['smb-sidebar-menu-item-icon'] }, iconsData))
+    let titleClass = ['smb-sidebar-menu-item-title']
+    if(!menuLayer || menuLayer <= 2) {
+      vnodes.push(h('div', { class: ['smb-sidebar-menu-item-icon'] }, iconsData))
+    } else {
+      vnodes.push(h('div', { class: ['smb-sidebar-menu-item-no-icon'] }))
+      titleClass.push('smb-sidebar-menu-item-no-icon-title')
+    }
     if (title) {
       if (isRoot) {
         // 是否是根目录，没有子菜单时
         vnodes.push(
-          h('div', { class: ['smb-sidebar-menu-item-title'] }, [
+          h('div', { class: titleClass }, [
             h(
               'div',
               {
@@ -59,7 +70,7 @@ export default defineComponent({
       } else if (code === 'undoneTask') {
         // 有子菜单时
         vnodes.push(
-          h('div', { class: ['smb-sidebar-menu-item-title'] }, [
+          h('div', { class: titleClass }, [
             h(
               'div',
               {
@@ -88,3 +99,9 @@ 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

@@ -8,6 +8,7 @@
           :class="{ 'submenu-title-noDropdown': !isNest }"
         >
           <item
+            :menu-layer="item.layer"
             :icon="item.iconName"
             :title="getI18nName(item)"
             :is-root="true"
@@ -19,6 +20,7 @@
     <el-sub-menu v-else :index="item.code + '~~' + item.i18nValue" class="smb-sidebar-menu-item">
       <template v-slot:title>
         <item
+          :menu-layer="item.layer"
           :icon="item.iconName"
           :title="getI18nName(item)"
           :has-children="item.children.length > 0 ? true : false"
@@ -35,7 +37,7 @@
         />
         <app-link :key="child.code" v-else :to="toPath(child)" @click="clickMenu(toPath(child))">
           <el-menu-item :index="child.code + '~~' + child.i18nValue" class="smb-sidebar-menu-item">
-            <item :backlog-total="backlogTotal" :code="child.code" :icon="child.iconName" :title="getI18nName(child)" />
+            <item :menu-layer="child.layer" :backlog-total="backlogTotal" :code="child.code" :icon="child.iconName" :title="getI18nName(child)" />
           </el-menu-item>
         </app-link>
       </template>
@@ -51,6 +53,7 @@ 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",
@@ -155,7 +158,22 @@ export default {
         toPathObj.query.customSystem = getSystemCode();
         toPathObj.query._menuCode = menu.code;
         toPathObj.query._menuName = getI18nName(menu);
-      } else {
+      } 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{
         routePath = menu.fullPath;
         if(!routePath) {
           routePath = ''
@@ -215,26 +233,30 @@ export default {
     clickMenu(toPathObj) {
       if (
         toPathObj.openWay &&
-        toPathObj.openWay === "NEW_PAGE_OPEN" &&
-        toPathObj.query
+        toPathObj.openWay === "NEW_PAGE_OPEN"
       ) {
         // 新页签打开菜单
-        let url = toPathObj.query.src;
-        if (url && url.indexOf("?") > 0) {
-          url += "&";
+        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)
         } else {
-          url += "?";
-        }
-        if (toPathObj.query.customSystem) {
-          url += "customSystem=" + toPathObj.query.customSystem;
-        }
-        if (toPathObj.query._menuCode) {
-          url += "_menuCode=" + toPathObj.query._menuCode;
+          const url = toPathObj.path;
+          window.open(url, toPathObj.query._menuCode)
         }
-        if (toPathObj.query._menuCode) {
-          url += "_menuName=" + toPathObj.query._menuName;
-        }
-        window.open(url, toPathObj.query._menuCode);
       } else {
         // 刷新页签打开菜单
         this.addTabs(
@@ -275,6 +297,9 @@ export default {
     width: var(--admin-layout-left-menu-collapse, 54px);
     font-size: 16px;
   }
+  :deep(.smb-sidebar-menu-item-no-icon) {
+    width: 20px;
+  }
   :deep(.smb-sidebar-menu-item-title) {
     flex: 0 0 calc(100% - var(--admin-layout-left-menu-collapse, 54px) - 35px);
     overflow: hidden;
@@ -288,5 +313,8 @@ export default {
       text-overflow: ellipsis;
     }
   }
+  :deep(.smb-sidebar-menu-item-no-icon-title) {
+    flex: 0 0 calc(100% - 20px - 20px);
+  }
 }
 </style>