resolver-egretimp-plus 0.0.9 → 0.0.10

package/index-H5.js

@@ -0,0 +1,2 @@
+export * from './index.js'
+export { default as default} from './src/resolver-H5.vue'

package/index-web.js

@@ -0,0 +1,2 @@
+export * from './index.js'
+export { default as default} from './src/resolver-web.vue'

package/index.js

@@ -1,5 +1,3 @@
-export { default as default} from './src/index.jsx'
-
 export { default as Renderer} from './src/renderer.jsx'
 import { commonPropsType } from './src/utils/index.js'
 

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "resolver-egretimp-plus",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "交付体验渲染",
-  "main": "./dist/index.js",
-  "module": "./dist/index.js",
+  "main": "./dist/web/index.js",
+  "module": "./dist/web/index.js",
   "exports": {
     ".": "./dist/index.js",
     "./dist/*": "./dist/*"

package/scripts/webpack.config.js

@@ -3,14 +3,18 @@ const { VueLoaderPlugin, default: loader } = require('vue-loader')
 
 module.exports = {
   mode: 'production',
-  entry: path.resolve(__dirname, '../index.js'),
+  entry: {
+    web: path.resolve(__dirname, '../index-web.js'),
+    h5: path.resolve(__dirname, '../index-h5.js'),
+  },
   output: {
+    clean: true,
     library: {
       // name: 'resolver',
       type: 'module'
     },
     path: path.resolve(__dirname, '../dist'),
-    filename: 'index.js'
+    filename: '[name]/index.js'
   },
   module: {
     rules: [

package/src/components/patchComponents-web.js

@@ -0,0 +1,46 @@
+let composeKeys = null
+let composeComponents = null
+
+export default function () {
+  if (!composeComponents || !composeKeys) {
+    let modulesFiles = {}
+    let modulesFilesKeys = []
+    let resolveModule = null
+    try {
+      if (require) {
+        modulesFiles = require.context('./packages-web', false, /\.(vue|jsx|js)$/)
+        modulesFilesKeys = modulesFiles.keys() || []
+        resolveModule = (modulePath) => {
+          return modulesFiles(modulePath)
+        }
+      }
+    } catch (error) {
+      modulesFiles = import.meta.glob('./packages-web/*.{vue,jsx,js}')
+      modulesFilesKeys = Object.keys(modulesFiles)
+      resolveModule = (modulePath) => {
+        return modulesFiles[modulePath]
+      }
+    }
+
+    const keys = modulesFilesKeys.map(modulePath => modulePath.replace(/(.*\/)*([^.]+).*/ig,"$2"))
+    const components = modulesFilesKeys.reduce((retObj, modulePath) => {
+      const moduleName = modulePath.replace(/(.*\/)*([^.]+).*/ig,"$2")
+      const value = resolveModule(modulePath)
+      retObj[moduleName] = value.default || value
+      return retObj
+    }, {})
+
+    composeKeys = [
+      // ...dynamicKeys,
+      ...keys
+    ]
+    composeComponents = {
+      // ...dynamicComponents,
+      ...components
+    }
+  }
+  return {
+    composeKeys,
+    composeComponents
+  }
+}

package/src/index.jsx

@@ -68,6 +68,10 @@ export default {
     isH5: {
       type: Boolean,
       default: false
+    },
+    getNativeComps: {
+      type: Function,
+      default: () => ({composeComponents: {}})
     }
   },
   setup(props, { emit, attrs, expose }) {
@@ -90,6 +94,8 @@ export default {
     watch(toRef(props, 'config'), () => {
       initPageConfig(props.config, props.lang, props.polyfillConfigs, instance, props.isH5)
     })
+    
+    provide('_getNativeComps', props.getNativeComps)
     provide('pageConfig', pageConfigRef)
     const dynamicMapComp = reactive({})
     provide('_axiosInstance', axiosInstance)

package/src/renderer.jsx

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

package/src/resolver-H5.vue

@@ -0,0 +1,13 @@
+<script setup>
+import getNativeComps from './components/patchComponents-H5.js'
+import { useAttrs } from 'vue';
+import Resolver from './index.jsx'
+
+defineOptions({
+  inheritAttrs: false
+})
+const attrs = useAttrs()
+</script>
+<template>
+  <Resolver v-bind="attrs" :getNativeComps="getNativeComps"></Resolver>
+</template>

package/src/resolver-web.vue

@@ -0,0 +1,13 @@
+<script setup>
+import getNativeComps from './components/patchComponents-web'
+import { useAttrs } from 'vue';
+import Resolver from './index.jsx'
+
+defineOptions({
+  inheritAttrs: false
+})
+const attrs = useAttrs()
+</script>
+<template>
+  <Resolver v-bind="attrs" :getNativeComps="getNativeComps"></Resolver>
+</template>

package/src/utils/render.jsx

@@ -1,9 +1,9 @@
 import { getCodeMapRules } from '../rules/rulesDriver.js'
 import { resolveAssetComponents, findComponent, compareComponet, normalPixel, isPlainObject, hasOwn, isFnStr, normalCapitalizeComponent, capitalize, camelize, formatDate} from './common.js'
 import { resolveComponent, inject } from 'vue'
-import getNativeComps from '../components/patchComponents'
-import CustomComponentColH5 from '../components/packages/CustomComponentColH5.vue'
-import { commonPropsType,
+import CustomComponentColH5 from '../components/packages-H5/CustomComponentColH5.vue'
+import {
+  commonPropsType,
   FORM_META_TYPE,
   NOT_NEED_FORM_ITEM_META_TYPE,
   SPECIAL_SET_FULL_WIDTH_ITEM_META_TYPE,
@@ -23,7 +23,7 @@ import { commonPropsType,
 } from './const.js'
 import { preserveCheck } from './preserveFunc.js'
 import { isArray, isFunction, isString } from './is.js'
-import CustomComponentPlain from '../components/packages/CustomComponentPlain.vue'
+import CustomComponentPlain from '../components/packages-web/CustomComponentPlain.vue'
 import QuestionFilled from '../components/icons/question-filled.vue'
 
 // 解析配置中的defStyle属性
@@ -239,7 +239,7 @@ export function isPlainColumn(config, disabled) {
   return false
 }
 
-export function getComponentForConfig(config, disabled) {
+export function getComponentForConfig({config, disabled, getNativeComps}) {
   // 表格中中的列，是否需要转换为普通形式
   if (isPlainColumn(config, disabled)) {
     return CustomComponentPlain