resolver-egretimp-plus 0.1.92 → 0.1.94

package/package.json

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

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

@@ -303,26 +303,28 @@ function normalTableRowValue(row) {
 }
 </script>
 <template>
-  <cmi-table ref="tableRef" :key="tableKey" v-bind="tableProps" @rowclick="tableEvents.onRowclick" @togglelandscape="tableEvents.onTogglelandscape">
-    <cmi-table-column
-      v-for="column in pmPageMetaList" :key="column.metaCode"
-      v-bind="{
-        ...attrs,
-        ...getTableColumnProps(column)
-      }"
-    >
-    </cmi-table-column>
-  </cmi-table>
-  <div v-if="pageable && normalPageTotal > 3" :style="{'display': 'flex', 'justify-content': pageAlignEnmu[pageAlign || PAGE_CENTER]}" style="margin-bottom: 12px;">
-    <cmi-pagination
-      :key="normalPageTotal"
-      style="border-radius: 8px;border: 1px solid rgba(219,219,219,1);"
-      v-bind="{...paginationProps, ...pagenationEvents}"
-      @sizeChange="pagenationEvents.onSizeChange"
-      @currentChange="pagenationEvents.onCurrentChange"
-      :total="normalPageTotal"
-      :pagesize="page.pageSize"
-      :current="page.pageNum"
-    />
+  <div>
+    <cmi-table ref="tableRef" :key="tableKey" v-bind="tableProps" @rowclick="tableEvents.onRowclick" @togglelandscape="tableEvents.onTogglelandscape">
+      <cmi-table-column
+        v-for="column in pmPageMetaList" :key="column.metaCode"
+        v-bind="{
+          ...attrs,
+          ...getTableColumnProps(column)
+        }"
+      >
+      </cmi-table-column>
+    </cmi-table>
+    <div v-if="pageable && normalPageTotal > 3" :style="{'display': 'flex', 'justify-content': pageAlignEnmu[pageAlign || PAGE_CENTER]}" style="margin-bottom: 12px;">
+      <cmi-pagination
+        :key="normalPageTotal"
+        style="border-radius: 8px;border: 1px solid rgba(219,219,219,1);"
+        v-bind="{...paginationProps, ...pagenationEvents}"
+        @sizeChange="pagenationEvents.onSizeChange"
+        @currentChange="pagenationEvents.onCurrentChange"
+        :total="normalPageTotal"
+        :pagesize="page.pageSize"
+        :current="page.pageNum"
+      />
+    </div>
   </div>
 </template>

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

@@ -24,6 +24,16 @@ const props = defineProps({
   isPointer: {
     type: [String, Number]
   },
+  // 多选的分割符号
+  separator: {
+    type: [String],
+    default: ','
+  },
+  // 多选显示时候 分隔的符号
+  separatorDesc: {
+    type: [String],
+    default: null
+  },
   showMoney: {
     type: [String, Number],
     default: ''
@@ -161,14 +171,14 @@ function selectFormat(value) {
   // 在满足多选，并且不是str格式的时候，就表示value为数组类型，取反就表示不满足的时候，需要转换成数组格式进行计算
   if (!(multiple && !isStrVal)) {
     try {
-      valList = valList ? (valList?.split(',') || []) : []
+      valList = valList ? (valList?.split(props.separator) || []) : []
     } catch (error) {
       debugger
     }
   }
   return valList?.reduce((ret, val) => {
     const str = props?.options?.find(item => item.columnValue == val)?.[lang?.value?.indexOf('zh') > -1 ? 'columnDesc_zh' : 'columnDesc'] || ''
-    return `${ret}${ret ? ',' : ''}${str}`
+    return `${ret}${ret ? (props.separatorDesc || props.separator) : ''}${str}`
   }, '')
 }
 

package/src/rulesImp/events.js

@@ -28,6 +28,8 @@ import {
 import { ARG_FLAGS, MULTI_PAGE_META_LIST_TYPES } from '../utils/const'
 
 import { findComponent, formatDate, hasOwn, isPlainObject, parseExtendAttr } from '../utils/index';
+import dayjs from 'dayjs';
+
 const valArrTypes = [...MULTI_PAGE_META_LIST_TYPES]
 const valBooleanTypes = []
 
@@ -538,6 +540,9 @@ const allInitEvents = {
             if (matchVal.trimEnd().trimStart() === ARG_FLAGS.CURRENT_DATE) {
               return formatDate(new Date(), 'yyyy-MM-dd')
             }
+            if (matchVal.trimEnd().trimStart() === ARG_FLAGS.CURRENT_DATE_EXCLUDE) {
+              return dayjs(new Date()).add(1, 'day').format('YYYY-MM-DD')
+            }
             return originVal
           })
         } else {

package/src/utils/const.js

@@ -7,6 +7,7 @@ export const MODE = {
 }
 export const ARG_FLAGS = {
   CURRENT_DATE: '_currentDate',
+  CURRENT_DATE_EXCLUDE: '_currentDateExclude',
   CURRENT_DATE_TIME: '_currentDateTime',
   REF_VAL: '_refVal'
 }

package/src/utils/defaultVal.js

@@ -2,6 +2,7 @@ import { toRaw } from 'vue'
 import { formatDate, isPlainObject } from './common'
 import { ARG_FLAGS, isHidden, VALUE_TYPES } from './const'
 import { isArray, isNumber, isString } from './is'
+import dayjs from 'dayjs'
 
 export default function defaultVal(config) {
   if (
@@ -27,9 +28,17 @@ export default function defaultVal(config) {
         } else if (/^{[\w\W]*}$/.test(trimValue) || /^\[[\w\W]*\]$/.test(trimValue)) {
           defaultVal = JSON.parse(trimValue)
         } else {
-          if (trimValue === ARG_FLAGS.CURRENT_DATE || trimValue === 'currentDate' || trimValue === ARG_FLAGS.CURRENT_DATE_TIME) {
+          const dateFlagIncluds = [
+            ARG_FLAGS.CURRENT_DATE,
+            'currentDate',
+            ARG_FLAGS.CURRENT_DATE_TIME,
+            ARG_FLAGS.CURRENT_DATE_EXCLUDE
+          ]
+          if (dateFlagIncluds.includes((trimValue || '').trim())) {
             if (trimValue === ARG_FLAGS.CURRENT_DATE_TIME) {
               defaultVal = formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss')
+            } else if (trimValue === ARG_FLAGS.CURRENT_DATE_EXCLUDE) {
+              defaultVal = dayjs(new Date()).add(1, 'day').format('YYYY-MM-DD')
             } else {
               defaultVal = formatDate(new Date(), 'yyyy-MM-dd')
             }

package/src/utils/render.jsx

@@ -35,6 +35,7 @@ import { dispatchClickEvent, dispatchClickEvents, getTableConfig } from '../comp
 import CmiFormItem from '../components/cmiFormItem'
 import loadModule from './loadModule.js'
 import { h } from 'vue'
+import dayjs from 'dayjs'
 
 // 解析配置中的defStyle属性
 export function parseDefStyle(defStyle) {
@@ -59,6 +60,8 @@ function deepParseFnStr(obj, refVal) {
             obj[key] = refVal || ''
           } else if (obj[key] === ARG_FLAGS.CURRENT_DATE) {
             obj[key] = formatDate(new Date(), 'yyyy-MM-dd')
+          } else if (obj[key] === ARG_FLAGS.CURRENT_DATE_EXCLUDE) {
+            obj[key] = dayjs(new Date()).add(1, 'day').format('YYYY-MM-DD')
           } else {
             const { checked, val } = preserveCheck(key, obj[key])
             if (checked) {