resolver-egretimp-plus 0.0.118 → 0.0.120

package/package.json

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

package/src/analysisComponent.jsx

@@ -238,6 +238,7 @@ export default {
       }) // 生成formItem（）的辅助函数
       return formItemPolyfill(
         <currentComponent.value
+          key={props.config}
           ref={refFn}
           onVnodeMounted={onVnodeMounted}
           onVnodeUnmounted={onVnodeUnmounted}

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

@@ -53,7 +53,7 @@ const initSelEmployee = async () => {
   let feiShuTokens = ''
   const { getToken, loadStyle, loadScript, initSelUser } = useSelEmployeeJs()
   let ret = await Promise.all([getToken(), loadStyle(), loadScript()])
-    if (ret && ret.length) {
+  if (ret && ret.length) {
     feiShuTokens = ret[0]
     if (!feiShuTokens) return
   }

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

@@ -20,8 +20,13 @@ const props = defineProps({
   plain: [String, Boolean]
 })
 const calcPorps = computed(() => {
-  const ret = {
-    ...props
+  const ret = Object.keys(ElButton.props).reduce((total, key) => {
+    total[key] = props[key]
+    return total
+  }, {})
+
+  if (props.config?.icon) {
+    ret.suffixIcon = props.config?.icon
   }
   if (ret.plain == '1') {
     ret.plain = true

package/src/rules/eventsSupplement.js

@@ -188,7 +188,8 @@ const allInitEvents = {
       configs.forEach(labelInfo => {
         // const oldDisplayType = labelInfo && labelInfo.displayType
         // oldDisplayTypes.push(oldDisplayType)
-        labelInfo && (labelInfo.displayType = '0')
+        // 兼容开始使用displayType用于显示隐藏的配置
+        labelInfo && /^\d+$/.test(labelInfo.displayType) && (labelInfo.displayType = '0')
         labelInfo && (labelInfo.hidden = '1')
         labelInfo && labelInfo.refConfig && (labelInfo.refConfig.displayType = '0')
         labelInfo && labelInfo.refConfig && (labelInfo.refConfig.hidden = '1')
@@ -199,7 +200,7 @@ const allInitEvents = {
     return () => {
       configs.forEach((labelInfo, idx) => {
         // const oldDisplayType = oldDisplayTypes[idx]
-        labelInfo && (labelInfo.displayType = '1')
+        labelInfo && /^\d+$/.test(labelInfo.displayType) && (labelInfo.displayType = '1')
         labelInfo && (labelInfo.hidden = '0')
         labelInfo && labelInfo.refConfig && (labelInfo.refConfig.displayType = '1')
         labelInfo && labelInfo.refConfig && (labelInfo.refConfig.hidden = '0')
@@ -222,7 +223,7 @@ const allInitEvents = {
     configs.forEach((labelInfo) => {
       // const oldDisplayType = labelInfo && labelInfo.displayType
       // oldDisplayTypes.push(oldDisplayType)
-      labelInfo && (labelInfo.displayType = '1')
+      labelInfo && /^\d+$/.test(labelInfo.displayType) && (labelInfo.displayType = '1')
       labelInfo && (labelInfo.hidden = '0')
       labelInfo && labelInfo.refConfig && (labelInfo.refConfig.displayType = '1')
       labelInfo && labelInfo.refConfig && (labelInfo.refConfig.hidden = '0')
@@ -237,7 +238,7 @@ const allInitEvents = {
         // }
         configs.forEach((labelInfo, idx) => {
           // const oldDisplayType = oldDisplayTypes[idx]
-          labelInfo && (labelInfo.displayType = '0')
+          labelInfo && /^\d+$/.test(labelInfo.displayType) && (labelInfo.displayType = '0')
           labelInfo && (labelInfo.hidden = '1')
           labelInfo && labelInfo.refConfig && (labelInfo.refConfig.displayType = '0')
           labelInfo && labelInfo.refConfig && (labelInfo.refConfig.hidden = '1')

package/src/utils/render.jsx

@@ -408,7 +408,7 @@ export function getRenderComponentProps({ props, component, modelValue, selects,
     ...getRenderCompMargins(config),
     width: commonProps.width || getBuildCompDefaultWidth(config)
   }
-  if (!isHidden({ config })) {
+  if (isHidden({ config })) {
     defprops.style.display = 'none'
   }
   
@@ -524,7 +524,7 @@ function elColSpecialProsp (config) {
   const style = {
     textAlign: config.colTextAlign
   }
-  if (!isHidden({ config })) {
+  if (isHidden({ config })) {
     style.display = 'none'
   } else {
     if (hasOwn(config, 'elWidth')) {
@@ -666,7 +666,7 @@ function getFormItemExtendProps(config, lang, params) {
   const style = {
     ...getFormItemMargins(config)
   }
-  if (!isHidden({ config })) {
+  if (isHidden({ config })) {
     style.display = 'none'
   }
   return {
@@ -691,7 +691,7 @@ function getFormItemRule(config, lang, params) {
         callback()
         return
       }
-      if (!isHidden({ config })) {
+      if (isHidden({ config })) {
         callback()
         return
       }
@@ -741,7 +741,7 @@ function getFormItemRule(config, lang, params) {
           callback()
           return
         }
-        if (!isHidden({ config })) {
+        if (isHidden({ config })) {
           callback()
           return
         }
@@ -778,7 +778,7 @@ function getFormItemRule(config, lang, params) {
               callback()
               return
             }
-            if (!isHidden({ config })) {
+            if (isHidden({ config })) {
               callback()
               return
             }