resolver-egretimp-plus 0.1.115 → 0.1.116

package/src/utils/common.js

@@ -569,34 +569,42 @@ function normalizeNumberString(numStr) {
 }
 
 
-export function getPathVal(obj = {}, path) {
+export function getPathVal(obj = {}, path, separator = '.') {
   let paths = path
   if (typeof path === 'string') {
-    paths = path.split('.')
+    paths = path.split(separator)
   }
   return paths.reduce((ret, key) => {
     if (ret) {
+      const match = key.match(/^(\w+)\[(\d+)\]/)
+      if (match) {
+        return ret[match[1]]?.[match[2]]
+      }
       return ret[key]
     }
     return null
   }, obj) ?? ''
 }
-export function assignmentPathVal(obj = {}, path, val) {
-  let paths = path
-  if (typeof path === 'string') {
-    paths = path.split('.')
-  }
-  let currentObj = obj
-  paths.forEach((item, idx) => {
-    if (idx + 1 === paths.length) {
-      currentObj[item] = val ?? ''
-    } else {
-      if (!currentObj[item]) {
-        currentObj[item] = {}
+
+export function assignmentPathVal(obj = {}, path, val, separator = '.') {
+  if (path && obj) {
+    let beginObj = obj
+    if (isRef(obj)) {
+      beginObj = obj.value
+    }
+    const keyArr = path.split(separator)
+    keyArr.reduce((ret, code, idx) => {
+      if (idx === keyArr.length - 1) {
+        ret[code] = val
+      } else {
+        !ret[code] && (ret[code] = {})
       }
-      currentObj = currentObj[item]
+      return ret[code]
+    }, beginObj)
+    if (isRef(obj)) {
+      obj.value = beginObj
     }
-  })
+  }
 }
 
 export function eleIsOverflow(e) {

package/src/utils/const.js

@@ -46,6 +46,7 @@ export const NOT_NEED_FORM_ITEM_META_TYPE = [
 ]
 export const EXECTE_CLICK_EVENT_COMPONENTS = ['ElInput', 'ElButton', 'CmiInput', 'CmiButton', 'ElText']
 export const TRANS_CELL_COMPONETS = ['CmiInput', 'CmiSelect', 'CmiPicker']
+export const CYCLE_COMPONETS = ['CustomComponentCycle', 'CustomComponentCycleTabPane', 'CustomComponentTable']
 export const NOT_NEED_COL_ITEM_META_TYPE = ['CustomComponentTabPane', 'CustomComponentDialog', 'CustomComponentCol', 'CustomComponentTabPaneH5']
 export const MULTI_PAGE_META_LIST_TYPES = ['CustomComponentTable']
 export const SPECIAL_SET_FULL_WIDTH_ITEM_META_TYPE = ['el-select', 'el-date-picker', 'el-time-picker', 'el-time-select', 'el-cascader', 'el-input-number', 'CustomComponentTree', 'CustomComponentSteps']

package/src/utils/render.jsx

@@ -25,7 +25,8 @@ import {
   TRANS_CELL_COMPONETS,
   MODE,
 
-  isHidden
+  isHidden,
+  CYCLE_COMPONETS
 } from './const.js'
 import { preserveCheck } from './preserveFunc.js'
 import { isArray, isFunction, isString } from './is.js'
@@ -355,6 +356,11 @@ function getTableServices(lcpPageServiceMapVOList = [], { dynamicMapComp, dynami
   }
   return []
 }
+
+export function isCycleConfig(config) {
+  return findComponent(CYCLE_COMPONETS, config.renderby) !== -1 || findComponent(CYCLE_COMPONETS, config.metaType) !== -1
+}
+
 function parsePolyfillConfigs({ polyfillConfigs, instance, parentRootValue, parentDynamicMapComp}, config) {
   const hireRelat = config.hireRelat
   const findKeys = Object.keys(polyfillConfigs || {}).filter(key => hireRelat.endsWith(key))

package/src-bak/components/packages-H5/CustomComponentCollapseH5.vue

@@ -61,14 +61,18 @@ watch(lasetLimitIdx, (val) => {
       }
       if (index === val) {
         if (item.metaType === 'cmi-cell') {
-          item.borderHidden = '1'
+          if (!showCollapseBtn.value) {
+            item.borderHidden = '1'
+          }
         }
       }
     }
   })
   if (val === -1) {
     if (lastShowPageMeteItem.value?.metaType === 'cmi-cell') {
-      lastShowPageMeteItem.value.borderHidden = '1'
+      if (!showCollapseBtn.value) {
+        lastShowPageMeteItem.value.borderHidden = '1'
+      }
     }
   }
 }, {

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

@@ -1,14 +1,18 @@
 <template>
-  <span class="custom-component-plain" :class="classObj" @click="clickAction">{{ props.formatter?.(value) ?? value }}</span>
+  <span class="custom-component-plain" :class="classObj" @click.stop.self="clickAction">{{ props.formatter?.(value) ?? value }}</span>
 </template>
 <script setup>
 import { findComponent } from '../../utils/common';
 import { commonPropsType, PLAIN_TYPE_OPTIONS_COLUMNS } from '../../utils/const' // 这边不能用utils/index去引用，因为这个组件在utils/render.js中被引入了，会造成循环引用
-import { computed, defineModel, defineProps, inject, getCurrentInstance, watch, nextTick } from 'vue'
+import { computed, defineModel, inject, getCurrentInstance, watch, nextTick } from 'vue'
 import dayjs from 'dayjs'
 import { isNaN } from '../../utils/is';
 import { useFormItem } from 'element-plus'
 
+defineOptions({
+  inheritAttrs: false
+})
+
 const { formItem: elFormItem } = useFormItem()
 const modelValue = defineModel()
 const props = defineProps({

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

@@ -390,44 +390,44 @@ export default {
      * multiPmPageMetaList值主要作用是区分列的每一行都需要有单独的config，接口配置返回的只是列的配置，
      * 所以这边需要单独再坐下处理
      */
-    const rowColumnConfgsMap = new Map()
-    watch(() => {
-      return tableData?.value?.length
-    }, (length) => {
-      let list = []
-      if (length) {
-        const newVal = tableData.value
-        list = newVal?.map?.((row, idx) => {
-          const columnsCgs = rowColumnConfgsMap.get(row)
-          if (columnsCgs) {
-            columnsCgs.forEach(config => {
-              config.rowIndex = idx
-            })
-            return columnsCgs
-          } else {
-            const retColumnConfigs = tableColumnConfigs.value.map((config, relIdx) => {
-              const ret = cloneDeep(config)
-              if (ret.width && !ret.columnWidth) {
-                ret.columnWidth = ret.width
-                delete ret.width
-              }
-              ret.columnId = generateUniqueId()
-              ret.rowIndex = idx
-              ret.isColumn = true
-              ret.refConfig = props?.config?.pmPageMetaList?.[relIdx]
-              ret.parent = props?.config // 这边手动设置一下，防止组件复用的时候不会刷新，造成parent的丢失
-              return ret
-            })
-            rowColumnConfgsMap.set(row, retColumnConfigs)
-            return retColumnConfigs
-          }
-        })
-      }
-      definePrivatelyProp(props.config, 'multiPmPageMetaList', list)
-    }, {
-      immediate: true,
-      deep: true,
-    })
+    // const rowColumnConfgsMap = new Map()
+    // watch(() => {
+    //   return tableData?.value?.length
+    // }, (length) => {
+    //   let list = []
+    //   if (length) {
+    //     const newVal = tableData.value
+    //     list = newVal?.map?.((row, idx) => {
+    //       const columnsCgs = rowColumnConfgsMap.get(row)
+    //       if (columnsCgs) {
+    //         columnsCgs.forEach(config => {
+    //           config.rowIndex = idx
+    //         })
+    //         return columnsCgs
+    //       } else {
+    //         const retColumnConfigs = tableColumnConfigs.value.map((config, relIdx) => {
+    //           const ret = cloneDeep(config)
+    //           if (ret.width && !ret.columnWidth) {
+    //             ret.columnWidth = ret.width
+    //             delete ret.width
+    //           }
+    //           ret.columnId = generateUniqueId()
+    //           ret.rowIndex = idx
+    //           ret.isColumn = true
+    //           ret.refConfig = props?.config?.pmPageMetaList?.[relIdx]
+    //           ret.parent = props?.config // 这边手动设置一下，防止组件复用的时候不会刷新，造成parent的丢失
+    //           return ret
+    //         })
+    //         rowColumnConfgsMap.set(row, retColumnConfigs)
+    //         return retColumnConfigs
+    //       }
+    //     })
+    //   }
+    //   definePrivatelyProp(props.config, 'multiPmPageMetaList', list)
+    // }, {
+    //   immediate: true,
+    //   deep: true,
+    // })
     // 统计行定义 ====start======
     const totalMetaCodes = computed(() => {
       return props.config?.totalMetaCodes || []
@@ -702,6 +702,7 @@ export default {
           } else {
             // const config = columnConfg
             const config = multiPmPageMetaList.value?.[$index]?.[configIdx]
+            debugger
             retVnode = (
               tableColumnNotRender(config) ? null :
               <Renderer key={`${config.columnId}-${config.rowIndex}`} class="error-tip-block" rowScope={{row, $index}} modelValue={getValue($index)} onUpdate:modelValue={(val) => { onUpdateModelValue(val, $index) }} config={config}></Renderer>
@@ -767,7 +768,7 @@ export default {
         )
       }
       return (
-        <ElTable {...tableProps.value} {...sliceTableEvents.value}
+        multiPmPageMetaList.value?.length ? <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 : () => {}}
@@ -784,7 +785,7 @@ export default {
               )
             })
           }
-        </ElTable>
+        </ElTable> : null
       )
     }
 

package/src-bak/index.jsx

@@ -1,4 +1,4 @@
-import { provide, toRef, watch, computed, ref, defineExpose, reactive, getCurrentInstance, toRaw, onMounted } from "vue"
+import { provide, toRef, watch, computed, ref, defineExpose, reactive, getCurrentInstance, toRaw, onMounted, nextTick } from "vue"
 import Renderer from './renderer.jsx'
 // import './style/index.scss'
 import { usePageConfig } from './hooks/pageConfig'
@@ -404,15 +404,18 @@ export default {
       }
     })
 
-    setTimeout(() => {
-      if (modelValue.value?.contractTab?.tabPane4?.dictContractCard?.supplierContractInformation) {
-        modelValue.value.contractTab.tabPane4.dictContractCard.supplierContractInformation.mksReasonOfSupplierList.splice(1, 1)
-      }
-      debugger
-    }, 5000)
-    setInterval(() => {
-      console.log('=====pageConfigRef:', pageConfigRef.value)
-    }, 3000);
+    // setTimeout(() => {
+      // if (modelValue.value?.contractTab?.tabPane4?.dictContractCard?.supplierContractInformation) {
+      //   modelValue.value.contractTab.tabPane4.dictContractCard.supplierContractInformation.mksReasonOfSupplierList.splice(1, 1)
+      // }
+      // debugger
+      // Promise.resolve().then(() => {
+      //   debugger
+      // })
+    // }, 5000)
+    // setInterval(() => {
+    //   console.log('=====pageConfigRef:', pageConfigRef.value)
+    // }, 3000);
     onMounted(() => {
       if (props.openBpm) {
         initBpm(props.bpmMessage, props.bpmActions, props.bpmConfigs, {
@@ -428,13 +431,13 @@ export default {
         bpmInstance?.insertBtn?.(props.bpmBtns, props.bpmBtnPosition)
       }
     })
-    // return () => {
-    //   if (!pageConfigRef.value) {
-    //     return null
-    //   }
-    //   return (
-    //     <Renderer {...attrs} mode={props.mode} v-model={modelValue.value} config={pageConfigRef.value}></Renderer>
-    //   )
-    // }
+    return () => {
+      if (!pageConfigRef.value) {
+        return null
+      }
+      return (
+        <Renderer {...attrs} mode={props.mode} v-model={modelValue.value} config={pageConfigRef.value}></Renderer>
+      )
+    }
   }
 }

package/src-bak/rules/rulesDriver.js

@@ -103,6 +103,26 @@ function splitRelat(relat) {
   }
 }
 
+function helpOfValueTable({ rule, _mapComp, config}) {
+  const events = rule.pmRuleTargetEventVoList.filter(ev => ev.eventId)
+  const willDisEvents = events.filter(ev => {
+    const { targetObj: target, targetObjVal } = ev
+    if (
+      config.isColumn &&
+      config.hireRelat && target &&
+      config.hireRelat.replace(/->\w*$/, '') === target.replace(/->\w*$/, '')
+    ) {
+      return true
+    }
+    return false
+  })
+  if (willDisEvents) {
+    config.refConfig._validTableConfig = () => {
+
+    }
+  }
+}
+
 export function runClickRules(rules, isInit) {
   rules = rules || []
   if (rules && rules.length) {
@@ -114,5 +134,6 @@ export function runClickRules(rules, isInit) {
   }
 }
 
+
 export { generateConfigsHireRelat } from './ruleUtils' 
 export { getCodeMapRules } from './parseCondition.js'

package/src-bak/utils/render.jsx

@@ -198,7 +198,7 @@ export function normalConfig({
     hireRelat,
     parent: null, // 这个是执行过程中，动态获取的
     dynamicHireRelat, // 这个也是执行过程中，动态获取的层级
-    _rootValue: rootValue
+    _rootValue: rootValue,
   }
   let extendAttrObj = parseExtendAttr(config)
   let extendObj = {
@@ -274,9 +274,9 @@ export function normalConfig({
       config._unPageMetaListWatch?.() // 删除当前的监听
       const unWatch = watch(() => getPathVal(unref(config._rootValue), config.dynamicHireRelat, '->')?.length, (val) => {
         config?._unWatchs?.forEach(un => un?.()) // 删除子级的PmPageMetaList监听
-        if (config.metaId == "366008") {
-          debugger
-        }
+        // if (config.metaId == "366008") {
+        //   debugger
+        // }
         const list = getPathVal(unref(config._rootValue), config.dynamicHireRelat, '->')
         if (list && list.length) {
           config.multiPmPageMetaList = list.map((row, idx) => {
@@ -307,7 +307,7 @@ export function normalConfig({
           })
         }
       }, {
-        immediate: true
+        immediate: true,
       })
       // 这边先执行，因为当前的_unWatchs里面只放子级的watch
       unWatchsList?.forEach(list => {