resolver-egretimp-plus 0.0.121 → 0.0.123

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "resolver-egretimp-plus",
-  "version": "0.0.121",
+  "version": "0.0.123",
   "description": "交付体验渲染",
   "main": "./dist/web/index.js",
   "module": "./dist/web/index.js",

package/src/components/helper/eventOrchestration.js

@@ -1,4 +1,4 @@
-import { isArray, isHasVal } from "../../utils/is"
+import { isArray, isHasVal, isNull, isUndefined } from "../../utils/is"
 import { DATA_VALID_RULE_EXECUTE } from "../../api/builtIn"
 import { getRelateConfigKeys } from "../../rules/ruleUtils"
 import { RESULT_CODE, resultToast } from "../../utils/respone"
@@ -51,8 +51,12 @@ export async function dispatchClickEvent(service, { dynamicMapComp, requestTrace
     reqData = getReqData(service.inParamMappingList || [], {dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat})
     tableConfig = getTableConfig(service.outParamMappingList, { dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat })
     if (tableConfig?.vm) {
-      assignmentPathVal(reqData, service.pageNum || 'pageNum', tableConfig.vm.page?.pageNum)
-      assignmentPathVal(reqData, service.pageSize || 'pageSize', tableConfig.vm.page?.pageSize)
+      if (!isUndefined(tableConfig.vm.page?.pageNum) && !isNull(tableConfig.vm.page?.pageNum) ) {
+        assignmentPathVal(reqData, service.pageNum || 'pageNum', tableConfig.vm.page?.pageNum)
+      }
+      if (!isUndefined(tableConfig.vm.page?.pageSize) && !isNull(tableConfig.vm.page?.pageSize) ) {
+        assignmentPathVal(reqData, service.pageSize || 'pageSize', tableConfig.vm.page?.pageSize)
+      }
     }
     reqData = {
       ...reqData,
@@ -123,21 +127,13 @@ function getReqData(inParamMappingList = [], {dynamicMapComp, dynamicMapCompKeys
       console.error('search arg muti', params, configCodes)
     }
     const configCode = configCodes[0]
-    if (configCode) {
+    if (
+      configCode &&
+      !isUndefined(dynamicMapComp[configCode]?.refValue) &&
+      !isNull(dynamicMapComp[configCode]?.refValue)
+    ) {
       const destParamArr = destParam?.split('.') || []
       assignmentPathVal(ret, destParamArr, dynamicMapComp[configCode]?.refValue)
-
-      // let currentObj = ret
-      // destParamArr.forEach((item, idx) => {
-      //   if (idx + 1 === destParamArr.length) {
-      //     currentObj[item] = dynamicMapComp[configCode]?.refValue
-      //   } else {
-      //     if (!currentObj[item]) {
-      //       currentObj[item] = {}
-      //     }
-      //     currentObj = currentObj[item]
-      //   }
-      // })
     }
     return ret
   }, {})

package/src/components/packages-web/CustomComponentTable.jsx

@@ -133,6 +133,10 @@ export default {
     // 获取表格列的属性配置
     const getTableColumnProps = (config, idx) => {
       const nextList = tableColumnConfigs.value.slice(idx + 1)
+      // 当前config表格列是最后一个显示列，并且后面有hidden的列
+      const isEndConfig = !nextList?.filter(config => {
+        return config.displayType != DISPLAY_HIDDEN && !(config.width == 0 || config.width == '0px' || config.hidden == '1')
+      })?.length
       const nextConfig = nextList.find(config => config.displayType != DISPLAY_HIDDEN)
       const props =  Object.keys(ElTableColumn.props).reduce((ret, key) => {
         if (hasOwn(config, key)) {
@@ -153,6 +157,9 @@ export default {
       if (nextConfig && (nextConfig.width == 0 || nextConfig.width == '0px' || nextConfig.hidden == '1')) {
         props.className = `${props.className || ''} next-hidden-column`
       }
+      if (isEndConfig) {
+        props.className = `${props.className || ''} end-show-column`
+      }
       if (
         isPlainColumn({...config, isColumn: true}, calcDisable(config, props.mode)) &&
         config.showOverflowTooltip !== false &&

package/src/components/styles/CustomComponenTable.scss

@@ -120,7 +120,7 @@
   .hidden-column + .el-table__cell {
     // border: none;
   }
-  .next-hidden-column {
-    // border: none;
+  .next-hidden-column.end-show-column {
+    border: none;
   }
 }

package/src/enums/index.js

@@ -1,4 +1,4 @@
-import { GET_SYS_PARAM_CACHE, LCP_LOGIN, QUERY_PAGE_CONFIG_DATA } from "../api/builtIn"
+import { DATA_VALID_RULE_EXECUTE, GET_SYS_PARAM_CACHE, LCP_LOGIN, QUERY_PAGE_CONFIG_DATA } from "../api/builtIn"
 
 export const USER_NAME = 'lcpsupport'
 export const PASSWORD = '8ik,*IK<'
@@ -8,5 +8,6 @@ export const AUTH_CODE = '9887'
 export const NOT_AUTH_APIS = [
   LCP_LOGIN,
   GET_SYS_PARAM_CACHE,
-  QUERY_PAGE_CONFIG_DATA
+  QUERY_PAGE_CONFIG_DATA,
+  DATA_VALID_RULE_EXECUTE
 ]