resolver-egretimp-plus 0.1.32 → 0.1.34

package/package.json

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

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

@@ -34,7 +34,12 @@ import { computed, inject, reactive, watch, defineModel, defineProps } from 'vue
 import { commonPropsType, cloneDeep, definePrivatelyProp } from '../../utils/index.js'
 import { TabPane } from '../tabs'
 import { h } from 'vue'
+import { useAttrs } from 'vue'
 
+defineOptions({
+  inheritAttrs: false
+})
+const attrs = useAttrs()
 const props = defineProps({
   ...commonPropsType,
   ...ElTabPane.props,
@@ -45,10 +50,17 @@ const modelValue = defineModel()
 const lang = inject('lang')
 
 const tabPaneProps = computed(() => {
-  return Object.keys(ElTabPane.props).reduce((ret, key) => {
+  const ret = Object.keys(ElTabPane.props).reduce((ret, key) => {
     ret[key] = props[key]
     return ret
   }, {})
+  if (attrs?.class) {
+    ret.class = attrs.class
+  }
+  if (attrs?.style) {
+    ret.style = attrs.style
+  }
+  return ret
 })
 
 // 循环部分逻辑

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

@@ -13,7 +13,9 @@ import { MAIL_SEND_URL } from '../../api/builtIn.js'
 const props = defineProps({
   ...commonPropsType,
   ...ElButton.props,
-  toHref: String
+  toHref: String,
+  plain: [String, Number, Boolean],
+  circle: [String, Number, Boolean]
 })
 const calcPorps = computed(() => {
   const ret = {

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

@@ -540,7 +540,7 @@ export default {
           {
             pageable.value ? 
               <div class="pagination-wrap" style={{'justify-content': pageAlignEnmu[pageAlign.value || PAGE_RIGHT]}}>
-                <ElPagination { ...paginationProps.value } {...pagenationEvents} v-model:current-page={page.pageNum} v-model:page-size={page.pageSize} total={normalPageTotal.value}></ElPagination>
+                <ElPagination style="margin-top: 16px;" { ...paginationProps.value } {...pagenationEvents} v-model:current-page={page.pageNum} v-model:page-size={page.pageSize} total={normalPageTotal.value}></ElPagination>
               </div>
               : null
           }

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

@@ -20,8 +20,8 @@ const slots = useSlots()
 const props = defineProps({
   ...commonPropsType,
   ...ElButton.props,
-  plain: [String, Boolean],
-  circle: [String, Boolean]
+  plain: [String, Number, Boolean],
+  circle: [String, Number, Boolean]
 })
 const calcPorps = computed(() => {
   const ret = Object.keys(ElButton.props).reduce((total, key) => {

package/src/components/styles/CustomComponenTable.scss

@@ -114,7 +114,6 @@
   }
   .pagination-wrap {
     display: flex;
-    margin-top: 16px;
   }
   .hidden-column {
     border: none;

package/src/hooks/index.js

@@ -23,10 +23,11 @@ export function useVModel(config, props, emit, modelKey = 'update:modelValue') {
         return
       }
       const val = (metaCodeKey ? props.modelValue?.[metaCodeKey] : props.modelValue) ?? null
-      if (modelKey === 'update:modelValue' && !val) {
-        setTimeout(() => {
-          defaultVal(config)
-        }, 0)
+      if (modelKey === 'update:modelValue' && (val === undefined || val === null)) {
+        defaultVal(config)
+        // setTimeout(() => {
+        //   defaultVal(config)
+        // }, 0)
       }
       config && (config.bindValue = val)
       if (config) {

package/src/utils/loadModule.js

@@ -24,10 +24,10 @@ const options = {
         if (resultToast(ret.data, messageInstance)) {
           return ret.data.result?.content
         } else {
-          return ''
+          return '<template><span></span></template>'
         }
       }).catch(() => {
-        return ''
+        return '<template><span></span></template>'
       }))
     }
     return fileCache.get(fileId)