resolver-egretimp-plus 0.1.113 → 0.1.114

package/package.json

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

package/src/analysisComponent.jsx

@@ -152,6 +152,8 @@ export default {
         })
         ruleExecuter.penddingRules[hireRelat] = null
       }
+      // 使用json-rules-engine书写的规则，打开这边，需要对之前的规则进行注释，并且需要再index.js文件中进行开启 ====end====
+      
       if (props.config?.immediateClickEvent) {
         const unWatch = watch(dataLoad, (val) => {
           if (val) {
@@ -164,7 +166,6 @@ export default {
           immediate: true
         })
       }
-      // 使用json-rules-engine书写的规则，打开这边，需要对之前的规则进行注释，并且需要再index.js文件中进行开启 ====end====
     }
     const onVnodeUnmounted = () => {
       props.config.vmIsBind = false

package/src/components/helper/table.jsx

@@ -40,9 +40,10 @@ export async function tableValidate({
   const currentStart = (page.pageNum - 1) * page.pageSize
   const currentEnd = page.pageNum * page.pageSize
   for (let index = 0; index < list.length; index++) {
+    
     if (index < currentStart || index >= currentEnd) {
       const row = list[index];
-      const configColumns = multiPmPageMetaList[index] || multiPmPageMetaList[index % page.pageSize]
+      const configColumns = multiPmPageMetaList[index] || multiPmPageMetaList[index % page.pageSize] || multiPmPageMetaList[0]
       const rowScope = {row, $index: index}
       for (let j = 0; j < configColumns.length; j++) {
         const columnConfig = configColumns[j];
@@ -58,31 +59,33 @@ export async function tableValidate({
           disabled: calcDisable(columnConfig, props.mode)
         }
         const rules = getFormItemRule(columnConfig, lang, params, compProps, true)
-        const validator = new AsyncValidator({
-          [columnConfig.dynamicHireRelat]: rules
-        })
-        
-        async function toValidate() {
-          try {
-            await validator.validate({[columnConfig.dynamicHireRelat]: row[columnConfig.metaCode]})
-          } catch (error) {
-            return new Promise((resolve, inject) => {
-              setTimeout(() => {
-                let failPageNum = 0
-                if (index) {
-                  failPageNum = parseInt((index + 1) / page.pageSize)
-                  if ((index + 1) % page.pageSize) {
-                    failPageNum ++
+        if (rules && rules.length) {
+          const validator = new AsyncValidator({
+            [columnConfig.dynamicHireRelat]: rules
+          })
+          
+          async function toValidate() {
+            try {
+              await validator.validate({[columnConfig.dynamicHireRelat]: row[columnConfig.metaCode]})
+            } catch (error) {
+              return new Promise((resolve, inject) => {
+                setTimeout(() => {
+                  let failPageNum = 0
+                  if (index) {
+                    failPageNum = parseInt((index + 1) / page.pageSize)
+                    if ((index + 1) % page.pageSize) {
+                      failPageNum ++
+                    }
                   }
-                }
-                page.pageNum = failPageNum
-                inject({})
-              });
-            })
+                  page.pageNum = failPageNum
+                  inject({})
+                });
+              })
+            }
+            return true
           }
-          return true
+          await toValidate()
         }
-        await toValidate()
       }
     }
   }

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

@@ -2,7 +2,6 @@ import { ElText, ElIcon } from 'element-plus'
 import { computed, defineProps, inject, getCurrentInstance, useAttrs, useSlots } from 'vue'
 import { commonPropsType } from '../../utils/index.js'
 import { h, resolveComponent, withModifiers } from 'vue'
-import '../styles/text.scss'
 import { useToolTip } from '../helper/calcTooltip.jsx'
 
 export default {

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

@@ -24,3 +24,7 @@
   text-overflow: ellipsis;
   white-space: nowrap;
 }
+
+.cursor {
+  cursor: pointer;
+}

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

@@ -1,3 +1,20 @@
 .el-text {
   line-height: 1em;
+}
+.resolver-custom-cust-input-wrap {
+  display: flex;
+  width: 100%;
+  align-items: center;
+  justify-content: space-between;
+  min-height: 32px;
+  line-height: 24px;
+  padding: 1px 11px;
+  box-sizing: border-box;
+  border-radius: var(--el-input-border-radius, var(--el-border-radius-base));
+  box-shadow: 0 0 0 1px var(--el-input-border-color, var(--el-border-color)) inset;
+  background: var(--el-input-bg-color, var(--el-fill-color-blank));
+  cursor: 'not-allowed';
+}
+.resolver-custom-is-disabled {
+  background: var(--el-disabled-bg-color);
 }

package/src/components/styles/CustomComponenTable.scss

@@ -1,141 +0,0 @@
-.error-tip-block {
-  & + .el-form-item__error {
-    position: relative;
-  }
-}
-.custom-component-table {
-  --boder-radius: 4px;
-  border-radius: var(--boder-radius);
-  // width: 100%;
-  .el-table, &.el-table {
-    --el-table-header-bg-color: #f5f6f7;
-    --el-table-header-text-color: #646a73;
-  }
-  .el-table--border {
-    border: 1px solid var(--el-table-border-color);
-    border-radius: var(--boder-radius);
-    &::before {
-      width: 0px;
-      // border-left: 1px solid var(--el-table-border-color);
-      // border-radius: var(--boder-radius);
-      // background-color: transparent;
-    }
-    &::after {
-      width: 0px;
-      // border-right: 1px solid var(--el-table-border-color);
-      // border-radius: var(--boder-radius);
-      // background-color: transparent;
-    }
-    .el-table__inner-wrapper {
-      &::before {
-        height: 0px;
-        // border-bottom: 1px solid var(--el-table-border-color);
-        // border-radius: var(--boder-radius);
-        // background-color: transparent;
-      }
-      &::after {
-        height: 0px;
-        // border-top: 1px solid var(--el-table-border-color);
-        // border-radius: var(--boder-radius);
-        // background-color: transparent;
-      }
-      .el-table__border-left-patch {
-        display: none;
-      }
-    }
-    .el-table__cell:last-of-type {
-      border-right: none;
-    }
-    .el-table__body {
-      tbody {
-        tr:last-of-type {
-          .el-table__cell {
-            border-bottom: none;
-          }
-        }
-      }
-    }
-  }
-  .el-table .el-table__cell {
-    padding: 4px 0;
-  }
-  .el-form-item {
-    margin-right: 0;
-    margin-bottom: 0;
-  }
-  thead th {
-    font-weight: 400;
-    height: 40px;
-    .head-span {
-      text-overflow: ellipsis;
-      overflow: hidden;
-      white-space: nowrap;
-    }
-  }
-  th.el-table__cell.is-leaf {
-    border-bottom: none;
-  }
-  td.el-table__cell {
-    color: var(--el-input-text-color,var(--el-text-color-regular));
-  }
-  .el-table__cell {
-    height: 40px;
-    .el-date-editor, .el-date-editor--date{
-      .el-input__wrapper{
-        padding: 0 8px;
-      }
-    }
-    .el-input {
-      display: flex;
-    }
-    .el-input {
-      --el-input-height: 24px;
-    }
-    .el-form-item__label {
-      height: 24px;
-    }
-    .el-form-item__content {
-      min-height: 24px;
-    }
-    .el-select__wrapper, .el-input__wrapper {
-      box-shadow: none;
-      border-bottom: 1px solid var(--el-border-color);
-      padding: 0;
-      border-radius: 0;
-      background-color: transparent;
-      min-height: 24px;
-      &.is-focused {
-        border-color: var(--el-color-primary);
-      }
-      &.is-focus {
-        border-color: var(--el-color-primary);
-      }
-    }
-    .is-error {
-      .el-select__wrapper, .el-input__wrapper {
-        box-shadow: none;
-        border-bottom: 1px solid var(--el-color-danger);
-      }
-    }
-  }
-  .cell {
-    // line-height: 16px;
-  }
-  .pagination-wrap {
-    display: flex;
-  }
-  .hidden-column {
-    border: none;
-    overflow: hidden;
-    // display: none;
-  }
-  .hidden-column + .el-table__cell {
-    // border: none;
-  }
-  .next-hidden-column.end-show-column {
-    border: none;
-  }
-  .clear-index {
-    z-index: unset;
-  }
-}

package/src/components/styles/text.scss

@@ -1,20 +0,0 @@
-.resolver-custom-cust-input-wrap {
-  display: flex;
-  width: 100%;
-  align-items: center;
-  justify-content: space-between;
-  min-height: 32px;
-  line-height: 24px;
-  padding: 1px 11px;
-  box-sizing: border-box;
-  border-radius: var(--el-input-border-radius, var(--el-border-radius-base));
-  box-shadow: 0 0 0 1px var(--el-input-border-color, var(--el-border-color)) inset;
-  background: var(--el-input-bg-color, var(--el-fill-color-blank));
-  cursor: 'not-allowed';
-}
-.resolver-custom-is-disabled {
-  background: var(--el-disabled-bg-color);
-}
-.cursor {
-  cursor: pointer;
-}