resolver-egretimp-plus 0.1.124 → 0.1.125

package/package.json

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

package/src/analysisComponent.jsx

@@ -235,7 +235,6 @@ export default {
      */
     const parent = inject('parent', null)
     const dynamicMapComp = inject('dynamicMapComp')
-
     const configLinks = [parent, ...props.additionConfigs, props.config]
     configLinks.reduce((parent, config) => {
       definePrivatelyProp(config, 'parent', parent)

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

@@ -11,10 +11,9 @@ import { ElTabs } from 'element-plus'
 import Tabs from '../tabs'
 import Renderer from '../../renderer.jsx'
 import { computed, useAttrs, useSlots } from 'vue'
-import { commonPropsType, hasOwn } from '../../utils/index.js'
+import { assertMetaType, commonPropsType, hasOwn } from '../../utils/index.js'
 import { watch } from 'vue'
 import { OPEN_DATA_RULES } from '../../config.js'
-
 // import * as lib from 'element-plus/es/utils/index.mjs'
 
 const slots = useSlots()
@@ -127,9 +126,6 @@ if (OPEN_DATA_RULES) {
   })
 }
 
-function assertMetaType(config, metaType) {
-  return config.renderby === metaType || config.metaType === metaType
-}
 
 defineExpose({
   setActiveTab(tabMetaCode) {

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

@@ -1,5 +1,5 @@
 <template>
-  <ElDatePicker v-bind="{ ...attrs, ...datePickerProps}" :disabledDate="disabledDate" v-model="value">
+  <ElDatePicker v-bind="{ ...attrs, ...normalDatePickerProps}" :disabledDate="disabledDate" v-model="value">
     <template v-for="(_, key) in slots" :key="key" v-slot:[key]="scope">
       <slot :name="key" v-bind="scope"></slot>
     </template>
@@ -46,22 +46,38 @@ const datePickerProps = computed(() => {
   }
   return ret
 })
+const normalDatePickerProps = computed(() => {
+  const ret = {
+    ...datePickerProps.value
+  }
+  delete ret.valueFormat
+  return ret
+})
+
 const attrs = useAttrs()
 const modeValue = defineModel()
 
 const value = computed({
   get() {
-    if (isNaN(Number(modeValue.value))) {
-      return modeValue.value
-    } else {
-      if (datePickerProps.value.valueFormat === 'timestamp' || `${modeValue.value}`.length >= 13) {
-        return Number(modeValue.value)
+    let ret = modeValue.value
+    if (!isNaN(Number(modeValue.value))) {
+      if (
+        datePickerProps.value.valueFormat === 'x' ||
+        datePickerProps.value.valueFormat === 'timestamp' ||
+        `${modeValue.value}`.length >= 13
+      ) {
+        ret = Number(modeValue.value)
       }
-      return modeValue.value
     }
+    ret = dayjs(ret).toDate()
+    return ret
   },
   set(val) {
-    modeValue.value = val
+    let valueFormat = datePickerProps.value?.valueFormat
+    if (valueFormat === 'timestamp') {
+      valueFormat = 'x'
+    }
+    modeValue.value = dayjs(val).format(valueFormat)
   }
 })
 watch(value, () => {

package/src/hooks/pageConfig.js

@@ -1,4 +1,4 @@
-import { generateFormConfig, parsePageConfig } from "../utils"
+import { generateFormConfig, parsePageConfig } from "../utils/index.js"
 import { ref } from 'vue'
 import { buildInRequest } from "../utils/request"
 import { GET_SYS_PARAM_CACHE, QUERY_PAGE_CONFIG_DATA } from "../api/builtIn"
@@ -11,6 +11,11 @@ export function usePageConfig() {
   const hireRelatMapRulesRef = ref(null)
   const mapCompRef = ref(null)
   function initPageConfig({
+    components,
+    confirmInstance,
+    openChildDialogInstance,
+    buttonActions,
+    builtPolyfillReq,
     requestTraceId,
     dialogReq,
     mode,
@@ -30,6 +35,11 @@ export function usePageConfig() {
     messageCb
   }) {
     const { pageConfig, mapComp, hireRelatMapRules } = parsePageConfig({
+      components,
+      confirmInstance,
+      openChildDialogInstance,
+      buttonActions,
+      builtPolyfillReq,
       requestTraceId,
       dialogReq,
       mode,

package/src/index.jsx

@@ -3,6 +3,7 @@ import Renderer from './renderer.jsx'
 // import './style/index.scss'
 import { usePageConfig } from './hooks/pageConfig'
 import { toValidate } from './utils/valid.js'
+import { toValidate as validateByData } from './utils/validateByData.js'
 import { MODE } from "./utils/const.js"
 import { generateRequester } from "./utils/request.js"
 import { executeLoadServices, resetConfigEventInit } from "./components/helper/resolver.js"
@@ -207,6 +208,7 @@ export default {
   },
   emits: ['update:modelValue', 'rootStoreChange'],
   setup(props, { emit, attrs, expose }) {
+    const componentsRef = toRef(props, 'components')
     const configsSet = new Set()
     const dynamicMapComp = reactive({})
     const instance = getCurrentInstance()
@@ -298,6 +300,11 @@ export default {
       )
     }
     initPageConfig({
+      components: props.components,
+      confirmInstance: props.confirmInstance,
+      openChildDialogInstance: props.openChildDialogInstance,
+      buttonActions: props.buttonActions,
+      builtPolyfillReq: props.builtPolyfillReq,
       requestTraceId: props.requestTraceId,
       dialogReq: props.dialogReq,
       mode: props.mode,
@@ -320,6 +327,11 @@ export default {
 
     watch(toRef(props, 'config'), () => {
       initPageConfig({
+        components: props.components,
+        confirmInstance: props.confirmInstance,
+        openChildDialogInstance: props.openChildDialogInstance,
+        buttonActions: props.buttonActions,
+        builtPolyfillReq: props.builtPolyfillReq,
         requestTraceId: props.requestTraceId,
         dialogReq: props.dialogReq,
         mode: props.mode,
@@ -361,7 +373,7 @@ export default {
     provide('hireRelatMapRules', hireRelatMapRulesRef) // 组件对应的规则集合
 
     provide('buttonActions', props.buttonActions)
-    provide('components', toRef(props, 'components'))
+    provide('components', componentsRef)
     provide('selects', toRef(props, 'selects'))
     provide('_rootInstance', instance)
     provide('rootValue', computed({
@@ -381,13 +393,27 @@ export default {
     provide('_parentDynamicMapComp', props.parentDynamicMapComp)
     provide('_selectionsObj', props.selectionsObj) 
     provide('_polyfillConfigs', props.polyfillConfigs)
-    provide('requestTraceId', toRef(props, 'requestTraceId')) // 所有渲染器调用的接口，都需要加次参数（生哥提）
+    const requestTraceIdRef = toRef(props, 'requestTraceId')
+    provide('requestTraceId', requestTraceIdRef) // 所有渲染器调用的接口，都需要加次参数（生哥提）
 
     const rootForm = ref(null)
     provide('rootForm', rootForm)
 
     const validate = (cb) => {
-      toValidate(rootForm, cb, dynamicMapComp)
+      if (OPEN_DATA_RULES) {
+        validateByData({
+          rootConfig: props.config,
+          rootValue: props.modelValue,
+          mode: props.mode,
+          lang: props.lang,
+          messageInstance: props.messageInstance,
+          formRef:rootForm,
+          cb,
+          dynamicMapComp,
+        })
+      } else {
+        toValidate(rootForm, cb, dynamicMapComp)
+      }
     }
     provide('_validate', validate)
     expose({

package/src/utils/common.js

@@ -637,6 +637,7 @@ export function assignmentPathVal(obj = {}, path, val, separator = '.') {
               const currentIdx = parseInt(match[2])
               if (!Number.isNaN(currentIdx)) {
                 !retObj[currentIdx] && (retObj[currentIdx] = {})
+                retObj = retObj[currentIdx]
               }
             }
           }

package/src/utils/render.jsx

@@ -26,14 +26,15 @@ import {
   MODE,
 
   isHidden,
-  CYCLE_COMPONETS
+  CYCLE_COMPONETS,
+  EXECTE_CLICK_EVENT_COMPONENTS
 } from './const.js'
 import { preserveCheck } from './preserveFunc.js'
 import { isArray, isFunction, isString } from './is.js'
 import CustomComponentPlain from '../components/packages-web/CustomComponentPlain.vue'
 // import QuestionFilled from '../components/icons/question-filled.vue'
 import infoIcon from '../components/icons/info.vue'
-import { dispatchClickEvent, dispatchClickEvents, getTableConfig } from '../components/helper/eventOrchestration.js'
+import { dispatchClickEvent, dispatchClickEvents, executeEventOrchestration, getTableConfig } from '../components/helper/eventOrchestration.js'
 import CmiFormItem from '../components/cmiFormItem'
 import loadModule from './loadModule.js'
 import dayjs from 'dayjs'
@@ -119,6 +120,11 @@ export function generateFormConfig(lang = 'zh', isH5) {
  * @param {*} config 通过接口获取的配置对象
  */
 export function parsePageConfig({
+  components,
+  confirmInstance,
+  openChildDialogInstance,
+  buttonActions,
+  builtPolyfillReq,
   requestTraceId,
   dialogReq,
   mode,
@@ -140,6 +146,11 @@ export function parsePageConfig({
   const cbs = []
   window?.performance?.mark('noraml_config_start')
   let { pageConfig, mapComp } = normalConfig({
+    components,
+    confirmInstance,
+    openChildDialogInstance,
+    buttonActions,
+    builtPolyfillReq,
     requestTraceId,
     dialogReq,
     lang,
@@ -204,6 +215,20 @@ function correctConfigDynamicMapHandler({config, dynamicMapComp, changedDynamicH
     }
   }
 }
+
+function canReuse(
+  dynamicMapComp,
+  dynamicHireRelat,
+  currentIdx
+) {
+  // 如果组件上的rowIndex等于当前的idx，说明这个config已经没有被用到了，我们可以直接拿过来复用
+  const currentCg = dynamicMapComp[dynamicHireRelat]
+  if (currentCg?.rowIndex === currentIdx) {
+    return true
+  }
+  return false
+}
+
 /**
  * {
  *  children: [], // 子元素
@@ -212,6 +237,11 @@ function correctConfigDynamicMapHandler({config, dynamicMapComp, changedDynamicH
  * @param {*} config 
  */
 export function normalConfig({
+  components,
+  confirmInstance,
+  openChildDialogInstance,
+  buttonActions,
+  builtPolyfillReq,
   requestTraceId,
   dialogReq,
   lang,
@@ -229,6 +259,7 @@ export function normalConfig({
   noParsePageMetaList,
   changeConfig,
   notParseConfig,
+  parentConfig,
 }, config, hireRelat = '', mapComp = {}, needformItem = false, dynamicHireRelat = '', unWatchsList = []) {
 
   const metaCode = config.metaCode || ''
@@ -250,10 +281,10 @@ export function normalConfig({
     vm: null, // 具体渲染的组件
     wrapVm: null, // 当前组件的实例（也就是analysisComponent）
     hireRelat,
-    parent: null, // 这个是执行过程中，动态获取的
   }
   if (!OPEN_DATA_RULES) {
     extendNativeObj.dynamicHireRelat = ''
+    extendNativeObj.parent = null
   } else {
     if (changeConfig) {
       // 设置multiPmPageMetaList的时候，如果数组变了，如果数组中的值变换了位置，需要对dynamicMapComp设置正确的映射
@@ -263,6 +294,7 @@ export function normalConfig({
     dynamicMapComp[dynamicHireRelat] = config
     definePrivatelyProp(config, '_rootValue', rootValue)
     definePrivatelyProp(config, 'refValue', useVmodels(config).modelValue)
+    definePrivatelyProp(config, 'parent', parentConfig) // 这边手动设置一下，防止组件复用的时候不会刷新，造成parent的丢失
   }
 
   if (!notParseConfig) {
@@ -351,6 +383,23 @@ export function normalConfig({
       })?.sort((a, b) => a.seqNo - b.seqNo)
     }
   } else {
+    compatibilityConfig({
+      config,
+      builtPolyfillReq,
+      components,
+      requestTraceId,
+      rootValue,
+      axiosInstance,
+      polyfillConfigs,
+      confirmInstance,
+      dynamicMapComp,
+      openChildDialogInstance,
+      messageInstance,
+      messageCb,
+      buttonActions,
+      lang,
+      dialogReq,
+    })
     // 如果有子项，需要进行递归遍历
     if (pageConfig.pmPageMetaList && pageConfig.pmPageMetaList.length && !noParsePageMetaList) {
       normalPmPageMetaList(pageConfig)
@@ -379,59 +428,72 @@ export function normalConfig({
 
         
         config._unPageMetaListWatch = watch(() => getPathVal(unref(rootValue), config.dynamicHireRelat, '->'), (val) => {
+          let noParseConfigs = []
           const list = getPathVal(unref(rootValue), config.dynamicHireRelat, '->')
           if (list && list.length) {
             const cbFns = []
-            const pageMetaList = list.map((row, idx) => {
+            const pageMetaList = new Array(list.length)
+            for (let idx = 0; idx < list.length; idx++) {
+              const row = list[idx];
               const columnsCgs = config._rowColumnConfgsMap.get(row)
               if (columnsCgs) {
                 columnsCgs.forEach(config => {
                   config.rowIndex = idx
                   config.rowScope.$index =idx
                 })
-                return columnsCgs
+                pageMetaList.splice(idx, 1, columnsCgs)
               } else {
-                let retColumnConfigs = config.pmPageMetaList.map((itemConfig, relIdx) => {
-                  const ret = cloneDeep(itemConfig)
-                  if (findComponent(['CustomComponentTable'], config.renderby) !== -1 || findComponent(['CustomComponentTable'], config.metaType) !== -1) {
-                    ret.labelHidden = '1'
-                    if (ret.width && !ret.columnWidth) {
-                      ret.columnWidth = ret.width
-                      delete ret.width
-                    }
-                    ret.isColumn = true
-                  }
-                  ret.rowScope = {$index: idx, row}
-                  ret.columnId = generateUniqueId()
-                  ret.rowIndex = idx
-                  definePrivatelyProp(ret, 'refConfig', config.pmPageMetaList?.[relIdx])
-                  definePrivatelyProp(ret, 'parent', config) // 这边手动设置一下，防止组件复用的时候不会刷新，造成parent的丢失
-                  return ret
-                })
-                retColumnConfigs = reactive(retColumnConfigs)
                 cbFns.push(() => {
+                  let retColumnConfigs = config.pmPageMetaList.map((itemConfig, relIdx) => {
+                    const compareDynamicHireRelat = `${config.dynamicHireRelat}[${idx}]->${itemConfig.metaCode}`
+                    let ret = null
+                    if (canReuse(dynamicMapComp, compareDynamicHireRelat, idx)) {
+                      ret = dynamicMapComp[compareDynamicHireRelat]
+                      noParseConfigs.push(ret)
+                    } else {
+                      ret = cloneDeep(itemConfig)
+                      if (findComponent(['CustomComponentTable'], config.renderby) !== -1 || findComponent(['CustomComponentTable'], config.metaType) !== -1) {
+                        ret.labelHidden = '1'
+                        if (ret.width && !ret.columnWidth) {
+                          ret.columnWidth = ret.width
+                          delete ret.width
+                        }
+                        ret.isColumn = true
+                      }
+                      ret.rowScope = {$index: idx, row}
+                      ret.rowIndex = idx
+                      ret.columnId = generateUniqueId()
+                    }
+                    definePrivatelyProp(ret, 'parent', parentConfig) // 这边手动设置一下，防止组件复用的时候不会刷新，造成parent的丢失
+                    definePrivatelyProp(ret, 'refConfig', config.pmPageMetaList?.[relIdx])
+                    return ret
+                  })
+                  retColumnConfigs = reactive(retColumnConfigs)
                   simpleNormalPmPageMetaList({
-                    pmPageMetaList: retColumnConfigs,
+                    pmPageMetaList: retColumnConfigs.filter(cg => !noParseConfigs.some(cg1 => cg === cg1)),
                     dynamicHireRelat: `${config.dynamicHireRelat}[${idx}]`,
                     unWatchsList: currentUnWatchsList,
                     noParsePageMetaList: false,
                     changeConfig: true,
                     notParseConfig: true,
                   })
+                  config._rowColumnConfgsMap.set(row, retColumnConfigs)
+
+                  pageMetaList.splice(idx, 1, retColumnConfigs)
                 })
-                config._rowColumnConfgsMap.set(row, retColumnConfigs)
-                return retColumnConfigs
               }
-            })
-            config.multiPmPageMetaList = pageMetaList
+            }
             cbFns.forEach(cb => cb())
+            config.multiPmPageMetaList = pageMetaList
             
             const mapKeys = config._rowColumnConfgsMap.keys()
             Array.from(mapKeys).forEach(row => {
               // 如果已经没有对应的数据循环config了，删除子级的PmPageMetaList监听
               if (!list.some(row2 => row2 === row)) {
                 config._rowColumnConfgsMap.get(row)?.forEach(unWatchConfig => {
-                  unWatchConfig?._unWatchs?.forEach(un => un?.())
+                  if (!noParseConfigs.some(cg1 => cg1 === unWatchConfig)) {
+                    unWatchConfig?._unWatchs?.forEach(un => un?.())
+                  }
                 })
                 config._rowColumnConfgsMap.delete(row)
               }
@@ -440,10 +502,9 @@ export function normalConfig({
         }, {
           immediate: true,
           deep: true,
-          // flush: 'sync'
         })
 
-        oldUnWatchsList?.forEach(list => {
+        currentUnWatchsList?.forEach(list => {
           list?.push(config._unPageMetaListWatch)
         })
       }
@@ -451,6 +512,11 @@ export function normalConfig({
       function simpleNormalPmPageMetaList({pmPageMetaList, dynamicHireRelat, unWatchsList, noParsePageMetaList, changeConfig, notParseConfig}) {
         return pmPageMetaList.map(metaItem => {
           const { pageConfig } = normalConfig({
+            components,
+            confirmInstance,
+            openChildDialogInstance,
+            buttonActions,
+            builtPolyfillReq,
             requestTraceId,
             dialogReq,
             lang,
@@ -468,6 +534,7 @@ export function normalConfig({
             noParsePageMetaList,
             changeConfig,
             notParseConfig,
+            parentConfig: config
           }, metaItem, hireRelat, mapComp, needformItem || [FORM_META_TYPE, FORM_META_TYPE_H5].includes(metaType), dynamicHireRelat, unWatchsList)
           return pageConfig
         })?.sort((a, b) => a.seqNo - b.seqNo)
@@ -475,13 +542,83 @@ export function normalConfig({
     }
   }
 
-
   return {
     mapComp,
     pageConfig
   }
 }
 
+// 目前做数据进行驱动规则、循环组件的config渲染，需要兼容一些现有业务逻辑
+function compatibilityConfig({
+  config,
+  builtPolyfillReq,
+  components,
+  requestTraceId,
+  rootValue,
+  axiosInstance,
+  polyfillConfigs,
+  confirmInstance,
+  dynamicMapComp,
+  openChildDialogInstance,
+  messageInstance,
+  messageCb,
+  buttonActions,
+  lang,
+  dialogReq,
+}) {
+  // 给button组件的vm中添加click事件，因为这边业务都用到了，需要进行兼容
+  const needClick = findComponent(EXECTE_CLICK_EVENT_COMPONENTS, config.renderby) !== -1 || findComponent(EXECTE_CLICK_EVENT_COMPONENTS, config.metaType) !== -1
+  if (needClick) {
+    config.vm = markRaw({
+      click(params) {
+        executeEventOrchestration({
+          ...params,
+          builtPolyfillReq,
+          components,
+          props: {config},
+          requestTraceId,
+          axiosInstance: axiosInstance,
+          polyfillConfigs,
+          rootValue: rootValue?.value,
+          confirmInstance,
+          dynamicMapComp,
+          openChildDialog: openChildDialogInstance,
+          messageInstance,
+          messageCb,
+          buttonActions,
+          lang,
+          dialogReq,
+          appContext: null
+        })
+      }
+    })
+  }
+  // tab需要兼容setActiveTab方法，业务侧有没加载就使用
+  const needSetActive = findComponent(['CustomComponentTabs'], config.renderby) !== -1 || findComponent(['CustomComponentTabs'], config.metaType) !== -1
+  if (needSetActive) {
+    config.vm = markRaw({
+      setActiveTab(val) {
+        const tabpanes = config.pmPageMetaList || []
+        tabpanes.forEach(tab => {
+          if (assertMetaType(tab, 'CustomComponentCycleTabPane') || tab?.isCycle == '1') {
+            if (/^cycleTabpane-(\d+)$/.test(val)) {
+              tab.currentCode = val
+            } else {
+              tab.currentCode = ''
+            }
+          } else if (tab.metaType === 'CustomComponentTabPane') {
+            if (tab.metaCode === val) {
+              tab.defaultShowFlag = '1'
+            } else {
+              tab.defaultShowFlag = '0'
+            }
+          }
+        })
+      }
+    })
+  }
+}
+
 // 从按钮的服务编排中，获取到按钮中配置的表格中的config，并且绑定表格的分页
 function getTableServices(lcpPageServiceMapVOList = [], { dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat }) {
   const mixinServiceConfig = lcpPageServiceMapVOList.find(service => service.serviceType == '1')
@@ -1311,3 +1448,7 @@ function labelMouseEnenter(e, config, lang) {
     config._triggerRef = e.target
   }
 }
+
+export function assertMetaType(config, metaType) {
+  return config.renderby === metaType || config.metaType === metaType
+}