resolver-egretimp-plus 0.0.248 → 0.0.250

package/package.json

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

package/src/components/childDialog/src/index.vue

@@ -160,6 +160,7 @@ defineExpose({
 <style lang="scss">
 .open-child-frame {
   overflow-y: auto;
+  overflow-x: hidden;
   &.el-dialog {
     margin-top: 30px !important;
     margin-bottom: 30px;

package/src/components/packages-H5/CustomComponentCollapseH5.vue

@@ -58,7 +58,7 @@ watch(lasetLimitIdx, (val) => {
 
 const collapseLabel = computed(() => {
   const isCh = lang?.value?.indexOf('zh') > -1
-  return isCollapse.value ? (isCh ? '更多' : 'More') : (isCh ? '收起' : 'Close')
+  return isCollapse.value ? (isCh ? '更多' : 'More') : (isCh ? '收起' : 'Less')
 })
 function toCollapse() {
   isCollapse.value = !isCollapse.value
@@ -72,9 +72,9 @@ function toCollapse() {
         <Renderer :config="pmPageMetaList" v-model="modelValue"></Renderer>
       </div>
       <div v-if="showCollapseBtn" class="collapse-wrap">
-        <cmi-button type="text" size="small" @click="toCollapse">
+        <span class="collapse-span" @click="toCollapse">
           {{ collapseLabel }}
-        </cmi-button>
+        </span>
       </div>
     </cmi-collapse>
  </div>
@@ -93,6 +93,10 @@ function toCollapse() {
 .collapse-wrap {
   display: flex;
   justify-content: end;
+  & > .collapse-span {
+    color: #3271FE;
+    margin: 8px 16px 16px 16px;
+  }
 }
 </style>
 <style lang="scss">

package/src/rules/parseCondition.js

@@ -219,21 +219,23 @@ export function parseCondition(rule) {
 
       refVal = (refVal === undefined || refVal === null) ? '' : refVal
       targetVal = (targetVal === undefined || targetVal === null) ? '' : targetVal
+
+      let formatRefVal = refVal
+      let formatTargetVal = targetVal
+      if (refVal == Number(refVal) && targetVal == Number(targetVal)) {
+        formatRefVal = Number(refVal)
+        formatTargetVal = Number(targetVal)
+      }
+
       switch (condition.symbol) {
         case 1:
-          let formatRefVal = refVal
-          let formatTargetVal = targetVal
-          if (refVal == Number(refVal) && targetVal == Number(targetVal)) {
-            formatRefVal = Number(refVal)
-            formatTargetVal = Number(targetVal)
-          }
           return formatRefVal > formatTargetVal
         case 2:
-            return refVal >= targetVal
+            return formatRefVal >= formatTargetVal
         case 3:
-            return refVal < targetVal
+            return formatRefVal < formatTargetVal
         case 4:
-            return refVal <= targetVal
+            return formatRefVal <= formatTargetVal
         case 5:
             return refVal == targetVal || (!targetVal && isArray(refVal) && !refVal.length)
         case 6: