resolver-egretimp-plus 0.0.81 → 0.0.83

package/package.json

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

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

@@ -69,6 +69,14 @@ const dialogStyle = computed(() => {
   return {color: 'red', 'height': dialogHeight}
 })
 
+const dialogProps = computed(() => {
+  const ret = Object.keys(ElDialog.props).reduce((ret, key) => {
+    ret[key] = props.dialogProps[key]
+    return ret
+  }, {})
+  return ret
+})
+
 function loadedConfigCompeted(pageConfig) {
   rootOptionComp.value = pageConfig.rootOptionComp
 }
@@ -89,9 +97,12 @@ defineExpose({
 </script>
 <template>
   <ElConfigProvider :locale="locale">
-    <ElDialog class="open-child-frame" v-model="dialogVisible"
+    <ElDialog class="open-child-frame"
+      :close-on-click-modal="false"
+      :width="dialogWidth"
+      v-bind="dialogProps"
+      v-model="dialogVisible"
       :style="dialogStyle"
-      :close-on-click-modal="false" :width="dialogWidth"
     >
       <div>
       </div>

package/src/components/helper/eventOrchestration.js

@@ -90,7 +90,7 @@ export async function dispatchClickEvent(service, { dynamicMapComp, requestTrace
   const ret = await (axiosInstance && axiosInstance(reqConfig))
   afterRequestService && afterRequestService(ret)
 
-  if (!resultToast(ret?.data, messageInstance, {messageCb, service, compConfig, noSuccessIip: httpMethod.toLocaleLowerCase() === 'get'})) {
+  if (!resultToast(ret?.data, messageInstance, {messageCb, service, compConfig, noSuccessIip: httpMethod.toLocaleLowerCase() === 'get' || service.transactionType == '1'})) {
     await Promise.reject()
     return
   }

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

@@ -11,6 +11,10 @@ const lang = inject('lang')
 const label = computed(() => {
   return lang.value.indexOf('zh') > -1 ? (props.config?.labelZh || props.config?.metaNameZh) : (props.config?.labelEn || props.config?.metaNameEn)
 })
+// 是否为多选
+const isMutiple = computed(() => {
+  return props.options && props.options.length
+})
 
 const checkboxGroupProps = computed(() => {
   return {
@@ -28,18 +32,36 @@ const checkboxProps = computed(() => {
   }
 })
 const attrs = useAttrs()
-const modeValue = defineModel()
+const modelValue = defineModel()
+
+const proxyValue = computed({
+  get() {
+    if (isMutiple.value) {
+      const val = modelValue.value || ''
+      return val ? val.split(',') : []
+    } else {
+      return modelValue.value
+    }
+  },
+  set(val) {
+    if (isMutiple.value) {
+      modelValue.value = val.join(',')
+    } else {
+      modelValue.value = val
+    }
+  }
+})
 
 const onChange = ({ detail }) => {
-  modeValue.value = detail.value
+  proxyValue.value = detail.value
 }
 const onSigleChange = ({ detail }) => {
-  modeValue.value = detail.value ? '1' : '0'
+  proxyValue.value = detail.value ? '1' : '0'
 }
 </script>
 
 <template>
-  <cmi-checkbox-group :value="modeValue" @change="onChange" v-if="props.options && props.options.length" v-bind="{...attrs, ...checkboxGroupProps}">
+  <cmi-checkbox-group :value="proxyValue" @change="onChange" v-if="isMutiple" v-bind="{...attrs, ...checkboxGroupProps}">
     <cmi-checkbox 
       class="mr-20"
       v-for="option in props.options" :key="option.columnValue"
@@ -49,7 +71,7 @@ const onSigleChange = ({ detail }) => {
       {{lang.indexOf('zh') > -1 ? option.columnDesc_zh : option.columnDesc}}
     </cmi-checkbox>
   </cmi-checkbox-group>
-  <cmi-checkbox v-else v-bind="{...attrs, ...checkboxProps}" :checked="modeValue === '1'" :value="modeValue" @change="onSigleChange">
+  <cmi-checkbox v-else v-bind="{...attrs, ...checkboxProps}" :checked="proxyValue === '1'" :value="proxyValue" @change="onSigleChange">
     {{ label }}
   </cmi-checkbox>
 </template>

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

@@ -189,7 +189,7 @@ function normalTableRowValue(row) {
     >
     </cmi-table-column>
   </cmi-table>
-  <div v-if="pageable && normalPageTotal > page.pageSize" :style="{'justify-content': pageAlignEnmu[pageAlign || PAGE_RIGHT]}" style="margin-bottom: 12px;">
+  <div v-if="pageable && normalPageTotal > 3" :style="{'justify-content': pageAlignEnmu[pageAlign || PAGE_RIGHT]}" style="margin-bottom: 12px;">
     <cmi-pagination
       :key="normalPageTotal"
       v-bind="{...paginationProps, ...pagenationEvents}"