resolver-egretimp-plus 0.0.74 → 0.0.75

package/package.json

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

package/src/analysisComponent.jsx

@@ -212,15 +212,15 @@ export default {
       }) // 生成formItem（）的辅助函数
       return formItemPolyfill(
         <currentComponent.value
-        ref={refFn}
-        onVnodeMounted={onVnodeMounted}
-        onVnodeUnmounted={onVnodeUnmounted}
-        {...currentAttrs.value}
-        onClick={(e) => {onClick(e);compPropsOnClick?.(e)}}
-        {...componentProps.value}
-        {...compProps}
-        {...vModelObjs}
-      ></currentComponent.value>
+          ref={refFn}
+          onVnodeMounted={onVnodeMounted}
+          onVnodeUnmounted={onVnodeUnmounted}
+          {...currentAttrs.value}
+          onClick={(e) => {onClick(e);compPropsOnClick?.(e)}}
+          {...componentProps.value}
+          {...compProps}
+          {...vModelObjs}
+        ></currentComponent.value>
       )
     }
   }

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

@@ -1,5 +1,5 @@
 <template>
-  <component :is="component" class="standard-wrap" v-bind="{...componentProps, ...attrs}">
+  <component :is="component" class="standard-wrap" v-bind="{...attrs, ...componentProps}">
     <ElCollapse v-bind="{...collapseProps}" :class="collapseClass"  v-model="activeNames">
       <ElCollapseItem v-bind="collapseItemProps" >
         <template #title>

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

@@ -1,5 +1,5 @@
 <template>
-  <ElDialog class="custom-component-dialog" v-bind="{...dialogProps, ...attrs}" :title="title" v-model="dialogValue">
+  <ElDialog class="custom-component-dialog" v-bind="{...attrs, ...dialogProps}" :title="title" v-model="dialogValue">
     <div class="header" v-if="!!title">
       <span>{{ title }}</span>
     </div>
@@ -26,6 +26,9 @@ import { computed, inject, useAttrs } from 'vue'
 import { commonPropsType, hasOwn } from '../../utils/index.js'
 import Renderer from '../../renderer.jsx'
 
+defineOptions({
+  inheritAttrs: false,
+})
 const lang = inject('lang')
 const modelValue = defineModel()
 const props = defineProps({

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

@@ -26,7 +26,7 @@
 import { ElInput, ElIcon, ElDialog } from 'element-plus'
 import { defineProps, defineOptions, defineModel, ref, watch, computed, inject, useAttrs } from 'vue'
 import { Search, Close } from '@element-plus/icons-vue'
-import { commonPropsType, capitalize } from '../../utils/index.js'
+import { commonPropsType, capitalize, camelize } from '../../utils/index.js'
 
 import { hasOwn } from '../../utils';
 
@@ -63,7 +63,7 @@ const getCompEvents = (comp) => {
     emitKeys = Object.keys(emitKeys)
   }
   return emitKeys.reduce((ret, key) => {
-    const eventKey = capitalize(camelize(eventKey))
+    const eventKey = capitalize(camelize(key))
     if (hasOwn(attrs, eventKey)) {
       ret[eventKey] = attrs[eventKey]
     }

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

@@ -94,7 +94,7 @@ export default {
     const sortObj = ref(null)
     // "ascending", "descending", null
     const onSortChange = ({ prop, order }) => {
-      tableEvents.value?.onSortChange?.(data)
+      tableEvents.value?.onSortChange?.({ prop, order })
 
       sortObj.value = null
       if (order) {

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

@@ -8,10 +8,9 @@ import { ElText } from 'element-plus'
 import { computed, defineProps, inject, getCurrentInstance, useAttrs } from 'vue'
 import { commonPropsType } from '../../utils/index.js'
 const appContext = getCurrentInstance()?.appContext
-
 const props = defineProps({
   ...commonPropsType,
-  ...ElText.props
+  ...ElText.props,
 })
 const attrs = useAttrs()
 

package/src/utils/render.jsx

@@ -299,7 +299,7 @@ function normalMetaType(metaType) {
 
 export function isPlainColumn(config, disabled) {
   // 表格中中的列，可以根据配置进行转换为普通形式，表格原生支持的tooltip
-  if (findComponent(PLAIN_TYPE_ALONG_COLUMNS, config.renderby || config.metaType) !== -1) {
+  if (config.isColumn && findComponent(PLAIN_TYPE_ALONG_COLUMNS, config.renderby || config.metaType) !== -1) {
     return true
   }
   if (config.isColumn && disabled) {