resolver-egretimp-plus 0.0.122 → 0.0.124

package/package.json

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

package/src/components/helper/eventOrchestration.js

@@ -239,7 +239,7 @@ export function openDailg({
       }
     ]
     const orginTableConfig = getTableConfig(outParamMappingList, { dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat })
-    selectionsObj.selections = (orginTableConfig.refValue || [])
+    selectionsObj.selections = (orginTableConfig?.refValue || [])
     selectionsObj.primaryKeys = primaryKeys
   }
 

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/packages-web/ElInputNumber.vue

@@ -29,6 +29,9 @@ const inputNumberProps = computed(() => {
   if (props.config?.minValue && !isNaN(props.config.minValue)) {
     ret.min = props.config.minValue
   }
+  if (props.config?.precise && !isNaN(props.config.minValue)) {
+    ret.precision = props.config.precise
+  }
   return ret
 })
 const attrs = useAttrs()

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/resolver-common.vue

@@ -24,7 +24,11 @@ const props = defineProps({
   },
   requestTraceId: {
     type: String,
-  }
+  },
+  loadConfigReq: {
+    type: Object,
+    default: () => ({})
+  },
 })
 defineOptions({
   inheritAttrs: false
@@ -36,6 +40,7 @@ getPageConfig({
   busiIdentityId: props.busiIdentityId,
   queryPageMeta: '1',
   queryPageService: '1',
+  ...(props.loadConfigReq || {})
 }, {
   configCb: (pageConfig) => {
     // 配置数据加载完成事件 'loadedConfigCompeted'

package/src/rules_b/index.js

@@ -1,8 +1,23 @@
-
+import { Engine, Rule } from 'json-rules-engine'
+import { hasOwn } from '../utils'
 
 class RuleDriver {
-  constructor() {
+  constructor(rules) {
+    const rules = new Rule({
+      conditions: {
+        all: []
+      }
+    })
+    const engine = new Engine()
+  }
+  generateRuleConditions(rule) {
+    const { eventExpress, pmRuleTargetEventVoList: eventList, ruleType, tabpanelCode } = rule || {}
+    if (!eventExpress) return false
 
+    const expressObj = JSON.parse(eventExpress)
+    const { relation, conditions } = expressObj
+    let conditionsRet = []
+    new Rule()
   }
   executeRule(rule) {
 
@@ -10,4 +25,18 @@ class RuleDriver {
   executeRules(rules) {
 
   }
+}
+
+function paseRuleExpress(expressInfo) {
+  const { relation, conditions } = expressObj
+  const key = relation == '1' ? 'all' : 'any'
+  return {
+    [key]: conditions?.map(condition => {
+      if (hasOwn(condition ,'relation') && hasOwn(condition ,'conditions')) {
+        return paseRuleExpress(condition)
+      } else {
+        
+      }
+    })
+  }
 }