resolver-egretimp-plus 0.1.26 → 0.1.28

package/package.json

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

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

@@ -15,10 +15,6 @@
       <Renderer v-else :modelValue="modelValue?.[$index]" :rowScope="{row: modelValue?.[$index], $index}" @update:modelValues="onUpdateModelValue($event, $index)" :config="pageMetaList.filter(config => config.collapseSlot)"></Renderer>
     </template>
     <ElRow>
-      a: {{ generateModel({
-          data: modelValue?.[$index],
-          index: $index,
-        }) }}
       <Renderer
         :mode="generateModel({
           data: modelValue?.[$index],

package/src/renderer.jsx

@@ -40,6 +40,7 @@ export default {
         emit('update:modelValue', val)
       }
     })
+    const messageInstance = inject('_messageInstance')
     const getNativeComps = inject('_getNativeComps')
     const loadModuleCache = inject('_loadModuleCache')
     const _isH5 = inject('_isH5')
@@ -63,7 +64,7 @@ export default {
           return null
         }
         const disabled = calcDisable(config, modelRef.value)
-        const component = getComponentForConfig({config, disabled, getNativeComps, isH5: _isH5?.value, loadModuleCache})
+        const component = getComponentForConfig({messageInstance: messageInstance?.value, config, disabled, getNativeComps, isH5: _isH5?.value, loadModuleCache})
         if (component) {
           const layoutPolyfill = generateLayoutPolyfill(config, disabled, _isH5?.value) // // 生成布局框（col）的辅助函数
           return layoutPolyfill(

package/src/utils/loadModule.js

@@ -4,6 +4,9 @@ import * as Router from 'vue-router'
 import { buildInRequest } from './request'
 import { FIND_FILEA_NND_CONENT_BY_ID } from '../api/builtIn'
 import { resultToast } from './respone'
+let messageInstance = null
+
+const fileCache = new Map()
 
 const options = {
   moduleCache: {
@@ -11,15 +14,23 @@ const options = {
     'vue-router': Router,
   },
   async getFile(url) {
-    return buildInRequest(FIND_FILEA_NND_CONENT_BY_ID, {fileId: url?.originVal?.() || url}).then(ret => {
-      if (resultToast(ret.data)) {
-        return ret.data.result?.content
-      } else {
+    const fileId = url?.originVal?.() || url
+    if (!fileId) {
+      messageInstance?.error('custom component fileId empty!')
+      return
+    }
+    if (!fileCache.has(fileId)) {
+      fileCache.set(fileId, buildInRequest(FIND_FILEA_NND_CONENT_BY_ID, {fileId}).then(ret => {
+        if (resultToast(ret.data, messageInstance)) {
+          return ret.data.result?.content
+        } else {
+          return ''
+        }
+      }).catch(() => {
         return ''
-      }
-    }).catch(() => {
-      return ''
-    })
+      }))
+    }
+    return fileCache.get(fileId)
   },
 
   addStyle(textContent) {
@@ -52,7 +63,8 @@ const options = {
   }
 }
 
-export default function(url, moduleCache) {
+export default function(url, moduleCache, _messageInstance) {
+  messageInstance = _messageInstance
   options.moduleCache['resolver-egretimp-plus'] = window['resolver-egretimp-plus']
   options.moduleCache['resolver-egretimp-plus/h5'] = window['resolver-egretimp-plus']
   options.moduleCache['resolver-egretimp-plus/web'] = window['resolver-egretimp-plus']

package/src/utils/render.jsx

@@ -409,9 +409,9 @@ export function isPlainColumn(config, disabled) {
   return false
 }
 
-export function getComponentForConfig({config, disabled, getNativeComps, loadModuleCache}) {
+export function getComponentForConfig({messageInstance, config, disabled, getNativeComps, loadModuleCache}) {
   if (config.isCustom) {
-    return () => loadModule(generateVuePath(config.fileId), loadModuleCache)
+    return () => loadModule(generateVuePath(config.fileId), loadModuleCache, messageInstance)
   }
   // 表格中中的列，是否需要转换为普通形式
   if (isPlainColumn(config, disabled)) {