resolver-egretimp-plus 0.0.230 → 0.0.231

package/package.json

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

package/src/analysisComponent.jsx

@@ -79,6 +79,7 @@ export default {
     definePrivatelyProp(props.config, 'route', route)
     definePrivatelyProp(props.config, '_validate', validate)
     definePrivatelyProp(props.config, '_rowScope', props.rowScope)
+    definePrivatelyProp(props.config, '_selects', selects)
     // 当前组件的实例
     const instance = getCurrentInstance()
     const appContext = instance?.appContext
@@ -133,7 +134,7 @@ export default {
           const rules = context.rules
           delete context.rules
           setTimeout(() => {
-            rulesDriver.call(context, rules)
+            ruleExecuter?.run(context, rules)
           }, 0)
         })
         ruleExecuter.penddingRules[hireRelat] = null

package/src/components/helper/eventOrchestration.js

@@ -78,9 +78,9 @@ export async function dispatchClickEvent(service, {
   // 定义的请求后钩子
   const configAfterRequestService = compConfig?.afterRequestService
   if (configAfterRequestService || afterRequestService) {
-    normalAfterRequestService = (...arg) => {
-      afterRequestService?.(...arg)
-      configAfterRequestService?.(...arg)
+    normalAfterRequestService = async (...arg) => {
+      await afterRequestService?.(...arg)
+      await configAfterRequestService?.(...arg)
     }
   }
 
@@ -142,7 +142,19 @@ export async function dispatchClickEvent(service, {
     delete reqConfig.data
   }
   const ret = await (axiosInstance && axiosInstance(reqConfig))
-  normalAfterRequestService && normalAfterRequestService(ret)
+  if (normalAfterRequestService) {
+    await normalAfterRequestService(ret, {
+      dynamicMapComp,
+      requestTraceId, 
+      mixinServiceConfig, 
+      rootValue, 
+      dynamicHireRelat, 
+      compConfig,
+      service,
+      reqData: reqResult
+    })
+  }
+
   const noSuccessIip = httpMethod.toLocaleLowerCase() === 'get' || service.transactionType == '1' || serviceCustomProps?.noSuccessIip
   if (!resultToast(ret?.data, messageInstance, {messageCb, service, compConfig, noSuccessIip})) {
     await Promise.reject()

package/src/components/helper/resolver.js

@@ -1,3 +1,5 @@
+import rulesDriver from "../../rules/rulesDriver"
+import { penddingRules } from "../../rules/ruleUtils"
 import { hasOwn } from "../../utils"
 import { resultToast } from "../../utils/respone"
 
@@ -67,4 +69,40 @@ export function resetConfigEventInit(dynamicMapComp) {
       dynamicMapComp[key].eventInit = false
     }
   })
+}
+
+export function assginConfig({
+  dynamicMapComp,
+  preKey,
+  pmPageMetaList,
+  ruleExecuter
+}) {
+  pmPageMetaList?.forEach(config => {
+    const configKey = config.metaCode
+    dynamicMapComp[`${preKey}->${configKey}`] = config
+
+    // 执行没有执行完的规则
+    const hireRelat = config?.hireRelat
+    if (penddingRules[hireRelat]?.length) {
+      penddingRules[hireRelat].forEach(context => {
+        const rules = context.rules
+        delete context.rules
+        setTimeout(() => {
+          rulesDriver.call(context, rules)
+        }, 0)
+      })
+      penddingRules[hireRelat] = null
+    }
+    // 使用json-rules-engine书写的规则，打开这边，需要对之前的规则进行注释，并且需要再index.js文件中进行开启 ====start====
+    if (ruleExecuter?.penddingRules?.[hireRelat]?.length) {
+      ruleExecuter?.penddingRules[hireRelat].forEach(context => {
+        const rules = context.rules
+        delete context.rules
+        setTimeout(() => {
+          rulesDriver.call(context, rules)
+        }, 0)
+      })
+      ruleExecuter.penddingRules[hireRelat] = null
+    }
+  })
 }

package/src/components/packages-web/CustomComponentPlain.vue

@@ -19,7 +19,7 @@ const props = defineProps({
     default: null
   },
   isPointer: {
-    type: [String]
+    type: [String, Number]
   },
   showMoney: {
     type: [String, Number],

package/src/components/packages-web/CustomComponentRow.vue

@@ -25,13 +25,17 @@ const attrs = useAttrs()
 const classRef = computed(() => {
   return {
     'clear-right-margin': !reserveRightMargin.value,
-    'clear-bottom-margin': !reserveBottomMargin.value,
+    'clear-bottom-margin': !reserveBottomMargin.value || allHidden.value,
   }
 })
 
 const pmPageMetaList = computed(() => {
   return props.config?.pmPageMetaList || []
 })
+
+const allHidden = computed(() => {
+  return !!pmPageMetaList.value?.find(config => !((typeof config.hidden === 'boolean' && config.hidden) || config.hidden === '1'))
+})
 // 保留内部formItem的margin-right
 const reserveRightMargin = computed(() => {
   return props.config?.reserveRightMargin
@@ -56,6 +60,9 @@ const reserveBottomMargin = computed(() => {
   }
 }
 .clear-bottom-margin {
+  &.clear-bottom-margin.clear-bottom-margin.clear-bottom-margin {
+    margin-bottom: 0;
+  }
   .el-col {
     & > .el-form-item {
       margin-bottom: 0;

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

@@ -4,6 +4,7 @@ import Renderer from '../../renderer.jsx'
 import { computed, inject, watch, h, ref, reactive } from 'vue'
 import { commonPropsType, TABLE_COLUMN_NOT_RENDER_META_TYPE, DISPLAY_SHOW, compareComponet, isPlainObject, hasOwn, cloneDeep, isPromise, isPlainColumn, generateUniqueId, calcDisable, camelize, capitalize, DISPLAY_HIDDEN, definePrivatelyProp } from '../../utils/index.js'
 import '../styles/CustomComponenTable.scss'
+import { assginConfig } from '../helper/resolver.js'
 
 export default {
   inheritAttrs: false,
@@ -58,6 +59,8 @@ export default {
       return getCompEvents(ElPagination)
     })
 
+    const ruleExecuter = inject('_ruleExecuter')
+    const dynamicMapComp = inject('dynamicMapComp')
     const parentRootValue = inject('_parentRootValue', {})
     const selectionsObj = inject('_selectionsObj', {})
     const rootStore = inject('_rootStore', {})
@@ -65,6 +68,7 @@ export default {
     const rootValue = inject('rootValue')
     const selects = inject('selects')
     const tableColumnFirstMetaCode = ref("")
+    // assginConfig({dynamicMapComp, pmPageMetaList: props.config.pmPageMetaList || [], preKey: props.config?.dynamicHireRelat || '', ruleExecuter })
     const tableColumnConfigs = computed(() => {
       let pmPageMetaList = props.config.pmPageMetaList || []
       return pmPageMetaList.map((config) => {

package/src/rules/eventsSupplement.js

@@ -66,7 +66,7 @@ const allInitEvents = {
     }
     if (val === ARG_FLAGS.REF_VAL) {
       const { config } = this
-      val = config?.bindValue
+      val = config?.bindValue ?? ''
     }  else {
       let routeMatchs = null
       const _absoluteTarget = /^_absoluteTarget:(.+)$/
@@ -193,7 +193,7 @@ const allInitEvents = {
     const { targetObj: target } = event
     if (!target) return
     const targetObj = `${tabpanelCode ? tabpanelCode + '->' : ''}${target}`
-    const configs = getCurrentComp.call(this, targetObj)
+    const configs = getCurrentComp.call(this, targetObj, 'setHidden')
     // const oldDisplayTypes = []
     // 隐藏的效果需要晚点触发，才能正常执行清空等一些列需要组件操作
     setTimeout(() => {
@@ -223,7 +223,7 @@ const allInitEvents = {
     const { targetObj: target } = event
     if (!target) return
     const targetObj = `${tabpanelCode ? tabpanelCode + '->' : ''}${target}`
-    const configs = getCurrentComp.call(this, targetObj)
+    const configs = getCurrentComp.call(this, targetObj, 'setShow')
     // const oldDisplayTypes = []
     configs.forEach((labelInfo) => {
       // const oldDisplayType = labelInfo && labelInfo.displayType

package/src/rules/ruleUtils.js

@@ -2,6 +2,7 @@
 import { hasOwn, isPlainObject } from "../utils"
 import { MULTI_PAGE_META_LIST_TYPES, findComponent } from '../utils/index'
 
+const pmPageMetaListTypeList = ['setShow', 'setHidden']
 // 这边是一些组件在执行规则的时候，如果还没有加载出来，规则会走不动，这边就是存储没走通的规则，等组件加载完之后，再去执行
 export const penddingRules = {}
 
@@ -59,7 +60,7 @@ export function setFormVal(pathStr, val) {
   })
 }
 
-function getRelateConfigs(codesStr, config) {
+function getRelateConfigs(codesStr, config, type) {
   const { dynamicHireRelat = '' } = config
   // 组装成此数据结果，用于后续的获取对应字段=====start====
   const dynamicCodeInfos = dynamicHireRelat.split('->').map(code => {
@@ -122,11 +123,18 @@ function getRelateConfigs(codesStr, config) {
           list.push(fincCg)
           sameIdx = null
         } else {
-          cg.multiPmPageMetaList.forEach(childCgList => {
-            const fincCg = childCgList.find(childCg => childCg.metaCode === code)
+          if (pmPageMetaListTypeList.includes(type)) {
+            const fincCg = cg?.pmPageMetaList?.find(childCg => childCg.metaCode === code)
             if (!fincCg) return
             list.push(fincCg)
-          })
+          } else {
+            cg.multiPmPageMetaList.forEach(childCgList => {
+              const fincCg = childCgList.find(childCg => childCg.metaCode === code)
+              if (!fincCg) return
+              list.push(fincCg)
+            })
+          }
+          
         }
       } else {
         const fincCg = cg?.pmPageMetaList?.find(childCg => childCg.metaCode === code)
@@ -174,10 +182,10 @@ export function canTransNumber(val) {
 /**
  * 根据code path 获取到对应的组件或者label
  */
- export function getCurrentComp(codesStr) {
+ export function getCurrentComp(codesStr, type) {
   if (!codesStr) return null
   const { config } = this
-  return getRelateConfigs.call(this, codesStr, config)
+  return getRelateConfigs.call(this, codesStr, config, type)
 }
 
 export function parseRules(config) {