resolver-egretimp-plus 0.1.119 → 0.1.120

package/package.json

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

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

@@ -5,6 +5,7 @@ import Renderer from '../../renderer.jsx'
 import { computed, inject, watch, h, ref, reactive, onMounted, unref } 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, isArray, eleIsOverflow } from '../../utils/index.js'
 import { getCustomerTableProps, tableValidate } from '../helper/table'
+import { OPEN_TABLE_DEFAULT_PAGINATION } from '../../config'
 // import '../styles/CustomComponenTable.scss'
 
 export default {
@@ -59,6 +60,9 @@ export default {
     
     // 在数据量超过10的话，默认开启分页功能
     const defaultPageable = computed(() => {
+      if (!OPEN_TABLE_DEFAULT_PAGINATION) {
+        return false
+      }
       return !(props.config?.frontPageFlag == '1' || props.config?.pageable == '1') && modelValue.value?.length > 10
     })
 
@@ -618,7 +622,9 @@ export default {
       validate,
     })
     onMounted(() => {
-      formContext?.addField(context)
+      if (OPEN_TABLE_DEFAULT_PAGINATION) {
+        formContext?.addField(context)
+      }
     })
 
     // 是否配置分页功能     ====== end======

package/src/config.js

@@ -0,0 +1,2 @@
+export const OPEN_DATA_RULES = false
+export const OPEN_TABLE_DEFAULT_PAGINATION = false

package/src/hooks/pageConfig.js

@@ -1,4 +1,4 @@
-import { parsePageConfig } from "../utils"
+import { generateFormConfig, parsePageConfig } from "../utils"
 import { ref } from 'vue'
 import { buildInRequest } from "../utils/request"
 import { GET_SYS_PARAM_CACHE, QUERY_PAGE_CONFIG_DATA } from "../api/builtIn"
@@ -54,7 +54,7 @@ export function usePageConfig() {
   }
 }
 
