resolver-egretimp-plus 0.1.119 → 0.1.121

package/package.json

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

package/src/components/options/OptionsDefault.vue

@@ -1,7 +1,6 @@
 <script setup>
 const props = defineProps({
   label: {
-    type: String,
     default: ''
   }
 })

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

@@ -1,6 +1,7 @@
 <template>
   <div class="custom-component-cycle">
-    <template v-for="(pageMetaList, $index) in (multiPmPageMetaList || [])" :key="pageMetaListKeys[pageMetaList.id]">
+    <!-- <template v-for="(pageMetaList, $index) in (multiPmPageMetaList || [])" :key="pageMetaListKeys[pageMetaList.id]"> -->
+    <template v-for="(pageMetaList, $index) in (multiPmPageMetaList || [])" :key="OPEN_DATA_RULES ? pageMetaList.map(item => item.id).join(',') : pageMetaListKeys[pageMetaList.id]">
       <component :is="component" v-bind="componentProps">
         <ElRow>
           <Renderer :modelValue="modelValue?.[$index]" :rowScope="{row: modelValue?.[$index], $index}" @update:modelValues="onUpdateModelValue($event, $index)" :config="pageMetaList"></Renderer>
@@ -14,6 +15,7 @@ import { computed, defineModel, watch, reactive } from 'vue'
 import { commonPropsType, cloneDeep, definePrivatelyProp } from '../../utils/index.js'
 import { ElRow, ElCard } from 'element-plus'
 import Renderer from '../../renderer.jsx'
+import { OPEN_DATA_RULES } from '../../config.js'
 
 // const lang = inject('lang')
 const modelValue = defineModel()
