agilebuilder-ui 1.1.37 → 1.1.38-sit1

package/packages/super-grid/src/super-grid.vue

@@ -210,7 +210,8 @@ import {
   isEditOptionFunction,
   isHasEditOption,
   isHasOptionFunction,
-  isObjectValueEqual
+  isObjectValueEqual,
+  rowBeforeValidate
 } from './utils'
 import Sortable from 'sortablejs'
 import store from './store'
@@ -2775,10 +2776,28 @@ export default {
         gridData = this.subTableData
       }
       if (gridData && gridData.length > 0) {
+        const gridParams = store.get(this.code)
+        const customRules = gridParams.options.customRules
         const pageSize = this.pagination && this.pagination.pageSize
         const validateRules = formValidatorService.getValidator(this.code)
         for (let i = 0; i < gridData.length; i++) {
           const row = gridData[i]
+          let rules = validateRules
+          if (customRules) {
+            const propNames = Object.keys(customRules)
+            if (propNames.length > 0) {
+              // 遍历customRules，判断customRules的规则是否有beforeValidate
+              for (const propName of propNames) {
+                if (customRules[propName].beforeValidate) {
+                  const result = rowBeforeValidate(customRules[propName], gridParams, row)
+                  if (result === false && rules[propName]) {
+                    rules = JSON.parse(JSON.stringify(validateRules))
+                    rules[propName] = []
+                  }
+                }
+              }
+            }
+          }
           // 取消最后一个编辑行的状态
           if (row.$editing !== undefined && row.$editing === true) {
             setEntityFieldValue(row, '$editing', false)
@@ -2788,7 +2807,7 @@ export default {
           let needValidate = true
           if (isHasEditOption('isEnableValidate', this.code)) {
             // 表示配置了是否启用必填验证
-            needValidate = this.gridParams.options.lineEditOptions['isEnableValidate']
+            needValidate = gridParams.options.lineEditOptions['isEnableValidate']
           }
           let validateResult = true
           if (needValidate === true) {
@@ -2803,7 +2822,7 @@ export default {
               row,
               this.code,
               i,
-              validateRules,
+              rules,
               this.isSubTableShowPage,
               pageNum,
               pageRowIndex

package/packages/super-grid/src/utils.js

@@ -205,7 +205,7 @@ function getEntityId(row) {
 }
 
 // 行编辑时，是否有权限编辑某字段
-export function isDisableEdit(prop, listCode, row) {
+export function isDisableEdit(prop, listCode, row, rowIndex) {
   if (!listCode) {
     listCode = store.get('_list_code')
   }
@@ -271,7 +271,11 @@ export function isDisableEdit(prop, listCode, row) {
         const columnRules = gridParams.options.customRules[prop]
           ? gridParams.options.customRules[prop]
           : gridParams.options.customRules['_all_fields']
-        if (columnRules && columnRules.disabled) {
+        let beforeValidateResult = true
+        // if (columnRules.beforeValidate) {
+        //   beforeValidateResult = rowBeforeValidate(columnRules, gridParams, row, rowIndex)
+        // }
+        if (columnRules && columnRules.disabled && beforeValidateResult !== false) {
           isDiabled = true
         }
       }
@@ -280,6 +284,16 @@ export function isDisableEdit(prop, listCode, row) {
   return isDiabled
 }
 
+export function rowBeforeValidate(columnRules, gridParams, row) {
+  const params = {
+    parent: gridParams.options.extraParam.entityMap,
+    row: row,
+    pageContext: gridParams.options.pageContext,
+    configure: gridParams.options.configureObj
+  }
+  return columnRules.beforeValidate(params)
+}
+
 // 行编辑时，是否必填某字段, 如果是流程表单子表， 需要将列表管理里配置的必填字段去掉，使用流程内的子表编辑权限控制
 export function isRequiredEdit(column, listCode) {
   const prop = column.prop

package/packages/utils/value-set.js

@@ -17,7 +17,7 @@ function packageEnumAndBeanColumnValueSetsWhenPlate(columns, listCode) {
   return new Promise((resolve, reject) => {
     const valueSetColumnsInfo = {
       listCode: listCode,
-      valueSetMetas: [],
+      valueSetMetas: []
     }
     const valueSetColumnIndexs = []
     for (let i = 0; i < columns.length; i++) {
@@ -27,13 +27,11 @@ function packageEnumAndBeanColumnValueSetsWhenPlate(columns, listCode) {
       let titleValueSet = null
       const titleValueSetJson = column.titleValueSet
       if (titleValueSetJson) {
-        titleValueSet = packageEnumAndBeanColumnValueSet(
-          JSON.parse(titleValueSetJson)
-        )
+        titleValueSet = packageEnumAndBeanColumnValueSet(JSON.parse(titleValueSetJson))
       }
       if (columnValueSet || titleValueSet) {
         const valueSetMeta = {
-          prop: prop,
+          prop: prop
         }
         if (columnValueSet) {
           // 字段的值设置
@@ -48,17 +46,11 @@ function packageEnumAndBeanColumnValueSetsWhenPlate(columns, listCode) {
     }
     if (valueSetColumnsInfo.valueSetMetas.length > 0) {
       window.$vueApp.config.globalProperties.$http
-        .post(
-          window.$vueApp.config.globalProperties.baseURL +
-            '/common/super-grids/value-sets',
-          valueSetColumnsInfo
-        )
+        .post(window.$vueApp.config.globalProperties.baseURL + '/common/super-grids/value-sets', valueSetColumnsInfo)
         .then((columnValueSets) => {
           valueSetColumnIndexs.forEach((columnIndex) => {
             let valueSetMap
-            const prop = columns[columnIndex].prop
-              ? columns[columnIndex].prop
-              : columns[columnIndex].label
+            const prop = columns[columnIndex].prop ? columns[columnIndex].prop : columns[columnIndex].label
             for (const prop1 in columnValueSets) {
               if (prop === prop1) {
                 valueSetMap = columnValueSets[prop]
@@ -70,8 +62,7 @@ function packageEnumAndBeanColumnValueSetsWhenPlate(columns, listCode) {
                 columns[columnIndex].valueSet = valueSetMap.valueSet
               }
               if (valueSetMap.titleValueSet) {
-                columns[columnIndex].titleValueSetValue =
-                  valueSetMap.titleValueSet
+                columns[columnIndex].titleValueSetValue = valueSetMap.titleValueSet
               }
             }
           })
@@ -111,7 +102,7 @@ function packageEnumAndBeanColumnValueSet(valueSetInfo) {
  * 封装值设置为枚举 或 bean方式时的值为'key-value'键值对信息
  */
 function packageEnumAndBeanColumnValueSetsWhenOtherSys(columns, listCode, additionalParamMap, entity, systemCode) {
-  return new Promise((resolve, reject) => { 
+  return new Promise((resolve, reject) => {
     const dataSourceList = getDataSourceConfigList(columns)
     const valueSetColumnIndexs = dataSourceList.valueSetColumnIndexs
     const param = {
@@ -129,7 +120,7 @@ function packageEnumAndBeanColumnValueSetsWhenOtherSys(columns, listCode, additi
       .then((result) => {
         const columnValueSet = result.columnValueSet
         const columnTitleValueSet = result.columnTitleValueSet
-        for(let prop in valueSetColumnIndexs){
+        for (let prop in valueSetColumnIndexs) {
           const columnIndex = valueSetColumnIndexs[prop]
           const valueSet = columnValueSet[prop]
           if (valueSet) {
@@ -175,7 +166,7 @@ function getDataSourceConfigList(columns) {
       valueSetColumnIndexs[prop] = i
     }
   }
-  return {dataSourceConfigList, dataSourceConfigListTitle, valueSetColumnIndexs}
+  return { dataSourceConfigList, dataSourceConfigListTitle, valueSetColumnIndexs }
 }
 
 function getConfigWithValueSet(valueSetInfo, prop, column) {
@@ -203,41 +194,42 @@ function getConfigWithValueSet(valueSetInfo, prop, column) {
       }
     }
   } else if (beanName && beanName !== '') {
-      infoObj.type = 'beanName'
-      infoObj.props = {
-        prop: prop,
-        valueSet: BEAN_NAME_PREFIX + beanName
-      }
-  }else if(column && column.valueSetOptions) {
-    // 动态数据源、数据表/视图、服务
+    infoObj.type = 'beanName'
+    infoObj.props = {
+      prop: prop,
+      valueSet: BEAN_NAME_PREFIX + beanName
+    }
+  } else if (column && column.valueSetOptions) {
+    // 动态数据源(select开启value-label自动转换或者)、数据表/视图、服务
     const valueSetOptionsObj = JSON.parse(column.valueSetOptions)
-    if((valueSetOptionsObj.type || valueSetOptionsObj.dynamicDataSourceCode) && valueSetOptionsObj.valueLabelSwitch){
+    if (
+      (valueSetOptionsObj.type || valueSetOptionsObj.dynamicDataSourceCode) &&
+      (column.componentType === 'radio' || column.componentType === 'checkbox' || valueSetOptionsObj.valueLabelSwitch)
+    ) {
       // 表示是动态数据源等值设置信息
       // const isShouldInitSearch = (valueSetOptionsObj.filterType === undefined || valueSetOptionsObj.filterType != 'remote')
-      if(!valueSetOptionsObj.type || valueSetOptionsObj.type !== 'optionGroup'){
+      if (!valueSetOptionsObj.type || valueSetOptionsObj.type !== 'optionGroup') {
         // 选项组时不需要在此处获得
         Object.assign(infoObj, valueSetOptionsObj)
         // 更新uuid为字段名
         infoObj.uuid = prop
-        if(!infoObj.props){
+        if (!infoObj.props) {
           infoObj.props = {}
         }
         infoObj.props.prop = prop
       }
-      if(valueSetOptionsObj.dynamicDataSourceCode){
+      if (valueSetOptionsObj.dynamicDataSourceCode) {
         infoObj.type = 'dynamicData'
-        if(!infoObj.props){
+        if (!infoObj.props) {
           infoObj.props = {}
         }
         infoObj.props.code = valueSetOptionsObj.dynamicDataSourceCode
       }
     }
   }
-  if(infoObj.type){
+  if (infoObj.type) {
     // 表示是有效的值设置
     return infoObj
   }
   return null
 }
-
-

package/src/api/sso-service.js

@@ -61,7 +61,7 @@ function logout() {
 }
 
 function getCurrentUserPermissionsBySystem(loginName, systemCode) {
-  console.log('getCurrentUserPermissionsBySystem----loginName=', loginName, isMobileBrowser())
+  console.log('getCurrentUserPermissionsBySystem----loginName=', loginName, 'isMobile=',isMobileBrowser(),'systemCode=',systemCode)
   if(isMobileBrowser()){
     return getCurrentUserMobilePermissions(loginName)
   } else {
@@ -72,6 +72,7 @@ function getCurrentUserPermissionsBySystem(loginName, systemCode) {
         systemCode = window.$vueApp.config.globalProperties.systemCode
       }
     }
+    console.log('getCurrentUserPermissionsBySystem----loginName=', loginName, 'systemCode222=',systemCode)
     return request.get(
       window.$vueApp.config.globalProperties.baseAPI +
         '/sso/current-users/permissions/with-system?loginName=' +

package/src/permission.js

@@ -157,10 +157,11 @@ router.beforeEach((to, from, next) => {
                     // 开发平台本身的功能或直接平台功能时
                     // console.log('开发平台本身的功能或直接平台功能时')
                     let systemCode = to.query ? to.query.customSystem: null
+                    console.log('getCurrentUserPermissions---systemCode111=', systemCode)
                     if (!systemCode) {
                       systemCode = window.$vueApp.config.globalProperties.currentSystem
                     }
-                    console.log('3333systemCode=', systemCode)
+                    console.log('getCurrentUserPermissions---systemCode222=', systemCode)
                     return store.dispatch('getCurrentUserPermissions', {loginName:user.loginName, systemCode})
                   }
                 })

package/src/store/modules/user.js

@@ -238,7 +238,7 @@ const user = {
         const loginName = param.loginName
         const systemCode = param.systemCode
         let storePermissions = getPermissions(systemCode)
-        console.log('getCurrentUserPermissions-----systemCode=', systemCode, 'storePermissions=', storePermissions)
+        console.log('getCurrentUserPermissions-----systemCode=', systemCode)
         // 这个判断会导致资源不会重新加载？？
         if (
           typeof storePermissions === 'undefined' ||
@@ -248,6 +248,7 @@ const user = {
           ssoService
             .getCurrentUserPermissionsBySystem(loginName, systemCode)
             .then((permissions) => {
+              console.log('getCurrentUserPermissions-----systemCode=', systemCode, 'permissions[0]=', permissions && permissions.length>0?permissions[0]: null )
               let currentPermissions = ['index']
               currentPermissions = currentPermissions.concat(permissions)
               storePermissions = setPermissions(currentPermissions, systemCode)
@@ -257,6 +258,8 @@ const user = {
               reject(error)
             })
         } else {
+          let keys = Object.keys(storePermissions)
+          console.log('getCurrentUserPermissions-----systemCode=', systemCode, 'storePermissions[1]=', keys && keys.length>1?keys[1]: null )
           resolve(storePermissions)
         }
       })

package/src/utils/common-util.js

@@ -243,6 +243,7 @@ export function getServerConfigUtil(http) {
         window.$vueApp.config.globalProperties.baseAPI
       )
       localStorage.setItem('_baseAPI_', window.$vueApp.config.globalProperties.baseAPI)
+      localStorage.setItem('_amb_projectModel_', window.$vueApp.config.globalProperties.projectModel)
       if (config.fontIconAddress && window.insertCssFile) {
         window.insertCssFile(`${config.fontIconAddress}/iconfont.css`)
       }

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,22 @@ function getAdditionalParamMap(pageContext) {
   }
 }
 
+export function formatCustomParams(customParams, pageContext, row) {
+  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) {
+          param.paramValue = dynamicValue
+        } else {
+          param.paramValue = null
+        }
+      }
+    })
+  }
+  return customParams
+}
 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，不做任何处理