resolver-egretimp-plus 0.0.45 → 0.0.47

package/src/theme/element/index.scss

@@ -14,66 +14,3 @@
   }
 }
 
-.CustomComponentCollapse:first-child {
-  margin-bottom: 12px;
-}
-.CustomComponentCollapse + .CustomComponentCollapse {
-  margin-bottom: 12px;
-}
-
-.CustomComponentCollapse.is-card:first-child {
-  margin-bottom: 16px;
-}
-.CustomComponentCollapse.is-card + .CustomComponentCollapse.is-card {
-  margin-bottom: 16px;
-}
-
-// 加权
-.CustomComponentCollapse.CustomComponentCollapse.CustomComponentCollapse:last-child {
-  margin-bottom: 0;
-}
-.el-collapse-item__arrow {
-  margin-right: 0;
-}
-
-// 组件弹框样式定义调整
-.custom-component-dialog {
-  padding-top: 0px;
-  padding-bottom: 0;
-  
-  .el-dialog__header {
-    display: none;
-  }
-  .el-dialog__body {
-    height: 100%;
-    .header {
-      line-height: 46px;
-      font-size: 14px;
-      font-weight: 500;
-      color: #1F2329;
-    }
-    .content {
-      height: 100%;
-      box-sizing: border-box;
-      // .el-scrollbar__wrap {
-      //   overflow-x: hidden;
-      // }
-      // .is-horizontal {
-      //   display: none;
-      // }
-    }
-    .footer {
-      height: 68px;
-      text-align: right;
-      overflow: hidden;
-      .dialog-footer {
-        margin-top: 16px;
-      }
-    }
-  }
-  &.el-dialog footer {
-    position: initial;
-    transform: none;
-    padding: 0;
-  }
-}

package/src/utils/const.js

@@ -164,7 +164,11 @@ export const commonPropsType = {
 }
 
 export function calcDisable(config, mode) {
-  const flag = isPatchComponent(['CustomComponentTabs', 'CustomComponentTabPane'], config) ?
+  const specicesType = [
+    'CustomComponentTabs',
+    // 'CustomComponentTabPane' // 有需要需根据配置来进行配置是否禁用
+  ]
+  const flag = isPatchComponent(specicesType, config) ?
     false :
     mode === MODE.LOG ?
       (

package/src/utils/render.jsx

@@ -167,9 +167,6 @@ export function normalConfig({
   }
   
   let extendAttrObj = parseExtendAttr(config)
-  if (metaType == 'cmi-card') {
-    debugger
-  }
   let extendObj = {
     removeCol: findComponent(NOT_NEED_COL_ITEM_META_TYPE, extendAttrObj.renderby) !== -1 || findComponent(NOT_NEED_COL_ITEM_META_TYPE, metaType) !== -1,
     needformItem: (findComponent(NOT_NEED_FORM_ITEM_META_TYPE, extendAttrObj.renderby) !== -1 || findComponent(NOT_NEED_FORM_ITEM_META_TYPE, metaType) !== -1) ? false : needformItem, // 表示这个配置项对应的渲染组件是否需要formItem进行包装 移动端是cmi-form-item
@@ -198,9 +195,9 @@ export function normalConfig({
   }
   const pageConfig = {
     ...extendObj,
-    ...extendAttrObj,
     ...config,
-    ...extendNativeObj
+    ...extendAttrObj,
+    ...extendNativeObj,
   }
   if (config.metaType == 'textarea') {
     pageConfig.type = 'textarea'

package/src/utils/respone.js

@@ -40,21 +40,27 @@ export function resultToast(result = {}, messageInstance, {messageCb, service, c
       cbKey = 'error'
       break;
   }
-  
+  // transactionType
   if (messageCb) {
     if (isPromise(messageCb)) {
       messageCb({resultMessage, result, resultCode, service, compConfig}).then(res => {
         if (res === true) {
-          messageInstance?.[cbKey]?.(resultMessage)
+          if (service?.transactionType === '2') {
+            messageInstance?.[cbKey]?.(resultMessage)
+          }
         }
       })
     } else {
       if (messageCb({resultMessage, result, resultCode, service, compConfig}) === true) {
-        messageInstance?.[cbKey]?.(resultMessage)
+        if (service?.transactionType === '2') {
+          messageInstance?.[cbKey]?.(resultMessage)
+        }
       }
     }
   } else {
-    messageInstance?.[cbKey]?.(resultMessage)
+    if (service?.transactionType === '2') {
+      messageInstance?.[cbKey]?.(resultMessage)
+    }
   }
   return ret
 }