resolver-egretimp-plus 0.1.108 → 0.1.110

package/src/resolver-common.vue

@@ -8,7 +8,7 @@ const props = defineProps({
   busiIdentityId: String,
   selects: {
     type: Object,
-    default: () => ({})
+    default: () => ({_default: true})
   },
   getNativeComps: {
     type: Function,
@@ -38,43 +38,51 @@ const props = defineProps({
     type: Object,
     default: () => ({})
   },
+  // 外部传入的config
+  nativeConfig: [Object, Array]
 })
+const selectsLoad = ref(true)
 defineOptions({
   inheritAttrs: false
 })
-const loadSelects = ref({})
 const attrs = useAttrs()
-const allSelects = computed(() => {
-  return {
-    ...loadSelects.value,
-    ...(props.selects || {})
-  }
-})
+
 initInterceptors(props.messageInstance)
 const { getPageConfig, pageConfig, selects } = useBuildInData({messageInstance: props.messageInstance, loadingInstance: props.loadingInstance, requestTraceId: props.requestTraceId})
-getPageConfig({
-  busiIdentityId: props.busiIdentityId,
-  queryPageMeta: '1',
-  queryPageService: '1',
-  ...(props.builtPolyfillReq || {}),
-  ...(props.loadConfigReq || {})
-}, {
-  configCb: (pageConfig) => {
-    // 配置数据加载完成事件 'loadedConfigCompeted'
-    attrs?.onLoadedConfigCompeted?.(pageConfig)
-  },
-  selectsCb: (selects) => {
-    // 配置数据加载完成事件 'loadedConfigCompeted'
-    // Object.keys(selects || {}).forEach(key => {
-    //   props.selects[key] = selects[key]
-    // })
-    loadSelects.value = selects
-    attrs?.onLoadedSelectsCompeted?.(allSelects.value)
-  },
-  selectPolyReq: {
-    ...(props.builtPolyfillReq || {}),
+if (!props.nativeConfig) {
+  if (props.selects?._default) {
+    // 没有传selects对象的时候，在selectsCb中设置props.selects属性，是不会响应式的，所以这边需要进行逻辑控制
+    selectsLoad.value = false
   }
-})
+  getPageConfig({
+    busiIdentityId: props.busiIdentityId,
+    queryPageMeta: '1',
+    queryPageService: '1',
+    ...(props.builtPolyfillReq || {}),
+    ...(props.loadConfigReq || {})
+  }, {
+    configCb: (pageConfig) => {
+      // 配置数据加载完成事件 'loadedConfigCompeted'
+      attrs?.onLoadedConfigCompeted?.(pageConfig)
+    },
+    selectsCb: (selects) => {
+      // 配置数据加载完成事件 'loadedConfigCompeted'
+      Object.keys(selects || {}).forEach(key => {
+        props.selects[key] = selects[key]
+      })
+      attrs?.onLoadedSelectsCompeted?.(props.selects)
+      if (props.selects?._default) {
+        // 没有传selects对象的时候，在selectsCb中设置props.selects属性，是不会响应式的，所以这边需要进行逻辑控制
+        selectsLoad.value = true
+      }
+    },
+    selectPolyReq: {
+      ...(props.builtPolyfillReq || {}),
+    }
+  })
+} else {
+  pageConfig.value = props.nativeConfig
+}
 
 const resolverRef = ref(null)
 defineExpose({
@@ -106,7 +114,7 @@ defineExpose({
 </script>
 <template>
   <Resolver
-    v-if="pageConfig"
+    v-if="pageConfig && selectsLoad"
     ref="resolverRef"
     v-bind="attrs"
     :loadingInstance="props.loadingInstance"
@@ -114,7 +122,7 @@ defineExpose({
     :getNativeComps="props.getNativeComps"
     :copyModal="props.copyModal"
     :config="pageConfig || null"
-    :selects="allSelects"
+    :selects="props.selects"
     :builtPolyfillReq="props.builtPolyfillReq"
     :requestTraceId="props.requestTraceId"
   ></Resolver>

package/src/theme/element/components/table.scss

@@ -1,5 +1,5 @@
 @mixin hiddenColumn {
-  .hidden-column {
+  .hidden-column.hidden-column {
     border: none;
     overflow: hidden;
     // display: none;
@@ -156,15 +156,41 @@
   }
   // table-v2
   .table-border {
+    --el-table-header-bg-color: #f5f6f7;
+    --el-table-header-text-color: #646a73;
+
     border: 1px solid var(--el-table-border-color);
     border-radius: var(--boder-radius);
     overflow: hidden;
     
-  }
-  .el-table-v2__header-cell,.el-table-v2__row-cell {
-    border-right: var(--el-table-border);
-    &:last-of-type {
-      border-right: none;
+    .el-table-v2__header-cell,.el-table-v2__row-cell {
+      border-right: var(--el-table-border);
+      &:last-of-type {
+        border-right: none;
+      }
+    }
+
+    .table-head-cell {
+      // background-color: var(--el-table-header-bg-color);
+      font-weight: 400;
+      padding: 0;
+    }
+    .table-body-cell {
+      padding: 0;
+    }
+    .table-v2-cell {
+      padding: 0 16px;
+      width: 100%;
+    }
+    .table-v2-common-row {
+      border-bottom: none;
+    }
+    .table-v2-striped {
+      background-color: var(--el-fill-color-lighter);
+    }
+    .el-table-v2__header-row {
+      background-color: var(--el-table-header-bg-color);
+      padding-inline-end: unset;
     }
   }
   .flex-grow-import {

package/src/utils/common.js

@@ -597,4 +597,64 @@ export function assignmentPathVal(obj = {}, path, val) {
       currentObj = currentObj[item]
     }
   })
-}
+}
+
+export function eleIsOverflow(e) {
+  // 判断是否text-overflow, 如果是就显示tooltip
+  const cellChild = e.target
+  if (!cellChild.childNodes.length) {
+    return
+  }
+  // use range width instead of scrollWidth to determine whether the text is overflowing
+  // to address a potential FireFox bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1074543#c3
+  const range = document.createRange()
+  range.setStart(cellChild, 0)
+  range.setEnd(cellChild, cellChild.childNodes.length)
+
+  let { width: rangeWidth, height: rangeHeight } = range.getBoundingClientRect()
+  const offsetWidth = rangeWidth - Math.floor(rangeWidth)
+  let { width: cellChildWidth, height: cellChildHeight } = cellChild.getBoundingClientRect()
+  cellChildWidth = Math.ceil(cellChildWidth)
+  if (offsetWidth < 0.001) {
+    rangeWidth = Math.floor(rangeWidth)
+  }
+  const offsetHeight = rangeHeight - Math.floor(rangeHeight)
+  if (offsetHeight < 0.001) {
+    rangeHeight = Math.floor(rangeHeight)
+  }
+
+  const { top, left, right, bottom } = getPadding(cellChild)
+  const horizontalPadding = left + right
+  const verticalPadding = top + bottom
+
+  let ret = {}
+  if (
+    isGreaterThan(rangeWidth + horizontalPadding, cellChildWidth) ||
+    isGreaterThan(rangeHeight + verticalPadding, cellChildHeight) ||
+    // When using a high-resolution screen, it is possible that a returns cellChild.scrollWidth value of 1921 and
+    // cellChildWidth returns a value of 1920.994140625. #16856 #16673
+    isGreaterThan(cellChild.scrollWidth, cellChildWidth)
+  ) {
+    ret.overflow = true
+    ret.content = cellChild.innerText || cellChild.textContent
+  }
+  return ret
+}
+
+function getPadding(el) {
+  const style = window.getComputedStyle(el, null)
+  const paddingLeft = Number.parseInt(style.paddingLeft, 10) || 0
+  const paddingRight = Number.parseInt(style.paddingRight, 10) || 0
+  const paddingTop = Number.parseInt(style.paddingTop, 10) || 0
+  const paddingBottom = Number.parseInt(style.paddingBottom, 10) || 0
+  return {
+    left: paddingLeft,
+    right: paddingRight,
+    top: paddingTop,
+    bottom: paddingBottom,
+  }
+}
+
+function isGreaterThan(a, b, epsilon = 0.01) {
+  return a - b > epsilon
+}

package/src/utils/render.jsx

@@ -199,7 +199,6 @@ export function normalConfig({
     parent: null, // 这个是执行过程中，动态获取的
     dynamicHireRelat: '', // 这个也是执行过程中，动态获取的层级
   }
-  
   let extendAttrObj = parseExtendAttr(config)
   let extendObj = {
     removeCol: findComponent(NOT_NEED_COL_ITEM_META_TYPE, extendAttrObj.renderby) !== -1 || findComponent(NOT_NEED_COL_ITEM_META_TYPE, metaType) !== -1,
@@ -449,6 +448,7 @@ export function getComponentForConfig({messageInstance, config, disabled, getNat
         renderbyComp = <div>not component</div>
       }
     }
+
     component = renderbyComp || component
   }
   return component
@@ -809,7 +809,7 @@ function getFormItemExtendProps(config, lang, params, compProps) {
   }
 }
 
-function getFormItemRule(config, lang, params, compProps) {
+export function getFormItemRule(config, lang, params, compProps) {
   const required = config.requiredFlag == '1'
   const onlyRequiredFlag = config.onlyRequiredFlag
   let trigger = ['blur', 'change']