-export function useBuildInData({ messageInstance, loadingInstance, requestTraceId }) {
+export function useBuildInData({ messageInstance, loadingInstance, requestTraceId, lang, isH5 }) {
   const pageConfig = ref(null)
   function getPageConfig(reqData, { configCb, selectsCb, selectPolyReq}) {
     if (loadingInstance.start && typeof loadingInstance.start === 'function') {
@@ -73,9 +73,13 @@ export function useBuildInData({ messageInstance, loadingInstance, requestTraceI
           window?.performance?.mark('update_configs_end')
           console.log('update_configs', window?.performance?.measure('update_configs', 'update_configs_start', 'update_configs_end'))
         }, 0);
-        pageConfig.value = normalPageConfigs(ret.data.result)
+        const normalConfig = normalPageConfigs(ret.data.result)
+        const formConfig = generateFormConfig(lang, isH5)
+        formConfig.pmPageMetaList = normalConfig.pmPageMetaList
+        formConfig._originConfig = normalConfig
+        pageConfig.value = formConfig
         try {
-          configCb && configCb(pageConfig.value)
+          configCb && configCb(normalConfig)
         } catch (error) {
           console.error(error)
         }

package/src/index.jsx

@@ -10,6 +10,7 @@ import { createEmptyCopy, deepMerge } from "./utils/index.js"
 import { initBpm, SUBMIT_TYPE, bpmInstance } from "./bpm/bpmInstance.js"
 import { toWatchRules } from "./hooks/watchRuels.js"
 import { useRoute } from "vue-router"
+import { OPEN_DATA_RULES } from "./config.js"
 // import { RuleExecuter } from "./rulesImp/index.js"
 export default {
   name: 'Resolver',
@@ -245,7 +246,7 @@ export default {
       const oldNativeDataload = nativeDataLoad.value
       nativeDataLoad.value = false
       executeLoadServices(
-        props.config?.pmPageServiceMapVOList || props.config?.lcpPageServiceMapVOList || [],
+        props.config?._originConfig?.pmPageServiceMapVOList || props.config?._originConfig?.lcpPageServiceMapVOList || [],
         {
           alongLoad,
           requestTraceId: props.requestTraceId,
@@ -409,15 +410,17 @@ export default {
         emit('update:modelValue', val)
       }
     })
-    // toWatchRules({
-    //   rules: hireRelatMapRulesRef.value,
-    //   rootValue: toRef(props, 'modelValue'),
-    //   mapComp: mapCompRef.value,
-    //   dynamicMapComp,
-    //   route,
-    //   messageInstance: props.messageInstance,
-    //   lang: props.lang,
-    // })
+    if (OPEN_DATA_RULES) {
+      toWatchRules({
+        rules: hireRelatMapRulesRef.value,
+        rootValue: toRef(props, 'modelValue'),
+        mapComp: mapCompRef.value,
+        dynamicMapComp,
+        route,
+        messageInstance: props.messageInstance,
+        lang: props.lang,
+      })
+    }
     onMounted(() => {
       if (props.openBpm) {
         initBpm(props.bpmMessage, props.bpmActions, props.bpmConfigs, {

package/src/resolver-common.vue

@@ -3,6 +3,7 @@ import { computed, ref, useAttrs } from 'vue';
 import Resolver from './index.jsx'
 import { useBuildInData } from './hooks/pageConfig';
 import { initInterceptors } from './utils/request.js';
+import { generateFormConfig } from './utils/render.jsx';
 
 const props = defineProps({
   busiIdentityId: String,
@@ -10,6 +11,14 @@ const props = defineProps({
     type: Object,
     default: () => ({_default: true})
   },
+  isH5: {
+    type: Boolean,
+    default: false
+  },
+  lang: {
+    type: String,
+    default: 'zh'
+  },
   getNativeComps: {
     type: Function,
     default: () => ({composeComponents: {}})
@@ -48,7 +57,13 @@ defineOptions({
 const attrs = useAttrs()
 
 initInterceptors(props.messageInstance)
-const { getPageConfig, pageConfig, selects } = useBuildInData({messageInstance: props.messageInstance, loadingInstance: props.loadingInstance, requestTraceId: props.requestTraceId})
+const { getPageConfig, pageConfig } = useBuildInData({
+  messageInstance: props.messageInstance,
+  loadingInstance: props.loadingInstance,
+  requestTraceId: props.requestTraceId,
+  isH5: props.isH5,
+  lang: props.lang,
+})
 if (!props.nativeConfig) {
   if (props.selects?._default) {
     // 没有传selects对象的时候，在selectsCb中设置props.selects属性，是不会响应式的，所以这边需要进行逻辑控制
@@ -81,7 +96,10 @@ if (!props.nativeConfig) {
     }
   })
 } else {
-  pageConfig.value = props.nativeConfig
+  const formConfig = generateFormConfig(lang, isH5)
+  formConfig.pmPageMetaList = props.nativeConfig?.pmPageMetaList || []
+  formConfig._originConfig = props.nativeConfig
+  pageConfig.value = formConfig
 }
 
 const resolverRef = ref(null)
@@ -117,6 +135,8 @@ defineExpose({
     v-if="pageConfig && selectsLoad"
     ref="resolverRef"
     v-bind="attrs"
+    :isH5="props.isH5"
+    :lang="props.lang"
     :loadingInstance="props.loadingInstance"
     :messageInstance="props.messageInstance"
     :getNativeComps="props.getNativeComps"

package/src/rules/rulesDriver.js

@@ -1,11 +1,15 @@
 /* eslint-disable */
 import { parseCondition } from './parseCondition'
 import { runEvent } from './eventsSupplement'
+import { OPEN_DATA_RULES } from '../config'
 
 const recoverCb = {}
 const recoverCbTimer = {}
 
 export default function(rules, isInit) {
+  if (OPEN_DATA_RULES) {
+    return
+  }
   rules = rules || []
   this.rules = rules
   const { config: { dynamicHireRelat, columnId, id, metaCode } } = this

package/src/utils/common.js

@@ -275,6 +275,19 @@ export function modelValueDeepMerge(
   return ret
 }
 
+export function extend(to, _from, notAssign) {
+  for (const key in _from) {
+    if (notAssign) {
+      if (!hasOwn(to, key)) {
+        to[key] = _from[key]
+      }
+    } else {
+      to[key] = _from[key]
+    }
+  }
+  return to
+}
+
 export function isFnStr(str) {
   // 匹配具名函数和匿名函数（但不包括箭头函数）
   const functionRegex = /^\s*(?:function\s*(?:\w+\s*)?\([^()]*\)\s*\{[\s\S]*?\})\s*$/

package/src/utils/render.jsx

@@ -1,7 +1,7 @@
 import { getCodeMapRules } from '../rules/rulesDriver.js'
 import SimpleFormItemPc from '../components/simpleFormItemPc'
-import { resolveAssetComponents, findComponent, compareComponet, normalPixel, isPlainObject, hasOwn, isFnStr, normalCapitalizeComponent, capitalize, camelize, formatDate, definePrivatelyProp} from './common.js'
-import { resolveComponent, inject } from 'vue'
+import { resolveAssetComponents, findComponent, compareComponet, normalPixel, isPlainObject, hasOwn, isFnStr, normalCapitalizeComponent, capitalize, camelize, formatDate, definePrivatelyProp, extend, getPathVal, cloneDeep, generateUniqueId} from './common.js'
+import { resolveComponent, inject, watch, unref } from 'vue'
 import CustomComponentColH5 from '../components/packages-H5/CustomComponentColH5.vue'
 import {
   commonPropsType,
@@ -38,6 +38,7 @@ import CmiFormItem from '../components/cmiFormItem'
 import loadModule from './loadModule.js'
 import { h } from 'vue'
 import dayjs from 'dayjs'
+import { OPEN_DATA_RULES } from '../config.js'
 
 export const COFNGI_KEY_EVENT_FLAG = /^on[A-Z]/
 
@@ -101,7 +102,7 @@ export function parseExtendAttr(config, refVal) {
 }
 
 // 目前所有的配置都是在form表单下面，但是现在的配置数据没有form配置项，所有我们自己手动增加
-function generateFormConfig(lang = 'zh', isH5) {
+export function generateFormConfig(lang = 'zh', isH5) {
   return {
     metaType: isH5 ? FORM_META_TYPE_H5 : FORM_META_TYPE,
     displayType: '1',
@@ -132,9 +133,9 @@ export function parsePageConfig({
   messageCb
 }) {
   if (!config) return {}
-  const formConfig = generateFormConfig(lang, isH5)
-  const hireRelatMapRules = getCodeMapRules(config)
-  formConfig.pmPageMetaList = config.pmPageMetaList
+  // const formConfig = generateFormConfig(lang, isH5)
+  const hireRelatMapRules = getCodeMapRules(config._originConfig)
+  // formConfig.pmPageMetaList = config.pmPageMetaList
   const cbs = []
   let { pageConfig, mapComp } = normalConfig({
     requestTraceId,
@@ -152,7 +153,7 @@ export function parsePageConfig({
     messageCb,
     parentRootValue,
     parentDynamicMapComp,
-  }, formConfig)
+  }, config)
   cbs.forEach((cb) => {
     cb()
   })
@@ -183,10 +184,12 @@ export function normalConfig({
   messageCb,
   parentRootValue,
   parentDynamicMapComp,
-}, config, hireRelat = '', mapComp = {}, needformItem = false) {
+}, config, hireRelat = '', mapComp = {}, needformItem = false, dynamicHireRelat = '', unWatchsList = []) {
   const metaCode = config.metaCode || ''
   hireRelat += hireRelat ? `->${metaCode}` : metaCode
+  dynamicHireRelat += dynamicHireRelat ? `->${metaCode}` : metaCode
 
+  const originMetaType = config.metaType
   const metaType = normalMetaType(config.metaType)
 
   // 这个对象是不可以被配置进行覆盖
@@ -201,6 +204,12 @@ export function normalConfig({
     parent: null, // 这个是执行过程中，动态获取的
     dynamicHireRelat: '', // 这个也是执行过程中，动态获取的层级
   }
+
+  if (OPEN_DATA_RULES) {
+    extendNativeObj.dynamicHireRelat = dynamicHireRelat
+    extendNativeObj._rootValue = rootValue
+  }
+
   let extendAttrObj = parseExtendAttr(config)
   let extendObj = {
     removeCol: findComponent(NOT_NEED_COL_ITEM_META_TYPE, extendAttrObj.renderby) !== -1 || findComponent(NOT_NEED_COL_ITEM_META_TYPE, metaType) !== -1,
@@ -213,43 +222,29 @@ export function normalConfig({
   if (findComponent(MULTI_PAGE_META_LIST_TYPES, extendAttrObj.renderby) !== -1 || findComponent(MULTI_PAGE_META_LIST_TYPES, metaType) !== -1) {
     extendObj.multiPmPageMetaList = []
   }
-  // 如果有子项，需要进行递归遍历
-  if (config.pmPageMetaList && config.pmPageMetaList.length) {
-    config.pmPageMetaList = config.pmPageMetaList.map(metaItem => {
-      const { pageConfig } = normalConfig({
-        requestTraceId,
-        dialogReq,
-        lang,
-        mode,
-        cbs,
-        polyfillConfigs,
-        instance,
-        rootValue,
-        axiosInstance,
-        messageInstance ,
-        messageCb,
-        parentRootValue,
-        parentDynamicMapComp,
-      }, metaItem, hireRelat, mapComp, needformItem || [FORM_META_TYPE, FORM_META_TYPE_H5].includes(metaType))
-      return pageConfig
-    })?.sort((a, b) => a.seqNo - b.seqNo)
-  }
-  let pageConfig = {
-    ...extendObj,
-    ...config,
-    ...extendAttrObj,
-    ...extendNativeObj,
-  }
-  if (config.metaType == 'textarea') {
+  // let pageConfig = {
+  //   ...extendObj,
+  //   ...config,
+  //   ...extendAttrObj,
+  //   ...extendNativeObj,
+  // }
+
+  extend(config, extendObj, true)
+  extend(config, extendAttrObj)
+  extend(config, extendNativeObj)
+
+  let pageConfig = config
+
+  if (originMetaType == 'textarea') {
     pageConfig.type = 'textarea'
   }
-  if (config.metaType == 'time-range') {
+  if (originMetaType == 'time-range') {
     pageConfig['isRange'] = true
   }
-  if (config.metaType == 'date-range') {
+  if (originMetaType == 'date-range') {
     pageConfig.type = 'daterange'
   }
-  if (config.metaType == 'card' && !hasOwn(pageConfig, 'needWrap')) {
+  if (originMetaType == 'card' && !hasOwn(pageConfig, 'needWrap')) {
     pageConfig.needWrap = '1'
   }
   // 在详情的情况下，配置组件是否显示
@@ -259,10 +254,8 @@ export function normalConfig({
         extendAttr: typeof pageConfig.detailExtendAttr === 'string' ? pageConfig.detailExtendAttr : JSON.stringify(pageConfig.detailExtendAttr),
         metaCode: `detail-${pageConfig.metaCode}`
       })
-      pageConfig = {
-        ...pageConfig,
-        ...detailExtendAttrObj
-      }
+      extend(pageConfig, detailExtendAttrObj)
+
     }
     pageConfig.hidden = pageConfig.detailHidden || pageConfig.hidden
   }
@@ -273,65 +266,119 @@ export function normalConfig({
         extendAttr: typeof pageConfig.logExtendAttr === 'string' ? pageConfig.logExtendAttr : JSON.stringify(pageConfig.logExtendAttr),
         metaCode: `log-${pageConfig.metaCode}`
       })
-      pageConfig = {
-        ...pageConfig,
-        ...logExtendAttrObj
-      }
+      extend(pageConfig, logExtendAttrObj)
     }
     pageConfig.hidden = pageConfig.logHidden || pageConfig.hidden
   }
 
   mapComp[hireRelat] = pageConfig
   parsePolyfillConfigs({ polyfillConfigs, instance, parentRootValue, parentDynamicMapComp }, pageConfig)
-  // if(pageConfig.lcpPageServiceMapVOList?.length) {
-  //   cbs.push(() => {
-  //     const tabsServices = getTableServices(pageConfig.lcpPageServiceMapVOList, {dynamicMapComp: mapComp, dynamicMapCompKeys: Object.keys(mapComp), hireRelat})
-  //     tabsServices.forEach((({mixinServiceConfig, tableConfig, service}) => {
-  //       const orginCurrentChange = tableConfig.currentChange
-  //       tableConfig.currentChange = (val, props, page) => {
-  //         orginCurrentChange && orginCurrentChange(val, props, page)
-  //         const dynamicMapComp = props.config.dynamicMapComp
-  //         const dynamicMapCompKeys = Object.keys(dynamicMapComp)
-  //         const dynamicHireRelat = props.config.dynamicHireRelat
-  //         dispatchClickEvent(service, {
-  //           requestTraceId,
-  //           dialogReq,
-  //           mixinServiceConfig, 
-  //           lang,
-  //           dynamicMapComp,
-  //           dynamicMapCompKeys,
-  //           dynamicHireRelat,
-  //           rootValue,
-  //           messageCb,
-  //           compConfig: pageConfig,
-  //           axiosInstance,
-  //           messageInstance
-  //         })
-  //       }
-  //       const orginSizeChange = tableConfig.sizeChange
-  //       tableConfig.sizeChange = (val, props, page) => {
-  //         orginSizeChange && orginSizeChange(val, props, page)
-  //         const dynamicMapComp = props.config.dynamicMapComp
-  //         const dynamicMapCompKeys = Object.keys(dynamicMapComp)
-  //         const dynamicHireRelat = props.config.dynamicHireRelat
-  //         dispatchClickEvent(service, {
-  //           requestTraceId,
-  //           dialogReq,
-  //           mixinServiceConfig, 
-  //           lang,
-  //           dynamicMapComp,
-  //           dynamicMapCompKeys,
-  //           dynamicHireRelat,
-  //           rootValue,
-  //           messageCb,
-  //           compConfig: pageConfig,
-  //           axiosInstance,
-  //           messageInstance
-  //         })
-  //       }
-  //     }))
-  //   })
-  // }
+  
+  if (!OPEN_DATA_RULES) {
+    // 如果有子项，需要进行递归遍历
+    if (pageConfig.pmPageMetaList && pageConfig.pmPageMetaList.length) {
+      pageConfig.pmPageMetaList = pageConfig.pmPageMetaList.map(metaItem => {
+        const { pageConfig } = normalConfig({
+          requestTraceId,
+          dialogReq,
+          lang,
+          mode,
+          cbs,
+          polyfillConfigs,
+          instance,
+          rootValue,
+          axiosInstance,
+          messageInstance ,
+          messageCb,
+          parentRootValue,
+          parentDynamicMapComp,
+        }, metaItem, hireRelat, mapComp, needformItem || [FORM_META_TYPE, FORM_META_TYPE_H5].includes(metaType))
+        return pageConfig
+      })?.sort((a, b) => a.seqNo - b.seqNo)
+    }
+  } else {
+    // 如果有子项，需要进行递归遍历
+    if (pageConfig.pmPageMetaList && pageConfig.pmPageMetaList.length) {
+      normalPmPageMetaList(pageConfig)
+    }
+  
+    function normalPmPageMetaList(config) {
+      const isCycleFlag = isCycleConfig(config)
+      if (isCycleFlag) {
+        config._rowColumnConfgsMap = new Map()
+        config.multiPmPageMetaList = []
+        config._unPageMetaListWatch?.() // 删除当前的监听
+        const unWatch = watch(() => getPathVal(unref(config._rootValue), config.dynamicHireRelat, '->')?.length, (val) => {
+          config?._unWatchs?.forEach(un => un?.()) // 删除子级的PmPageMetaList监听
+          const list = getPathVal(unref(config._rootValue), config.dynamicHireRelat, '->')
+          if (list && list.length) {
+            config.multiPmPageMetaList = list.map((row, idx) => {
+              const columnsCgs = config._rowColumnConfgsMap.get(row)
+              if (columnsCgs) {
+                columnsCgs.forEach(config => {
+                  config.rowIndex = idx
+                })
+                return columnsCgs
+              } else {
+                let retColumnConfigs = config.pmPageMetaList.map((itemConfig, relIdx) => {
+                  const ret = cloneDeep(itemConfig)
+                  ret.labelHidden = '1'
+                  if (ret.width && !ret.columnWidth) {
+                    ret.columnWidth = ret.width
+                    delete ret.width
+                  }
+                  ret.columnId = generateUniqueId()
+                  ret.rowIndex = idx
+                  ret.isColumn = true
+                  ret.refConfig = config.pmPageMetaList?.[relIdx]
+                  ret.parent = config // 这边手动设置一下，防止组件复用的时候不会刷新，造成parent的丢失
+                  return ret
+                })
+                simpleNormalPmPageMetaList(retColumnConfigs, `${dynamicHireRelat}[${idx}]`, [...unWatchsList])
+                config._rowColumnConfgsMap.set(row, retColumnConfigs)
+                return retColumnConfigs
+              }
+            })
+          }
+        }, {
+          immediate: true,
+        })
+        // 这边先执行，因为当前的_unWatchs里面只放子级的watch
+        unWatchsList?.forEach(list => {
+          list?.push(unWatch)
+        })
+        config._unPageMetaListWatch = unWatch
+        config._unWatchs = []
+        unWatchsList?.push(config._unWatchs)
+        
+      } else {
+        config.pmPageMetaList = simpleNormalPmPageMetaList(config.pmPageMetaList, dynamicHireRelat)
+      }
+  
+      function simpleNormalPmPageMetaList(pmPageMetaList, dynamicHireRelat, unWatchsList) {
+        return pmPageMetaList.map(metaItem => {
+          const { pageConfig } = normalConfig({
+            requestTraceId,
+            dialogReq,
+            lang,
+            mode,
+            cbs,
+            polyfillConfigs,
+            instance,
+            rootValue,
+            axiosInstance,
+            messageInstance ,
+            messageCb,
+            parentRootValue,
+            parentDynamicMapComp,
+          }, metaItem, hireRelat, mapComp, needformItem || [FORM_META_TYPE, FORM_META_TYPE_H5].includes(metaType), dynamicHireRelat, unWatchsList)
+          return pageConfig
+        })?.sort((a, b) => a.seqNo - b.seqNo)
+      }
+    }
+  }
+
+
   return {
     mapComp,
     pageConfig