agilebuilder-ui 1.1.38 → 1.1.39

package/src/utils/permissionAuth.js

@@ -26,7 +26,7 @@ export function getSystemCode() {
 
 export function getPermissions(systemCode) {
   let totalPermissions = null
-  if(!systemCode){
+  if(!systemCode || systemCode+''==='null'){
     systemCode = getSystemCode()
   }
   let permissions = localStorage.getItem(permissionKey + systemCode)
@@ -91,17 +91,19 @@ export function getTotalPermissions() {
 }
 
 export function setPermissions(permissions, systemCode) {
+  console.log('setPermissions==========systemCode=', systemCode,'isHasPlatPermission----permissions[0]=',permissions && permissions.length > 0 ?permissions[0]: null)
   const isMobile = isMobileBrowser()
   let key
   const permissionObjs = getPermissionObjs(permissions)
   if(isMobile){
     key = mobilePermissionKey
   } else {
-    if (!systemCode) {
+    if (!systemCode || systemCode+''==='null') {
       systemCode = getSystemCode()
     }
     key = permissionKey + systemCode
   }
+  console.log('setPermissions==========systemCode=', systemCode,'key=',key)
   localStorage.setItem(key, JSON.stringify(permissionObjs))
   setPermissionAllSystemKey(key)
   return permissionObjs
@@ -121,7 +123,7 @@ function getPermissionObjs(permissions){
 
 
 export function getMenus(systemCode) {
-  if (!systemCode) {
+  if (!systemCode || systemCode+''==='null') {
     systemCode = getSystemCode()
   } 
   const myPermissionMenuKey = getRunInfoKey(permissionMenuKey)
@@ -136,7 +138,7 @@ export function getMenus(systemCode) {
 
 export function setMenus(menus, systemCode) {
   if (menus) {
-    if (!systemCode) {
+    if (!systemCode || systemCode+''==='null') {
       systemCode = getSystemCode()
     }
     const myPermissionMenuKey = getRunInfoKey(permissionMenuKey)
@@ -148,7 +150,7 @@ export function setMenus(menus, systemCode) {
 }
 
 export function removeMenus(systemCode) {
-  if (!systemCode) {
+  if (!systemCode || systemCode+''==='null') {
     systemCode = getSystemCode()
   }
   const myPermissionMenuKey = getRunInfoKey(permissionMenuKey)

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',
               {

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/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',
               {

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>
@@ -275,6 +277,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 +293,8 @@ export default {
       text-overflow: ellipsis;
     }
   }
+  :deep(.smb-sidebar-menu-item-no-icon-title) {
+    flex: 0 0 calc(100% - 20px - 20px);
+  }
 }
 </style>

package/vite.config.js

@@ -12,8 +12,7 @@ export default defineConfig(({ mode }) => ({
     terser({
       compress: {
         drop_debugger: ['production'].includes(mode),
-        // drop_console: ['production'].includes(mode),
-        pure_funcs: ['production'].includes(mode) ? ['console.log', 'console.info', 'console.warn', 'console.debug'] : [],
+        // pure_funcs: ['production'].includes(mode) ? ['console.log', 'console.info', 'console.warn', 'console.debug'] : [],
       },
       output: {
         // 对于console.error，不做任何处理