resolver-egretimp-plus 0.0.89 → 0.0.91

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "resolver-egretimp-plus",
-  "version": "0.0.89",
+  "version": "0.0.91",
   "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: [
       {

package/src/analysisComponent.jsx

@@ -6,6 +6,7 @@ import rulesDriver from './rules/rulesDriver'
 import { penddingRules } from './rules/ruleUtils.js'
 import { useRoute } from 'vue-router'
 import { executeEventOrchestration } from './components/helper/eventOrchestration.js'
+import { useRouter } from 'vue-router'
 
 export default {
   name: 'AnalysisComponent',
@@ -52,6 +53,7 @@ export default {
     const requestTraceId = inject('requestTraceId')
     const polyfillConfigs = inject('_polyfillConfigs', {})
     const buttonActions = inject('buttonActions', {})
+    const router = useRouter()
     const route = useRoute()
     const routeQuery= route?.query
     const hireRelatMapRules = inject('hireRelatMapRules')
@@ -74,6 +76,9 @@ export default {
       props.config.vm = e
     }
     const onVnodeMounted = (e) => {
+      props.config.vmIsBind = true
+      props.config.router = router
+      props.config.route = route
       props.config.vmIsBind = true
       if (props.config.onVnodeMounted && typeof props.config.onVnodeMounted === 'function') {
         props.config.onVnodeMounted(props, e, selects)

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

@@ -1,6 +1,6 @@
 <script setup>
 import { computed, defineProps, inject, useAttrs } from 'vue'
-import { commonPropsType, hasOwn } from '../../utils/index.js'
+import { commonPropsType, formatDate, hasOwn } from '../../utils/index.js'
 
 const lang = inject('lang')
 const modelValue = defineModel()
@@ -16,10 +16,18 @@ const normalVal = computed(() => {
   return modelValue.value
 })
 
+const dateFormat = computed(() => {
+  return props.config?.dateFormat
+})
+
 const calcProps = computed(() => {
+  let desc = normalVal.value || props.config?.desc
+  if (dateFormat.value) {
+    desc = formatDate(desc, dateFormat.value)
+  }
   return {
     title: lang?.value?.indexOf('zh') > -1 ? props.config?.metaNameZh : props.config?.metaNameEn,
-    desc: normalVal.value || props.config?.desc,
+    desc,
     content: props.config?.content,
     to: props.config?.toHref,
     islink: props.config?.islink === '1',

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

@@ -1,6 +1,6 @@
 <script setup>
-import { commonPropsType, getConfigOptions, hasOwn } from '../../utils/index.js'
-import { computed, inject, reactive, ref, useAttrs, watch } from 'vue'
+import { commonPropsType, formatDate, getConfigOptions, hasOwn } from '../../utils/index.js'
+import { computed, inject, onMounted, reactive, ref, useAttrs, watch } from 'vue'
 
 const attrs = useAttrs()
 const lang = inject('lang')
@@ -9,9 +9,11 @@ const tableRef = ref(null)
 const props = defineProps({
   ...commonPropsType,
 })
-const tableData = ref([])
 const modelValue = defineModel()
-
+// 是否配置分页功能     ====== start======
+const pageable = computed(() => {
+  return props.config?.pageable == '1'
+})
 // 移动端默认前端分页
 const isFrontPage = computed(() => {
   return hasOwn(props.config, 'frontPageFlag') ? props.config?.frontPageFlag == '1' : true
@@ -35,15 +37,17 @@ const page = reactive({
 
 const normalTableData = computed(() => {
   const orgList = !isFrontPage.value ?
-    tableData.value :
-    tableData.value.slice((page.pageNum - 1) * page.pageSize, page.pageNum * page.pageSize)
+    (modelValue.value || []) :
+      pageable.value ? 
+        (modelValue.value?.slice?.((page.pageNum - 1) * page.pageSize, page.pageNum * page.pageSize) || []) :
+        (modelValue.value || [])
   return orgList.map(row => {
     return normalTableRowValue(row)
   })
 })
 
 const normalPageTotal = computed(() => {
-  return !isFrontPage.value ? page.total : (tableData.value?.length || 0)
+  return !isFrontPage.value ? page.total : (modelValue.value?.length || 0)
 })
 
 const paginationProps = computed(() => {
@@ -79,10 +83,7 @@ const tableEvents = computed(() => {
   }
   return ret
 })
-// 是否配置分页功能     ====== start======
-const pageable = computed(() => {
-  return props.config?.pageable == '1'
-})
+
 const pageAlign = computed(() => {
   return props.config?.pageAlign
 })
@@ -137,23 +138,35 @@ const getTableColumnProps = (config) => {
     fixed: config.fixed,
   }
 }
-watch(modelValue, (val) => {
-  setTimeout(() => {
-    tableData.value = val || (tableProps.value.card ? [] : [])
-  }, 100);
-  tableRef.value?.setTableData((val && val.length) ? val : [{}])
-}, {
-  immediate: true
+const tableKey = computed(() => {
+  return `${tableProps.value.card}${tableProps.value.display}${!tableProps.value.card ? page.pageNum : 0}`
+})
+
+onMounted(() => {
+  watch(() => {
+    return {
+      val: normalTableData.value,
+      pageNum: page.pageNum
+    }
+  }, ({ val }) => {
+    tableRef.value?.setTableData([])
+    setTimeout(() => {
+      tableRef.value?.setTableData(val)
+    }, 100);
+  }, {
+    immediate: true
+  })
 })
+
 // 这个的监听是因为 table正常形态的时候，改变分页，行高会越来越高，所以就设置了key
 // 设置key之后需要重新setTableData
-watch(() => {
-  return `${tableProps.value.card}${tableProps.value.display}${!tableProps.value.card ? page.pageNum : 0}`
-}, () => {
-  setTimeout(() => {
-    tableRef.value?.setTableData(normalTableData.value)
-  }, 100);
-})
+// watch(() => {
+//   return `${tableProps.value.card}${tableProps.value.display}${!tableProps.value.card ? page.pageNum : 0}`
+// }, () => {
+//   setTimeout(() => {
+//     tableRef.value?.setTableData(normalTableData.value)
+//   }, 100);
+// })
 
 function getOptions(config) {
   return getConfigOptions(config, selects)
@@ -174,12 +187,15 @@ function normalTableRowValue(row) {
   }
   pmPageMetaList.value.forEach(config => {
     ret[config.metaCode] = normalVal(ret[config.metaCode], getOptions(config))
+    if (config?.dateFormat) {
+      ret[config.metaCode] = formatDate(ret[config.metaCode], config.dateFormat)
+    }
   })
   return ret
 }
 </script>
 <template>
-  <cmi-table ref="tableRef" :key="`${tableProps.card}${tableProps.display}${!tableProps.card ? page.pageNum : 0}`" v-bind="tableProps" :data="normalTableData" @rowclick="tableEvents.onRowclick">
+  <cmi-table ref="tableRef" :key="tableKey" v-bind="tableProps" @rowclick="tableEvents.onRowclick">
     <cmi-table-column
       v-for="column in pmPageMetaList" :key="column.metaCode"
       v-bind="{

package/src/index.jsx

@@ -9,6 +9,7 @@ import { executeLoadServices } from "./components/helper/resolver.js"
 import { deepMerge } from "./utils/index.js"
 import { useRouter } from "vue-router"
 import { useRoute } from "vue-router"
+import { markRaw } from "vue"
 export default {
   name: 'Resolver',
   props: {
@@ -134,6 +135,8 @@ export default {
     const nativeDataLoad = ref(false)
     const router = useRouter()
     const route = useRoute()
+    // const router = {}
+    // const route = {}
     const axiosInstance = ref(props.axiosInstance)
     watch(() => {
       return props.axiosConfig

package/src/utils/common.js

@@ -1,6 +1,6 @@
 
 import { intersectionWith, isEqual, mergeWith, unionWith, isArray, cloneDeep } from 'lodash-es'
-
+import { isDate } from './is'
 export {
   cloneDeep,
   unionWith
@@ -120,6 +120,9 @@ export function isPlainObject(obj) {
 }
 
 export function formatDate(date, fmt) {
+  if (!isDate(date)) {
+    date = new Date(date)
+  }
   if (/(y+)/.test(fmt)) {
     fmt = fmt.replace(RegExp.$1, (`${date.getFullYear()}`).substr(4 - RegExp.$1.length))
   }

package/src/utils/render.jsx

@@ -29,6 +29,7 @@ import QuestionFilled from '../components/icons/question-filled.vue'
 import { dispatchClickEvent, dispatchClickEvents, getTableConfig } from '../components/helper/eventOrchestration.js'
 import CmiFormItem from '../components/cmiFormItem'
 import loadModule from './loadModule.js'
+import { toRaw } from 'vue'
 
 // 解析配置中的defStyle属性
 export function parseDefStyle(defStyle) {
@@ -174,8 +175,8 @@ export function normalConfig({
     wrapVm: null, // 当前组件的实例（也就是analysisComponent）
     hireRelat,
     parent: null, // 这个是执行过程中，动态获取的
-    router,
-    route,
+    router: router,
+    route: route,
     dynamicHireRelat: '', // 这个也是执行过程中，动态获取的层级
   }
   
@@ -195,8 +196,8 @@ export function normalConfig({
   if (config.pmPageMetaList && config.pmPageMetaList.length) {
     config.pmPageMetaList = config.pmPageMetaList.map(metaItem => {
       const { pageConfig } = normalConfig({
-        route,
-        router,
+        // routeQuery: route?.query,
+        // router,
         cbs,
         polyfillConfigs,
         instance,