resolver-egretimp-plus 0.0.52 → 0.0.54

package/package.json

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

package/src/components/helper/resolver.js

@@ -1,3 +1,5 @@
+import { resultToast } from "../../utils/respone"
+
 export async function executeLoadServices(services = [], { axiosInstance, messageInstance, reqData, respCb }) {
   const loadServices = services.filter(ser => ser.eventType == '1')
   const mixinServiceConfig = services.find(service => service.serviceType === '1')
@@ -18,23 +20,12 @@ export async function executeLoadServices(services = [], { axiosInstance, messag
         ...(reqData || {})
       }
     }))
-    // const ret = await (new Promise((res) => {
-    //   setTimeout(() => {
-    //     res({
-    //       data: {
-    //         success: true,
-    //         result: {
-    //           studentId: 121212
-    //         }
-    //       }
-    //     })
-    //   }, 3000);
-    // }))
-    if (!ret?.data?.success) {
-      messageInstance?.value?.error(ret?.data?.resultMessage || '')
-      await Promise.reject()
+    if (resultToast(ret.data, messageInstance, { noSuccessIip: true })) {
+      respCb && respCb(ret?.data?.result?.['PC-root-panel'])
+      return
     }
-    respCb && respCb(ret?.data?.result)
+    messageInstance?.value?.error(ret?.data?.resultMessage || '')
+    await Promise.reject()
   }
 }
 

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

@@ -4,7 +4,10 @@
       <ElCollapseItem v-bind="collapseItemProps" >
         <template #title>
           <div class="collapge-slot-title">
-            <span>{{ lang.indexOf('zh') > -1 ? props.config.metaNameZh : props.config.metaNameEn }}</span>
+            <ElRow>
+              <span>{{ lang.indexOf('zh') > -1 ? props.config.metaNameZh : props.config.metaNameEn }}</span>
+              <Renderer @click="stopPropagation" :config="rightSlotPmPageMetaList" v-model="props.refValue.value"></Renderer>
+            </ElRow>
             <ElRow>
               <Renderer @click="stopPropagation" :config="slotPmPageMetaList" v-model="props.refValue.value"></Renderer>
             </ElRow>
@@ -64,13 +67,17 @@ const collapseItemProps = computed(() => {
 })
 
 const pmPageMetaList = computed(() => {
-  return props.config?.pmPageMetaList?.filter(item => !item.collapseSlot) || []
+  return props.config?.pmPageMetaList?.filter(item => !item.collapseSlot && !item.collapseRightSlot) || []
 })
 
 const slotPmPageMetaList = computed(() => {
   return props.config?.pmPageMetaList?.filter(item => item.collapseSlot) || []
 })
 
+const rightSlotPmPageMetaList = computed(() => {
+  return props.config?.pmPageMetaList?.filter(item => item.collapseRightSlot) || []
+})
+
 const stopPropagation = (e) => {
   e.stopPropagation()
 }
@@ -99,16 +106,18 @@ const activeNames = computed({
   justify-content: space-between;
   align-items: center;
   width: 100%;
-  > span {
-    &::before {
-      content: "";
-      display: inline-block;
-      width: 3px;
-      height: 12px;
-      margin-right: 8px;
-      border-radius: 3px;
-      vertical-align: middle;
-      background-color: #3271fe;
+  > .el-row {
+    > span {
+      &::before {
+        content: "";
+        display: inline-block;
+        width: 3px;
+        height: 12px;
+        margin-right: 8px;
+        border-radius: 3px;
+        vertical-align: baseline;
+        background-color: #3271fe;
+      }
     }
   }
 }

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

@@ -23,7 +23,12 @@ const inputNumberProps = computed(() => {
     ret[key] = props[key]
     return ret
   }, {})
-  
+  if (props.config?.maxValue && !isNaN(props.config.maxValue)) {
+    ret.max = props.config.maxValue
+  }
+  if (props.config?.minValue && !isNaN(props.config.minValue)) {
+    ret.min = props.config.minValue
+  }
   return ret
 })
 const attrs = useAttrs()

package/src/utils/respone.js

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