resolver-egretimp-plus 0.0.109 → 0.0.111

package/package.json

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

package/scripts/webpack.config.js

@@ -16,7 +16,7 @@ module.exports = {
     path: path.resolve(__dirname, '../dist'),
     filename: '[name]/index.js'
   },
-  devtool: 'inline-source-map',
+  // devtool: 'inline-source-map',
   module: {
     rules: [
       {
@@ -65,6 +65,7 @@ module.exports = {
       }
     ]
   },
+  // devtool: 'source-map',
   resolve: {
     extensions: ['.js', '.json', '.vue', '.jsx'],
     modules: [path.resolve(__dirname, '../node_modules')]

package/src/analysisComponent.jsx

@@ -1,5 +1,5 @@
 import { computed, defineAsyncComponent, getCurrentInstance, inject, onBeforeMount, provide, ref } from 'vue'
-import { commonPropsType, getComponentPropsKeys, hasOwn } from './utils/index.js'
+import { commonPropsType, definePrivatelyProp, EXECTE_CLICK_EVENT_COMPONENTS, findComponent, getComponentPropsKeys, hasOwn } from './utils/index.js'
 import { useVmodels } from './hooks/index.js'
 import { getRenderComponentProps, generateFormItemPolyfill } from './utils/index.js'
 import rulesDriver from './rules/rulesDriver'
@@ -70,16 +70,16 @@ export default {
     // 当前组件的实例
     const instance = getCurrentInstance()
     const appContext = instance?.appContext
-    props.config.wrapVm = instance
+    definePrivatelyProp(props.config, 'wrapVm', instance)
     const refFn = e => {
       // 具体渲染的组件
-      props.config.vm = e
+      definePrivatelyProp(props.config, 'vm', e)
     }
     const onVnodeMounted = (e) => {
       props.config.vmIsBind = true
-      props.config.router = router
-      props.config.route = route
-      props.config.vmIsBind = true
+      definePrivatelyProp(props.config, 'router', router)
+      definePrivatelyProp(props.config, 'route', route)
+
       if (props.config.onVnodeMounted && typeof props.config.onVnodeMounted === 'function') {
         props.config.onVnodeMounted(props, e, selects)
       }
@@ -125,7 +125,7 @@ export default {
     }
 
     const { vModelObjs, initVmodels, modelValue } = useVmodels(props, emit) // 过个v-model绑定对象，实现可以组件过赋值
-    props.config.refValue = modelValue
+    definePrivatelyProp(props.config, 'refValue', modelValue)
     // onBeforeMount(() => {
     //   defaultVal(props.config, modelValue) // 设置默认值
     // })
@@ -169,7 +169,8 @@ export default {
 
     const configLinks = [parent, ...props.additionConfigs, props.config]
     configLinks.reduce((parent, config) => {
-      config.parent = parent
+      definePrivatelyProp(props.config, 'parent', parent)
+      
       config.dynamicMapComp = dynamicMapComp
       config.dynamicHireRelat = parent?.dynamicHireRelat ?  `${parent?.dynamicHireRelat}${hasOwn(props.config, 'rowIndex') ? `[${props.config.rowIndex}]` : ''}->${(props.config.metaCode || '')}` : props.config.metaCode
       config.dynamicHireRelat && (dynamicMapComp[props.config.dynamicHireRelat] = props.config)
@@ -186,7 +187,6 @@ export default {
     const lang = inject('lang')
     const rootValue = inject('rootValue')
     const onClick = (e, { beforeRequestService, afterRequestService } = {}) => {
-      e?.stopPropagation?.()
       const context = {
         props,
         dynamicMapComp,
@@ -200,7 +200,9 @@ export default {
         appContext
       }
       attrs?.onClick?.call(context, e) // 如果配置中有点击事件
-      executeClickEvents({ beforeRequestService, afterRequestService })
+      if (findComponent(EXECTE_CLICK_EVENT_COMPONENTS, props.config?.renderby || props.config?.metaType) !== -1 ) {
+        executeClickEvents({ beforeRequestService, afterRequestService })
+      }
     }
     function executeClickEvents({ beforeRequestService, afterRequestService } = {}) {
       executeEventOrchestration({

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

@@ -26,14 +26,18 @@ const dateFormat = computed(() => {
 
 const calcProps = computed(() => {
   let desc = normalVal.value || props.config?.desc
-  if (desc?.toString) {
-    desc = desc.toString()
-  }
-  if (dateFormat.value) {
-    desc = formatDate(desc, dateFormat.value)
-  }
-  if (props.formatter && typeof props.formatter === "function") {
-    desc = props.formatter(desc)
+  try {
+    if (desc?.toString) {
+      desc = desc.toString()
+    }
+    if (dateFormat.value) {
+      desc = formatDate(desc, dateFormat.value)
+    }
+    if (props.formatter && typeof props.formatter === "function") {
+      desc = props.formatter(desc)
+    }
+  } catch (error) {
+    console.log('CmiCell, error==:', error)
   }
   return {
     title: lang?.value?.indexOf('zh') > -1 ? props.config?.metaNameZh : props.config?.metaNameEn,

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

@@ -5,6 +5,14 @@ import { commonPropsType } from '../../utils/index.js'
 const lang = inject('lang')
 const props = defineProps({
   ...commonPropsType,
+  formatter: {
+    type: Function,
+    default: null
+  },
+  parser: {
+    type: Function,
+    default: null
+  }
 })
 const inputProps = computed(() => {
   return {
@@ -32,14 +40,30 @@ const inputProps = computed(() => {
 const attrs = useAttrs()
 const modelValue = defineModel()
 const onChange = (e) => {
-  modelValue.value = e.detail.value
+  valueProxy.value = e.detail.value
 }
+const valueProxy = computed({
+  get() {
+    return typeof props.formatter === "function" ? props.formatter(modelValue.value) : modelValue.value
+  },
+  set(val) {
+    let value = typeof props.parser === "function" ? props.parser(val) : val
+    if (modelValue.value === value && typeof props.formatter === "function") {
+      modelValue.value += ' '
+      setTimeout(() => {    // 如果值相等，会导致没有再次进入get取值
+        modelValue.value = value
+      }, 0)
+    } else {
+      modelValue.value = value
+    }
+  }
+})
 
 </script>
 
 <template>
   <cmi-input
-    :value="modelValue" v-bind="{ ...attrs, ...inputProps,}" 
+    :value="valueProxy" v-bind="{ ...attrs, ...inputProps,}" 
     @change="onChange"
   ></cmi-input>
 </template>

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

@@ -47,7 +47,7 @@ function toCollapse() {
 </script>
 <template>
   <cmi-card v-bind="{...cmiProps, ...attrs}">
-    <div slot="content">
+    <div slot="content" :style="{'background-color': cmiProps.cardbgcolor}">
       <Renderer :config="showPageMeteList" v-model="modelValue"></Renderer>
       <div v-if="showCollapseBtn" class="collapse-wrap">
         <cmi-button type="text" size="small" @click="toCollapse">
@@ -62,4 +62,9 @@ function toCollapse() {
   display: flex;
   justify-content: end;
 }
+cmi-card {
+  cmi-form-item {
+    background-color: transparent;
+  }
+}
 </style>

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

@@ -53,7 +53,7 @@ const normalPageTotal = computed(() => {
 const paginationProps = computed(() => {
   return {
     pagesizes: props.config?.pagesizes || [3, 10, 20, 50],
-    showHomeEnd: hasOwn(props.config, 'showHomeEnd') ? props.config.showHomeEnd === '1' : hasOwn(props.config, 'show-home-end') ? props.config['show-home-end'] === '1' : true,
+    showHomeEnd: hasOwn(props.config, 'showHomeEnd') ? props.config.showHomeEnd === '1' : hasOwn(props.config, 'show-home-end') ? props.config['show-home-end'] === '1' : false,
   }
 })
 const pagenationEvents = computed(() => {
@@ -213,9 +213,10 @@ function normalTableRowValue(row) {
     >
     </cmi-table-column>
   </cmi-table>
-  <div v-if="pageable && normalPageTotal > 3" :style="{'justify-content': pageAlignEnmu[pageAlign || PAGE_RIGHT]}" style="margin-bottom: 12px;">
+  <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"

package/src/components/packages-web/CustomComponentTable.jsx

@@ -226,8 +226,8 @@ export default {
     }, (length) => {
       let list = []
       if (length) {
-        const newVal = tableData?.value
-        list = newVal.map((row, idx) => {
+        const newVal = tableData.value
+        list = newVal?.map?.((row, idx) => {
           const columnsCgs = rowColumnConfgsMap.get(row)
           if (columnsCgs) {
             columnsCgs.forEach(config => {

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

@@ -16,7 +16,8 @@ const appContext = getCurrentInstance()?.appContext
 
 const props = defineProps({
   ...commonPropsType,
-  ...ElButton.props
+  ...ElButton.props,
+  plain: [String, Boolean]
 })
 const calcPorps = computed(() => {
   const ret = {

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

@@ -16,7 +16,8 @@ import { commonPropsType } from '../../utils/index.js'
 const modelValue = defineModel()
 const props = defineProps({
   ...ElSelect.props,
-  ...commonPropsType
+  ...commonPropsType,
+  multiple: [String, Boolean]
 })
 const attrs = useAttrs()
 

package/src/utils/common.js

@@ -292,3 +292,14 @@ export function getConfigOptions(config, selects) {
   //   return options.filter(item => !(item.columnStatus == '0' || item.columnStatus == '2'))
   // }
 }
+
+export function definePrivatelyProp(obj, key, value, options) {
+  const op = options || {}
+  Object.defineProperty(obj, key, {
+    value,
+    writable: true,
+    enumerable: false,
+    configurable: true,
+    ...op
+  })
+}

package/src/utils/const.js

@@ -35,6 +35,7 @@ export const NOT_NEED_FORM_ITEM_META_TYPE = [
   'cmi-dropdown-menu',
   'cmi-divider'
 ]
+export const EXECTE_CLICK_EVENT_COMPONENTS = ['ElInput', 'ElButton', 'CmiInput', 'CmiButton']
 export const TRANS_CELL_COMPONETS = ['CmiInput', 'CmiSelect']
 export const NOT_NEED_COL_ITEM_META_TYPE = ['CustomComponentTabPane', 'CustomComponentDialog', 'CustomComponentCol', 'CustomComponentTabPaneH5']
 export const MULTI_PAGE_META_LIST_TYPES = ['CustomComponentTable']

package/src/utils/render.jsx

@@ -2,7 +2,6 @@ import { getCodeMapRules } from '../rules/rulesDriver.js'
 import { resolveAssetComponents, findComponent, compareComponet, normalPixel, isPlainObject, hasOwn, isFnStr, normalCapitalizeComponent, capitalize, camelize, formatDate} from './common.js'
 import { resolveComponent, inject, defineAsyncComponent } from 'vue'
 import CustomComponentColH5 from '../components/packages-H5/CustomComponentColH5.vue'
-import CmiCell from '../components/packages-H5/CmiCell.vue'
 import {
   commonPropsType,
   FORM_META_TYPE,
@@ -347,9 +346,6 @@ export function getComponentForConfig({config, disabled, getNativeComps}) {
   if (isPlainColumn(config, disabled)) {
     return CustomComponentPlain
   }
-  if (isTransCellMobile(config, disabled)) {
-    return CmiCell
-  }
 
   const components = inject('components')
   const { composeComponents } = getNativeComps()
@@ -363,7 +359,10 @@ export function getComponentForConfig({config, disabled, getNativeComps}) {
     component = resolveComponent(metaType) // 实例上绑定的组件
   }
 
-  const renderby = config.renderby
+  let renderby = config.renderby
+  if (isTransCellMobile(config, disabled)) {
+    renderby = 'CmiCell'
+  }
   if (renderby && typeof renderby === 'string') {
     let renderbyComp = resolveAssetComponents(allComps, renderby) //则通过传入的获取组件
     if (!renderbyComp) {