resolver-egretimp-plus 0.0.151 → 0.0.152

package/index-H5.js

@@ -1,2 +1,17 @@
 export * from './index.js'
 export { default as default} from './src/resolver-H5.vue'
+import * as all from './index.js'
+import * as resolverAll from './src/resolver-H5.vue'
+
+if (window) {
+  const obj = {
+    ...all,
+    ...resolverAll
+  }
+  Object.keys(obj).forEach(key => {
+    !window['resolver-egretimp-plus'] && (window['resolver-egretimp-plus'] = {})
+    if (!Object.prototype.hasOwnProperty.call(window['resolver-egretimp-plus'], key)) {
+      window['resolver-egretimp-plus'][key] = obj[key]
+    }
+  })
+}

package/index-web.js

@@ -4,8 +4,14 @@ import * as all from './index.js'
 import * as resolverAll from './src/resolver-web.vue'
 
 if (window) {
-  window['resolver-egretimp-plus'] = {
+  const obj = {
     ...all,
     ...resolverAll
   }
+  Object.keys(obj).forEach(key => {
+    !window['resolver-egretimp-plus'] && (window['resolver-egretimp-plus'] = {})
+    if (!Object.prototype.hasOwnProperty.call(window['resolver-egretimp-plus'], key)) {
+      window['resolver-egretimp-plus'][key] = obj[key]
+    }
+  })
 }

package/package.json

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

package/src/analysisComponent.jsx

@@ -8,6 +8,7 @@ import { useRoute } from 'vue-router'
 import { executeEventOrchestration } from './components/helper/eventOrchestration.js'
 import { useRouter } from 'vue-router'
 import { onErrorCaptured } from 'vue'
+import LoadingComponent from './components/loadingComponent/LoadingComponent.vue'
 
 export default {
   name: 'AnalysisComponent',
@@ -164,7 +165,7 @@ export default {
         if (res?.default?.emits) {
           initVmodels(res?.default?.emits)
         }
-        fnComponentkeys.value = getComponentPropsKeys(res?.default)
+        fnComponentkeys.value = getComponentPropsKeys(res?.default || res)
         // const obj = {}
         // const propsKeys = getComponentPropsKeys(res?.default)
         // propsKeys.forEach(key => {
@@ -182,7 +183,10 @@ export default {
     // 获取组件中定义的props，赋值对应的属性===end===
     const currentComponent = computed(() => {
       if (typeof props.component === 'function') {
-        return defineAsyncComponent(props.component)
+        return defineAsyncComponent({
+          loader: props.component,
+          loadingComponent: LoadingComponent,
+        })
       } else {
         return props.component
       }

package/src/api/builtIn.js

@@ -2,4 +2,5 @@ export const QUERY_PAGE_CONFIG_DATA = '/sa-lcp/api/v1/pageConfig/queryPageConfig
 export const LCP_LOGIN = '/sa-lcp/login'
 export const GET_SYS_PARAM_CACHE = '/sa-lcp/api/v1/sysparam/getSysParamCache'
 export const REFRESH_TOKEN = '/sa-lcp/changePwd/refreshToken'
-export const DATA_VALID_RULE_EXECUTE = '/sa-lcp/api/v1/validate/dataValidRuleExecute'
+export const DATA_VALID_RULE_EXECUTE = '/sa-lcp/api/v1/validate/dataValidRuleExecute'
+export const FIND_FILEA_NND_CONENT_BY_ID  = '/sa-lcp/api/v1/fileopertate/findFileAndContentById'

package/src/components/icons/loading.vue

@@ -0,0 +1,13 @@
+<template>
+  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024">
+    <path
+      fill="currentColor"
+      d="M512 64a32 32 0 0 1 32 32v192a32 32 0 0 1-64 0V96a32 32 0 0 1 32-32m0 640a32 32 0 0 1 32 32v192a32 32 0 1 1-64 0V736a32 32 0 0 1 32-32m448-192a32 32 0 0 1-32 32H736a32 32 0 1 1 0-64h192a32 32 0 0 1 32 32m-640 0a32 32 0 0 1-32 32H96a32 32 0 0 1 0-64h192a32 32 0 0 1 32 32M195.2 195.2a32 32 0 0 1 45.248 0L376.32 331.008a32 32 0 0 1-45.248 45.248L195.2 240.448a32 32 0 0 1 0-45.248m452.544 452.544a32 32 0 0 1 45.248 0L828.8 783.552a32 32 0 0 1-45.248 45.248L647.744 692.992a32 32 0 0 1 0-45.248M828.8 195.264a32 32 0 0 1 0 45.184L692.992 376.32a32 32 0 0 1-45.248-45.248l135.808-135.808a32 32 0 0 1 45.248 0m-452.544 452.48a32 32 0 0 1 0 45.248L240.448 828.8a32 32 0 0 1-45.248-45.248l135.808-135.808a32 32 0 0 1 45.248 0"
+    />
+  </svg>
+</template>
+<script setup>
+defineOptions({
+  name: 'Loading',
+})
+</script>

package/src/components/loadingComponent/LoadingComponent.vue

@@ -0,0 +1,33 @@
+<script setup>
+import Loading from '../icons/loading.vue'
+</script>
+<template>
+  <i class="loading-icon">
+    <Loading></Loading>
+  </i>
+</template>
+<style lang="scss" scoped>
+.loading-icon {
+  --color: inherit;
+  height: 1em;
+  width: 1em;
+  line-height: 1em;
+  display: inline-flex;
+  justify-content: center;
+  align-items: center;
+  position: relative;
+  fill: currentColor;
+  color: var(--color);
+  // font-size: inherit;
+
+  font-size: 18px;
+  color: #606266;
+  margin: 0 auto;
+  animation: loading-rotate 2s linear infinite;
+}
+@keyframes loading-rotate {
+  100% {
+    transform: rotate(360deg);
+  }
+}
+</style>

package/src/enums/index.js

@@ -1,7 +1,9 @@
-import { DATA_VALID_RULE_EXECUTE, GET_SYS_PARAM_CACHE, LCP_LOGIN, QUERY_PAGE_CONFIG_DATA } from "../api/builtIn"
+import { DATA_VALID_RULE_EXECUTE, FIND_FILEA_NND_CONENT_BY_ID, GET_SYS_PARAM_CACHE, LCP_LOGIN, QUERY_PAGE_CONFIG_DATA } from "../api/builtIn"
 
-export const USER_NAME = 'lcpsupport'
-export const PASSWORD = '8ik,*IK<'
+export const USER_NAME = 'caowb3'
+export const PASSWORD = '123456'
+// export const USER_NAME = 'lcpsupport'
+// export const PASSWORD = '8ik,*IK<'
 export const USER_TYPE = '1'
 export const AUTH_CODE = '9887'
 
@@ -9,5 +11,6 @@ export const NOT_AUTH_APIS = [
   LCP_LOGIN,
   GET_SYS_PARAM_CACHE,
   QUERY_PAGE_CONFIG_DATA,
-  DATA_VALID_RULE_EXECUTE
+  DATA_VALID_RULE_EXECUTE,
+  FIND_FILEA_NND_CONENT_BY_ID
 ]

package/src/index.jsx

@@ -126,7 +126,12 @@ export default {
     messageCb: Function,
     requestTraceId: {
       type: String,
-    }
+    },
+    // 加载上传自定义组件需要的模块集合
+    loadModuleCache: {
+      type: Object,
+      default: () => ({})
+    },
   },
   emits: ['update:modelValue', 'rootStoreChange'],
   setup(props, { emit, attrs, expose }) {
@@ -215,6 +220,7 @@ export default {
       })
       toExecuteLoadServices()
     })
+    provide('_loadModuleCache', props.loadModuleCache)
     provide('_ruleExecuter', ruleExecuter)
     provide('_toExecuteLoadServices', toExecuteLoadServices)
     provide('_dialogReq', props.dialogReq)

package/src/renderer.jsx

@@ -41,6 +41,7 @@ export default {
       }
     })
     const getNativeComps = inject('_getNativeComps')
+    const loadModuleCache = inject('_loadModuleCache')
     const _isH5 = inject('_isH5')
     const injectMode = inject('injectMode', '')
     const mode = props.mode || injectMode
@@ -56,7 +57,7 @@ export default {
           return null
         }
         const disabled = calcDisable(config, mode)
-        const component = getComponentForConfig({config, disabled, getNativeComps, isH5: _isH5?.value})
+        const component = getComponentForConfig({config, disabled, getNativeComps, isH5: _isH5?.value, loadModuleCache})
         if (component) {
           const layoutPolyfill = generateLayoutPolyfill(config, disabled, _isH5?.value) // // 生成布局框（col）的辅助函数
           return layoutPolyfill(

package/src/resolver-common.vue

@@ -28,7 +28,7 @@ const props = defineProps({
   loadConfigReq: {
     type: Object,
     default: () => ({})
-  },
+  }
 })
 defineOptions({
   inheritAttrs: false

package/src/rules/eventsSupplement.js

@@ -399,16 +399,16 @@ const allInitEvents = {
       })
       return () => {
         // 需要晚点触发，才能正常执行清空等一些列需要组件操作
-        return setTimeout(() => {
-          configs.forEach((labelInfo, idx) => {
-            const oldProps = oldPorpsList[idx]
-            if (!labelInfo) return
-            const porpsKeys = Object.keys(oldProps)
-            porpsKeys.forEach(key => {
-              labelInfo[key] = oldProps[key]
-            })
+        // return setTimeout(() => {
+        configs.forEach((labelInfo, idx) => {
+          const oldProps = oldPorpsList[idx]
+          if (!labelInfo) return
+          const porpsKeys = Object.keys(oldProps)
+          porpsKeys.forEach(key => {
+            labelInfo[key] = oldProps[key]
           })
-        }, 0)
+        })
+        // }, 0)
       }
     }
   },
@@ -487,15 +487,15 @@ const allInitEvents = {
     // 有的事件在不满足条件的情况下，需要进行恢复
     return () => {
       // 需要晚点触发，才能正常执行清空等一些列需要组件操作
-      return setTimeout(() => {
-        configs.forEach((labelInfo, idx) => {
-          const oldProps = oldPorpsList[idx]
-          if (!labelInfo) return
-          porpsKeys.forEach(key => {
-            labelInfo[key] = oldProps[key]
-          })
+      // return setTimeout(() => {
+      configs.forEach((labelInfo, idx) => {
+        const oldProps = oldPorpsList[idx]
+        if (!labelInfo) return
+        porpsKeys.forEach(key => {
+          labelInfo[key] = oldProps[key]
         })
-      }, 0)
+      })
+      // }, 0)
     }
   },
 }

package/src/rulesImp/events.js

@@ -465,16 +465,16 @@ const allInitEvents = {
       })
       return () => {
         // 需要晚点触发，才能正常执行清空等一些列需要组件操作
-        return setTimeout(() => {
-          configs.forEach((labelInfo, idx) => {
-            const oldProps = oldPorpsList[idx]
-            if (!labelInfo) return
-            const porpsKeys = Object.keys(oldProps)
-            porpsKeys.forEach(key => {
-              labelInfo[key] = oldProps[key]
-            })
+        // return setTimeout(() => {
+        configs.forEach((labelInfo, idx) => {
+          const oldProps = oldPorpsList[idx]
+          if (!labelInfo) return
+          const porpsKeys = Object.keys(oldProps)
+          porpsKeys.forEach(key => {
+            labelInfo[key] = oldProps[key]
           })
-        }, 0)
+        })
+        // }, 0)
       }
     }
   },
@@ -552,15 +552,15 @@ const allInitEvents = {
     // 有的事件在不满足条件的情况下，需要进行恢复
     return () => {
       // 需要晚点触发，才能正常执行清空等一些列需要组件操作
-      return setTimeout(() => {
-        configs.forEach((labelInfo, idx) => {
-          const oldProps = oldPorpsList[idx]
-          if (!labelInfo) return
-          porpsKeys.forEach(key => {
-            labelInfo[key] = oldProps[key]
-          })
+      // return setTimeout(() => {
+      configs.forEach((labelInfo, idx) => {
+        const oldProps = oldPorpsList[idx]
+        if (!labelInfo) return
+        porpsKeys.forEach(key => {
+          labelInfo[key] = oldProps[key]
         })
-      }, 0)
+      })
+      // }, 0)
     }
   },
 }

package/src/utils/const.js

@@ -229,4 +229,9 @@ export const META_TYPE_MAP = {
 
 export {
   commonPropsType as componentPropsType
+}
+
+if (window) {
+  !window['resolver-egretimp-plus'] && (window['resolver-egretimp-plus'] = {})
+  window['resolver-egretimp-plus']['componentPropsType'] = commonPropsType
 }

package/src/utils/loadModule.js

@@ -1,16 +1,25 @@
 import * as Vue from 'vue'
 import { loadModule } from 'vue3-sfc-loader'
+import * as Router from 'vue-router'
+import { buildInRequest } from './request'
+import { FIND_FILEA_NND_CONENT_BY_ID } from '../api/builtIn'
+import { resultToast } from './respone'
 
 const options = {
   moduleCache: {
     vue: Vue,
+    'vue-router': Router,
   },
-
   async getFile(url) {
-    const res = await fetch(url);
-    if ( !res.ok )
-      throw Object.assign(new Error(url+' '+res.statusText), { res });
-    return await res.text();
+    return buildInRequest(FIND_FILEA_NND_CONENT_BY_ID, {fileId: url?.originVal?.() || url}).then(ret => {
+      if (resultToast(ret.data)) {
+        return ret.data.result?.content
+      } else {
+        return ''
+      }
+    }).catch(() => {
+      return ''
+    })
   },
 
   addStyle(textContent) {
@@ -43,6 +52,12 @@ const options = {
   }
 }
 
-export default function(url) {
+export default function(url, moduleCache) {
+  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']
+  Object.keys(moduleCache || {}).forEach(key => {
+    options.moduleCache[key] = moduleCache[key]
+  })
   return loadModule(url, options)
 }

package/src/utils/render.jsx

@@ -338,9 +338,9 @@ export function isPlainColumn(config, disabled) {
   return false
 }
 
-export function getComponentForConfig({config, disabled, getNativeComps}) {
-  if (config.isCustomComp) {
-    return () => loadModule(config.url)
+export function getComponentForConfig({config, disabled, getNativeComps, loadModuleCache}) {
+  if (config.isCustom) {
+    return () => loadModule(generateVuePath(config.fileId), loadModuleCache)
   }
   // 表格中中的列，是否需要转换为普通形式
   if (isPlainColumn(config, disabled)) {
@@ -874,4 +874,23 @@ function isTransCellMobile(config, disabled) {
 
 function isHidden({config}) {
   return (typeof config.hidden === 'boolean' && config.hidden) || config.hidden === '1'
-}
+}
+
+function generateVuePath(path) {
+  class LoadModulePath extends String {
+    constructor(...arg) {
+      super(...arg)
+    }
+    toString(...arg) {
+      const ret = super.toString(...arg)
+      if (!/\.\w*$/.test(ret)) {
+        return `${ret}.vue`
+      }
+      return ret
+    }
+    originVal() {
+      return path
+    }
+  }
+  return new LoadModulePath(path)
+}