resolver-egretimp-plus 0.0.59 → 0.0.60

package/package.json

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

package/src/analysisComponent.jsx

@@ -195,7 +195,7 @@ export default {
       })
     }
     return () => {
-      const compProps = getRenderComponentProps({config: props.config, props, component: props.component, modelValue, selects})
+      const compProps = getRenderComponentProps({config: props.config, props, component: props.component, modelValue, selects, lang: lang.value})
       const compPropsOnClick = compProps?.onClick
       delete compProps.onClick
       const formItemPolyfill = generateFormItemPolyfill(props.config, lang.value, compProps, _isH5?.value, {

package/src/components/childDialog/index.js

@@ -10,6 +10,7 @@ export function openChildDialog(options = {}, appContext) {
 
       instance.vm.exposed.dialogVisible.value = true
     })
+    instance?.vm?.exposed?.clearData()
     return instance.close
   }
   const container = document.createElement('div')

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

@@ -64,7 +64,10 @@ function rootStoreChange(rootStore) {
 
 
 defineExpose({
-  dialogVisible
+  dialogVisible,
+  clearData: () => {
+    formData.value = {}
+  }
 })
 </script>
 <template>

package/src/components/helper/eventOrchestration.js

@@ -1,4 +1,4 @@
-import { isArray } from "../../utils/is"
+import { isArray, isHasVal } from "../../utils/is"
 import { DATA_VALID_RULE_EXECUTE } from "../../api/builtIn"
 import { getRelateConfigKeys } from "../../rules/ruleUtils"
 import { RESULT_CODE, resultToast } from "../../utils/respone"
@@ -45,7 +45,7 @@ export async function dispatchClickEvent(service, { dynamicMapComp, mixinService
   // ret.data = {result: {pageTotalCount: 100, result: [{},{},{},{},{}]}}
   initOutParamData(service.outParamMappingList, {dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat, outResult: ret.data})
   if (tableConfig?.vm) {
-    const total = parseInt(ret.data?.result?.[service.pageTotalCount || 'pageTotalCount'])
+    const total = parseInt(ret.data?.result?.[service.pageTotalCount || 'pageCount'])
     tableConfig.vm.page.total = total
     // tableConfig.vm?.changePage(total, 'total')
   }
@@ -98,7 +98,8 @@ function initOutParamData(outParamMappingList = [], { dynamicMapComp, dynamicMap
           val = isArray(compConfig.refValue) ? compConfig.refValue : []
         } else if (isArray(compConfig.refValue) && isArray(val)) {
           val = unionWith(compConfig.refValue, val, (arrVal, othVal) => {
-            return (primaryKeys && primaryKeys.length) ? primaryKeys.map(key => arrVal[key] == othVal[key])?.every(item => item) : false
+            const ret = (primaryKeys && primaryKeys.length) ? primaryKeys.map(key => ((isHasVal(arrVal[key]) || isHasVal(othVal[key])) && arrVal[key] == othVal[key]))?.every(item => item) : false
+            return ret
           })
         }
       }
@@ -139,17 +140,25 @@ export function openDailg({
   const dynamicMapCompKeys = Object.keys(dynamicMapComp)
   const reqData = getReqData(pagePopupMap.inParamMappingList || [], {dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat})
   
+  let outParamMappingList = pagePopupMap?.outParamMappingList?.map(item => {
+    const orignParamArr = item.orignParam ? item.orignParam.split('->') : []
+    return {
+      ...item,
+      orignParam: item.orignParam ? orignParamArr[orignParamArr.length - 1] : ''
+    }
+  }) || []
   let mapList = {}
-  let outParamMappingList = []
   // 是表格还是list
   const isList = pagePopupMap?.objOrList == '1'
   if (isList ) {
     const primaryKeys = []
     mapList = pagePopupMap?.outParamMappingList?.reduce((ret, item) => {
       const { orignParam, destParam, primaryKeyFlag = '' } = item
-      ret[destParam] = orignParam
+      const destParamArr = destParam ? destParam.split('->') : []
+      const transDestParam = destParam ? destParamArr[destParamArr.length - 1] : ''
+      ret[transDestParam] = orignParam
       if (primaryKeyFlag == '1') {
-        primaryKeys.push(destParam)
+        primaryKeys.push(transDestParam)
       }
       return ret
     }, {})
@@ -162,14 +171,6 @@ export function openDailg({
         isList: true
       }
     ]
-  } else {
-    outParamMappingList = pagePopupMap?.outParamMappingList?.map(item => {
-      const orignParamArr = item.orignParam ? item.orignParam.split('->') : []
-      return {
-        ...item,
-        orignParam: item.orignParam ? orignParamArr[orignParamArr.length - 1] : ''
-      }
-    }) || []
   }
 
 
@@ -185,7 +186,9 @@ export function openDailg({
               ...item
             }
             Object.keys(mapList).forEach(key => {
-              retItem[key] = item[mapList[key]]
+              if (mapList[key]) {
+                retItem[key] = item[mapList[key]]
+              }
             })
             return retItem
           })

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

@@ -36,7 +36,7 @@ export default {
         emitKeys = Object.keys(emitKeys)
       }
       return emitKeys.reduce((ret, key) => {
-        const eventKey = capitalize(camelize(eventKey))
+        const eventKey = `on${capitalize(camelize(key))}`
         if (hasOwn(attrs, eventKey)) {
           ret[eventKey] = attrs[eventKey]
         }
@@ -47,10 +47,16 @@ export default {
     const tableEvents = computed(() => {
       return getCompEvents(ElTable)
     })
+    const sliceTableEvents = computed(() => {
+      const ret = {
+        ...(tableEvents.value || {})
+      }
+      delete ret.onSortChange
+      return ret
+    })
     const pagenationEvents = computed(() => {
       return getCompEvents(ElPagination)
     })
-
     const rootStore = inject('_rootStore', {})
     const lang = inject('lang')
     const rootValue = inject('rootValue')
@@ -65,6 +71,34 @@ export default {
         return normalColumnConfig(config)
       })
     })
+    /** 自定义排序逻辑 ===start==== */
+    const sortObj = ref(null)
+    // "ascending", "descending", null
+    const onSortChange = ({ prop, order }) => {
+      tableEvents.value?.onSortChange?.(data)
+
+      sortObj.value = null
+      if (order) {
+        sortObj.value = {prop, order}
+      }
+    }
+    const sortTable = computed(() => {
+      if (!sortObj.value) {
+        return []
+      }
+      const sortList = [sortObj.value]
+      const ret = sortList.reduce((ret, item) => {
+        ret = ret.sort((a, b) => (a[item.prop] > b[item.prop] ? (item.order === 'descending' ? 1 : -1) : a[item.prop] === b[item.prop] ? 0 : (item.order === 'descending' ? -1 : 1)))
+        return ret
+      }, [...(props.refValue.value || [])])
+      return ret
+    })
+
+    const tableData = computed(() => {
+      return sortObj.value ? sortTable.value : (props.refValue.value || [])
+    })
+    /** 自定义排序逻辑 ===end==== */
+
 
     // 获取表格列的属性配置
     const getTableColumnProps = (config, idx) => {
@@ -114,9 +148,10 @@ export default {
       const metaTypeNotRender = TABLE_COLUMN_NOT_RENDER_META_TYPE.some(metaType => compareComponet(metaType, config.metaType)) || !config.metaType
       return !config.renderby && metaTypeNotRender
     }
+    
 
     const getValue = (idx) => {
-      return props.refValue.value?.[idx]
+      return tableData.value?.[idx]
     }
     const onUpdateModelValue = (val, idx) => {
       if (!props.refValue.value) {
@@ -136,11 +171,11 @@ export default {
      */
     const rowColumnConfgsMap = new Map()
     watch(() => {
-      return props.refValue?.value?.length
+      return tableData?.value?.length
     }, (length) => {
       let list = []
       if (length) {
-        const newVal = props.refValue?.value
+        const newVal = tableData?.value
         list = newVal.map((row, idx) => {
           const columnsCgs = rowColumnConfgsMap.get(row)
           if (columnsCgs) {
@@ -219,11 +254,11 @@ export default {
       return total + (numFlag ? Number(val) : val)
     }
     const totalRow = computed(() => {
-      if (!props.refValue.value?.length || !totalMetaCodes.value.length || !normalTotalCodes.value.length) {
+      if (!tableData.value?.length || !totalMetaCodes.value.length || !normalTotalCodes.value.length) {
         return []
       }
       // 进行统计的计算
-      const row = (props.refValue.value || []).reduce((total, row) => {
+      const row = (tableData.value || []).reduce((total, row) => {
         normalTotalCodes.value.forEach(codeInfo => {
           const { code, totalFn } = codeInfo
           total[code] = totalFn(total[code], row[code], row)
@@ -357,12 +392,13 @@ export default {
     return () => {
       return (
         <div class="custom-component-table">
-          <ElTable {...tableProps.value} {...tableEvents}
+          <ElTable {...tableProps.value} {...sliceTableEvents.value}
             ref={(e) => {tableRef.value = e}}
             highlight-current-row={selectable.value || tableProps.value?.highlightCurrentRow ? true : false}
             onCurrentChange={selectable.value || tableProps.value?.highlightCurrentRow ? currentChange : () => {}}
-            data={[...(props.refValue.value || []), ...totalRow.value]}
+            data={[...tableData.value, ...totalRow.value]}
             onSelectionChange={handleSelectionChange}
+            onSortChange={onSortChange}
           >
             {
               tableColumnConfigs.value.map((columnConfg, configIdx) => {
@@ -391,7 +427,7 @@ export default {
                         const config = multiPmPageMetaList.value?.[$index]?.[configIdx]
                         return (
                           tableColumnNotRender(config) ? null :
-                            <Renderer key={`${config.columnId}-${config.rowIndex}`} class="error-tip-block" modelValue={getValue($index)} rowScope={{row, $index}} onUpdate:modelValue={(val) => { onUpdateModelValue(val, $index) }} config={config}></Renderer>
+                          <Renderer key={`${config.columnId}-${config.rowIndex}`} class="error-tip-block" modelValue={getValue($index)} rowScope={{row, $index}} onUpdate:modelValue={(val) => { onUpdateModelValue(val, $index) }} config={config}></Renderer>
                         )
                       }
                     }}

package/src/index.jsx

@@ -133,7 +133,7 @@ export default {
       instance,
       isH5: props.isH5,
       rootValue: props.modelValue,
-      axiosInstance,
+      axiosInstance: axiosInstance.value,
       messageInstance: props.messageInstance,
       messageCb: props.messageCb
     })
@@ -160,7 +160,7 @@ export default {
         instance,
         isH5: props.isH5,
         rootValue: props.modelValue,
-        axiosInstance,
+        axiosInstance: axiosInstance.value,
         messageInstance: props.messageInstance,
         messageCb: props.messageCb
       })

package/src/utils/const.js

@@ -45,7 +45,8 @@ export const H5_PREFIX_FLAG = 'cmi-'
 export const H5_REPLACE_PREFIX_FLAG = 'H5-'
 export const DISPLAY_SHOW = '1'
 export const DISPLAY_HIDDEN = '0'
-export const PLAIN_TYPE_COLUMNS = ['ElText', 'ElInput', 'ElDatePicker', 'ElInputNumber']
+export const PLAIN_TYPE_ALONG_COLUMNS = ['ElText']
+export const PLAIN_TYPE_COLUMNS = ['ElInput', 'ElDatePicker', 'ElInputNumber']
 export const PLAIN_TYPE_OPTIONS_COLUMNS = ['ElSelect']
 export const MAIL_SEND_URL = '/gcweb/External_Mail'
 export const commonPropsType = {
@@ -160,7 +161,21 @@ export const commonPropsType = {
       const options = (selects?.value && selects?.value?.[selectKey]) || (selects?.value && selects?.value?.[`${config.metaCode}ListValue`]) || (selects?.value && selects?.value?.[referenceOptions]) || optionItemsList || []
       return options
     }
-  }
+  },
+  placeholder: {
+    type: String,
+    default: () => [],
+    getValue(config, props, modelValue, selects, lang) {
+      return (lang?.indexOf('zh') > -1 ? config.defPlacehold : config.defPlaceholdEn) || ''
+    }
+  },
+  placeholderEn: {
+    type: String,
+    default: () => [],
+    getValue(config, props, modelValue, selects, lang) {
+      return config.defPlaceholdEn
+    }
+  },
 }
 
 export function calcDisable(config, mode) {

package/src/utils/is.js

@@ -54,6 +54,10 @@ export function isWindow(val) {
   return typeof window !== 'undefined' && is(val, 'Window');
 }
 
+export function isHasVal(val) {
+  return val !== null && val !== undefined
+}
+
 export const isServer = typeof window === 'undefined';
 
 export const isClient = !isServer;

package/src/utils/render.jsx

@@ -20,6 +20,7 @@ import {
   META_TYPE_MAP,
   H5_REPLACE_PREFIX_FLAG,
   H5_PREFIX_FLAG,
+  PLAIN_TYPE_ALONG_COLUMNS,
 } from './const.js'
 import { preserveCheck } from './preserveFunc.js'
 import { isArray, isFunction, isString } from './is.js'
@@ -289,7 +290,9 @@ function normalMetaType(metaType) {
 
 export function isPlainColumn(config, disabled) {
   // 表格中中的列，可以根据配置进行转换为普通形式，表格原生支持的tooltip
-
+  if (findComponent(PLAIN_TYPE_ALONG_COLUMNS, config.renderby || config.metaType) !== -1) {
+    return true
+  }
   if (config.isColumn && disabled) {
     if (config.plainColumn) {
       return true
@@ -350,7 +353,7 @@ export function getComponentForConfig({config, disabled, getNativeComps}) {
 }
 
 // 获取渲染组件的props配置数据
-export function getRenderComponentProps({ props, component, modelValue, selects }) {
+export function getRenderComponentProps({ props, component, modelValue, selects, lang }) {
   if (!component) return {}
   let config = props.config
   if (findComponent(['CustomComponentTabs'], config.renderby || config.metaType) !== -1) {
@@ -373,7 +376,7 @@ export function getRenderComponentProps({ props, component, modelValue, selects
       }
     })
   }
-  const commonProps = getCommonProps(config, props, modelValue, selects)
+  const commonProps = getCommonProps(config, props, modelValue, selects, lang)
   defprops.style = {
     ...config.style,
     ...getRenderCompMargins(config),
@@ -393,9 +396,9 @@ function getBuildCompDefaultWidth(config) {
   }
 }
 // 获取渲染组件开放的配置props，提供给所有自定义组件
-function getCommonProps(config, props, modelValue, selects) {
+function getCommonProps(config, props, modelValue, selects, lang) {
   return Object.keys(commonPropsType).reduce((ret, key) => {
-    ret[key] = commonPropsType[key].getValue(config, props, modelValue, selects)
+    ret[key] = commonPropsType[key].getValue(config, props, modelValue, selects, lang)
     return ret
   }, {})
 }