@@ -42,39 +44,42 @@ const multiPmPageMetaList = computed(() => {
 const pmPageMetaList = computed(() => {
   return (props.config.pmPageMetaList || [])
 })
-const rowConfgsMap = new Map()
-const pageMetaListKeys = reactive({})
-watch(() => {
-  return modelValue.value?.length
-}, (length) => {
-  let list = []
-  if (length) {
-    const newVal = modelValue.value
-    list = newVal.map((row, idx) => {
-      const rowCgs = rowConfgsMap.get(row)
-      if (rowCgs) {
-        rowCgs.forEach(config => {
-          config.rowIndex = idx
-        })
-        return rowCgs
-      } else {
-        const retConfigs = pmPageMetaList.value.map(config => {
-          const ret = cloneDeep(config)
-          ret.rowIndex = idx
-          return ret
-        })
-        retConfigs.id = new Date().getTime()
-        pageMetaListKeys[retConfigs.id] = new Date().getTime()
 
-        rowConfgsMap.set(row, retConfigs)
-        return retConfigs
-      }
-    })
-  }
-  definePrivatelyProp(props.config, 'multiPmPageMetaList', list)
-}, {
-  immediate: true
-})
+const pageMetaListKeys = reactive({})
+if (!OPEN_DATA_RULES) {
+  const rowConfgsMap = new Map()
+  watch(() => {
+    return modelValue.value?.length
+  }, (length) => {
+    let list = []
+    if (length) {
+      const newVal = modelValue.value
+      list = newVal.map((row, idx) => {
+        const rowCgs = rowConfgsMap.get(row)
+        if (rowCgs) {
+          rowCgs.forEach(config => {
+            config.rowIndex = idx
+          })
+          return rowCgs
+        } else {
+          const retConfigs = pmPageMetaList.value.map(config => {
+            const ret = cloneDeep(config)
+            ret.rowIndex = idx
+            return ret
+          })
+          retConfigs.id = new Date().getTime()
+          pageMetaListKeys[retConfigs.id] = new Date().getTime()
+  
+          rowConfgsMap.set(row, retConfigs)
+          return retConfigs
+        }
+      })
+    }
+    definePrivatelyProp(props.config, 'multiPmPageMetaList', list)
+  }, {
+    immediate: true
+  })
+}
 
 const component = computed(() => {
   return props.config.needWrap === false ? 'div' : ElCard

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

@@ -1,5 +1,9 @@
 <template>
-  <TabPane v-for="(pageMetaList, $index) in (multiPmPageMetaList || [])" v-bind="{...tabPaneProps}" :key="pageMetaListKeys[pageMetaList.id]" :label="`${lang.indexOf('zh') > -1 ? props.config?.metaNameZh : props.config?.metaNameEn}-${$index}`" :name="`${props.config?.metaCode}-${$index}`">
+  <TabPane v-for="(pageMetaList, $index) in (multiPmPageMetaList || [])" v-bind="{...tabPaneProps}" 
+    :key="OPEN_DATA_RULES ? pageMetaList.map(item => item.id).join(',') : pageMetaListKeys[pageMetaList.id]"
+    :label="`${lang.indexOf('zh') > -1 ? props.config?.metaNameZh : props.config?.metaNameEn}-${$index}`"
+    :name="`${props.config?.metaCode}-${$index}`"
+  >
     <template #label v-if="labelRenderContentFn || pageMetaList.filter(config => config.collapseSlot).length">
       <component
         v-if="labelRenderContentFn"
@@ -35,6 +39,7 @@ import { commonPropsType, cloneDeep, definePrivatelyProp } from '../../utils/ind
 import { TabPane } from '../tabs'
 import { h } from 'vue'
 import { useAttrs } from 'vue'
+import { OPEN_DATA_RULES } from '../../config.js'
 
 defineOptions({
   inheritAttrs: false
@@ -87,39 +92,41 @@ const multiPmPageMetaList = computed(() => {
 const pmPageMetaList = computed(() => {
   return (props.config.pmPageMetaList || [])
 })
-const rowConfgsMap = new Map()
 const pageMetaListKeys = reactive({})
-watch(() => {
-  return modelValue.value?.length
-}, (length) => {
-  let list = []
-  if (length) {
-    const newVal = modelValue.value
-    list = newVal.map((row, idx) => {
-      const rowCgs = rowConfgsMap.get(row)
-      if (rowCgs) {
-        rowCgs.forEach(config => {
-          config.rowIndex = idx
-        })
-        return rowCgs
-      } else {
-        const retConfigs = pmPageMetaList.value.map(config => {
-          const ret = cloneDeep(config)
-          ret.rowIndex = idx
-          return ret
-        })
-        retConfigs.id = new Date().getTime()
-        pageMetaListKeys[retConfigs.id] = new Date().getTime()
-
-        rowConfgsMap.set(row, retConfigs)
-        return retConfigs
-      }
-    })
-  }
-  definePrivatelyProp(props.config, 'multiPmPageMetaList', list)
-}, {
-  immediate: true
-})
+if (!OPEN_DATA_RULES) {
+  const rowConfgsMap = new Map()
+  watch(() => {
+    return modelValue.value?.length
+  }, (length) => {
+    let list = []
+    if (length) {
+      const newVal = modelValue.value
+      list = newVal.map((row, idx) => {
+        const rowCgs = rowConfgsMap.get(row)
+        if (rowCgs) {
+          rowCgs.forEach(config => {
+            config.rowIndex = idx
+          })
+          return rowCgs
+        } else {
+          const retConfigs = pmPageMetaList.value.map(config => {
+            const ret = cloneDeep(config)
+            ret.rowIndex = idx
+            return ret
+          })
+          retConfigs.id = new Date().getTime()
+          pageMetaListKeys[retConfigs.id] = new Date().getTime()
+  
+          rowConfgsMap.set(row, retConfigs)
+          return retConfigs
+        }
+      })
+    }
+    definePrivatelyProp(props.config, 'multiPmPageMetaList', list)
+  }, {
+    immediate: true
+  })
+}
 
 // 自定义渲染label方法
 const labelRenderContentFn = computed(() => {

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

@@ -77,7 +77,6 @@ const props = defineProps({
   },
   // 是否显示货币符号
   showSymbol: {
-    type: String,
     default: ''
   },
   // 货币符号
@@ -138,10 +137,12 @@ function inputNumebrFormat(val, props) {
   }
 }
 
-const classObj = computed(() => ({
-  [`custom-component-plain--${props.type}`]: true,
-  cursor: props.isPointer == '1'
-}))
+const classObj = computed(() => ([
+  props.type ? `custom-component-plain--${props.type}` : '',
+  {
+    cursor: props.isPointer == '1'
+  }
+]))
 
 
 const appContext = getCurrentInstance()?.appContext

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, OPEN_DATA_RULES } 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
     })
 
@@ -284,7 +288,7 @@ export default {
         retObj.className = `${retObj.className || ''} clear-index`
       }
       if (!isVirtualized.value) {
-        retObj.className = `${retObj.className} cell-col-ellipsis`
+        retObj.className = `${retObj.className || ''} cell-col-ellipsis`
         if (!retObj.prop) {
           retObj.prop = config.metaCode
         }
@@ -390,44 +394,46 @@ export default {
      * multiPmPageMetaList值主要作用是区分列的每一行都需要有单独的config，接口配置返回的只是列的配置，
      * 所以这边需要单独再坐下处理
      */
-    const rowColumnConfgsMap = new Map()
-    watch(() => {
-      return tableData?.value?.length
-    }, (length) => {
-      let list = []
-      if (length) {
-        const newVal = tableData.value
-        list = newVal?.map?.((row, idx) => {
-          const columnsCgs = rowColumnConfgsMap.get(row)
-          if (columnsCgs) {
-            columnsCgs.forEach(config => {
-              config.rowIndex = idx
-            })
-            return columnsCgs
-          } else {
-            const retColumnConfigs = tableColumnConfigs.value.map((config, relIdx) => {
-              const ret = cloneDeep(config)
-              if (ret.width && !ret.columnWidth) {
-                ret.columnWidth = ret.width
-                delete ret.width
-              }
-              ret.columnId = generateUniqueId()
-              ret.rowIndex = idx
-              ret.isColumn = true
-              ret.refConfig = props?.config?.pmPageMetaList?.[relIdx]
-              ret.parent = props?.config // 这边手动设置一下，防止组件复用的时候不会刷新，造成parent的丢失
-              return ret
-            })
-            rowColumnConfgsMap.set(row, retColumnConfigs)
-            return retColumnConfigs
-          }
-        })
-      }
-      definePrivatelyProp(props.config, 'multiPmPageMetaList', list)
-    }, {
-      immediate: true,
-      deep: true,
-    })
+    if (!OPEN_DATA_RULES) {
+      const rowColumnConfgsMap = new Map()
+      watch(() => {
+        return tableData?.value?.length
+      }, (length) => {
+        let list = []
+        if (length) {
+          const newVal = tableData.value
+          list = newVal?.map?.((row, idx) => {
+            const columnsCgs = rowColumnConfgsMap.get(row)
+            if (columnsCgs) {
+              columnsCgs.forEach(config => {
+                config.rowIndex = idx
+              })
+              return columnsCgs
+            } else {
+              const retColumnConfigs = tableColumnConfigs.value.map((config, relIdx) => {
+                const ret = cloneDeep(config)
+                if (ret.width && !ret.columnWidth) {
+                  ret.columnWidth = ret.width
+                  delete ret.width
+                }
+                ret.columnId = generateUniqueId()
+                ret.rowIndex = idx
+                ret.isColumn = true
+                ret.refConfig = props?.config?.pmPageMetaList?.[relIdx]
+                ret.parent = props?.config // 这边手动设置一下，防止组件复用的时候不会刷新，造成parent的丢失
+                return ret
+              })
+              rowColumnConfgsMap.set(row, retColumnConfigs)
+              return retColumnConfigs
+            }
+          })
+        }
+        definePrivatelyProp(props.config, 'multiPmPageMetaList', list)
+      }, {
+        immediate: true,
+        deep: true,
+      })
+    }
     // 统计行定义 ====start======
     const totalMetaCodes = computed(() => {
       return props.config?.totalMetaCodes || []
@@ -618,7 +624,9 @@ export default {
       validate,
     })
     onMounted(() => {
-      formContext?.addField(context)
+      if (OPEN_TABLE_DEFAULT_PAGINATION) {
+        formContext?.addField(context)
+      }
     })
 
     // 是否配置分页功能     ====== end======

package/src/components/packages-web/ElInput copy.jsx

@@ -60,7 +60,6 @@ export default {
     },
     // 金额显示是否显示货币符号
     showSymbol: {
-      type: String,
       default: ''
     },
     // 货币符号

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

@@ -61,7 +61,6 @@ export default {
     },
     // 金额显示是否显示货币符号
     showSymbol: {
-      type: String,
       default: ''
     },
     // 货币符号

package/src/config.js

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

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"
@@ -20,6 +20,7 @@ export function usePageConfig() {
     lang,
     polyfillConfigs,
     instance,
+    dynamicMapComp,
     isH5,
     rootValue,
     parentRootValue,
@@ -35,6 +36,7 @@ export function usePageConfig() {
       route,
       router,
       config, lang, polyfillConfigs, instance, isH5,
+      dynamicMapComp,
       rootValue,
       parentRootValue,
       parentDynamicMapComp,
@@ -54,7 +56,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 +75,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,
@@ -306,6 +307,7 @@ export default {
       lang: props.lang, 
       polyfillConfigs: props.polyfillConfigs,
       instance,
+      dynamicMapComp,
       isH5: props.isH5,
       rootValue: props.modelValue,
       parentRootValue: props.parentRootValue,
@@ -327,6 +329,7 @@ export default {
         lang: props.lang, 
         polyfillConfigs: props.polyfillConfigs,
         instance,
+        dynamicMapComp,
         isH5: props.isH5,
         rootValue: props.modelValue,
         parentRootValue: props.parentRootValue,
@@ -409,15 +412,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/renderer.jsx

@@ -1,5 +1,5 @@
 import { inject, ref, computed, provide, isReactive } from 'vue'
-import { DISPLAY_SHOW, getComponentForConfig, generateLayoutPolyfill, isPlainObject, hasOwn, calcDisable, DISPLAY_HIDDEN } from './utils/index.js'
+import { DISPLAY_SHOW, getComponentForConfig, canHiddenConfig, generateLayoutPolyfill, isPlainObject, hasOwn, calcDisable, DISPLAY_HIDDEN } from './utils/index.js'
 import AnalysisComponent from './analysisComponent.jsx'
 
 export default {
@@ -63,6 +63,9 @@ export default {
         if (config?.displayType == DISPLAY_HIDDEN) {
           return null
         }
+        if (canHiddenConfig(config)) {
+          return null
+        }
         const disabled = calcDisable(config, modelRef.value)
         const component = getComponentForConfig({messageInstance: messageInstance?.value, config, disabled, getNativeComps, isH5: _isH5?.value, loadModuleCache})
         if (component) {

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*$/