resolver-egretimp-plus 0.1.129 → 0.1.131

package/package.json

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

package/src/analysisComponent.jsx

@@ -1,5 +1,5 @@
 import { computed, defineAsyncComponent, getCurrentInstance, inject, onBeforeMount, provide, ref, watch } from 'vue'
-import { COFNGI_KEY_EVENT_FLAG, commonPropsType, definePrivatelyProp, EXECTE_CLICK_EVENT_COMPONENTS, findComponent, getComponentPropsKeys, getComponentSolt, hasOwn, isPlainObject } from './utils/index.js'
+import { COFNGI_KEY_EVENT_FLAG, commonPropsType, definePrivatelyProp, EXECTE_CLICK_EVENT_COMPONENTS, findComponent, getComponentPropsKeys, getComponentSolt, hasOwn, isFunction, isPlainObject } from './utils/index.js'
 import { useVmodels } from './hooks/index.js'
 import { getRenderComponentProps, generateFormItemPolyfill } from './utils/index.js'
 import rulesDriver, { recoverCb } from './rules/rulesDriver'
@@ -10,6 +10,7 @@ import { useRouter } from 'vue-router'
 import { onErrorCaptured } from 'vue'
 import LoadingComponent from './components/loadingComponent/LoadingComponent.vue'
 import { useConfigLoad } from './hooks/configLoad.js'
+import { reactive } from 'vue'
 
 export default {
   name: 'AnalysisComponent',
@@ -53,6 +54,9 @@ export default {
       return ret
     })
     useConfigLoad(props.config)
+    const formContextKey = inject('_formContextKey')
+    const formContext = inject(formContextKey, {})
+    const _isH5 = inject('_isH5')
     const configsSet = inject('_configsSet')
     const ruleExecuter = inject('_ruleExecuter')
     const dialogReq = inject('_dialogReq', {})
@@ -101,7 +105,6 @@ export default {
     const onVnodeMounted = (e) => {
       definePrivatelyProp(props.config, 'vmIsBind', true)
       
-
       if (props.config.onVnodeMounted && typeof props.config.onVnodeMounted === 'function') {
         const context = {
           dataLoad: dataLoad
@@ -259,7 +262,58 @@ export default {
 
     provide('parent', props.config)
 
-    const _isH5 = inject('_isH5')
+    if (OPEN_DATA_RULES) {
+      if (!_isH5?.value && props.config.renderby) {
+        provide(formContextKey, reactive({
+          ...formContext,
+          addField(field) {
+            if (!props.config?._formFields) {
+              definePrivatelyProp(props.config, '_formFields', [])
+            }
+            props.config?._formFields?.push(field)
+            formContext.addField(field)
+          },
+          removeField(field) {
+            const fields = props.config?._formFields
+            if (field.prop && fields) {
+              const idx = fields.indexOf(field)
+              if (idx !== -1) {
+                fields.splice(idx, 1)
+              }
+            }
+            formContext.removeField(field)
+          }
+        }))
+      }
+    } else {
+      // 在自定义组件中使用 form-item 进行声明的校验，这边进行兼容，可以在校验住的时候支持跳转
+      if (!_isH5?.value && props.config.renderby) {
+        provide(formContextKey, reactive({
+          ...formContext,
+          addField(field) {
+            if (field.validate && isFunction(field.validate)) {
+              const originValidate = field.validate
+              field.validate = function (...arg) {
+                const ret = originValidate.apply(this, arg)
+                Promise.resolve().catch
+                return ret?.then(ret => ret)?.catch(err => {
+                  if (isPlainObject(err)) {
+                    Object.keys(err).forEach(key => {
+                      // 在自定义组件中form-item 校验失败之后，err 中绑定的 prop 属性手动替换成config 的dynamicHireRelat
+                      err[props.config.dynamicHireRelat] = err[key]
+                      delete err[key]
+                    })
+                  }
+                  return Promise.reject(err)
+                }) || true
+              }
+            }
+            formContext.addField(field)
+          }
+        }))
+      }
+    }
+
     const onClick = (e, params) => {
       const context = {
         props,

package/src/components/packages-web/CustomComponentNativeTabPane.vue

@@ -67,6 +67,9 @@ const tabPaneProps = computed(() => {
 })
 
 const isLoaded = computed(() => {
+  if (props.config._notOpenLazy) {
+    return true
+  }
   if (OPEN_DATA_RULES) {
     return props?.config?.parent?._loadedNames?.includes(props.config?.metaCode)
   }

package/src/components/packages-web/ElDatePicker.vue

@@ -84,7 +84,11 @@ const value = computed({
     if (valueFormat === 'timestamp') {
       valueFormat = 'x'
     }
-    modeValue.value = dayjs(val).format(valueFormat)
+    let currentVal = dayjs(val).format(valueFormat)
+    if (valueFormat === 'x') {
+      currentVal = dayjs(val).toDate().getTime()
+    }
+    modeValue.value = currentVal
   }
 })
 watch(value, () => {

package/src/rulesOfDate/eventsSupplement.js

@@ -146,9 +146,6 @@ const allInitEvents = {
     const { targetObj: target } = event
     if (!target) return
     const targetObj = `${target}`
-    if (targetObj === 'PreInitiationTab1->tabPane3->tabPlane4->projectTab->purchaseSolution->purchaseContent->forBidPackage->bidPackage->purchaseMethodRow->supplierId') {
-      debugger
-    }
     setFormVal(targetObj, '', mapComp, rootValue, currentPath)
 
   },

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

@@ -6,6 +6,11 @@
   --el-checkbox-disabled-checked-input-border-color: #646A73;
   --el-checkbox-disabled-checked-icon-color: #FFFFFF;
 }
+.el-checkbox__label {
+  max-width: 100%;
+  white-space: break-spaces;
+}
+
 .el-checkbox__inner::after {
   border: 2px solid transparent;
   border-left: 0;

package/src/utils/render.jsx

@@ -567,11 +567,13 @@ export function normalConfig({
 
 // _notOpenLazyopenLazy 属性
 // 如果是自定义组件，父层级组件都不能进行懒加载
-export function travelParentConfigLazy(config) {
-  definePrivatelyProp(config, '_notOpenLazy', true)
-  while (config.parent) {
+export function travelParentConfigLazy(config, cb) {
+  while (config) {
+    if (!config.vmIsBind) {
+      definePrivatelyProp(config, '_notOpenLazy', true)
+      cb?.(config)
+    }
     config = config.parent
-    definePrivatelyProp(config, '_notOpenLazy', true)
   }
 }
 
@@ -1100,7 +1102,7 @@ function generateFormItemPc (config, lang, compProps, params,) {
     if (isFormItem && slotName !== 'label') {
       slots.label = () => createFormLable(config, lang)
     }
-    
+
     return (
       <formItemComp ref={(e) => {definePrivatelyProp(config, 'formItemVm', e)}} key={config.requiredFlag} class="custom-form-item" {...props}>{slots}</formItemComp>
     )
@@ -1174,7 +1176,7 @@ function getFormItemExtendProps(config, lang, params, compProps) {
     style.display = 'none'
   }
   return {
-    prop,
+    prop: config._isValidated ? null : prop, // 如果是已经验证过的，就不需要再进行一次校验了
     rules: getFormItemRule(config, lang, params, compProps),
     class: {
       [`vertical-${config['label-vertical'] || config['labelVertical'] || 'center'}`]: true,

package/src/utils/validateByData.js

@@ -2,36 +2,38 @@ import { nextTick, toRaw } from "vue"
 import { calcDisable } from "./const"
 import { getFormItemRule, isCycleConfig, travelParentConfigLazy } from "./render"
 import AsyncValidator from 'async-validator'
+import { definePrivatelyProp } from "./common"
+import { computed } from "vue"
+import { watch } from "vue"
+import { ref } from "vue"
 
 export async function toValidate({
   rootConfig, rootValue, mode, lang, messageInstance,
   formRef, cb, dynamicMapComp
 }) {
+  const recoverCbs = []
   const flag = await validateConfig({
     validConfig: rootConfig,
     mode,
     lang,
     rootValue,
     dynamicMapComp,
-    messageInstance
+    messageInstance,
+    recoverCbs
   })
-  if (!flag) {
-    if (!cb) {
-      return formRef.value && formRef.value.validate().catch(err => {
-        validFailAction(err, dynamicMapComp)
-        return Promise.reject(err)
-      })
-    }
-    return formRef.value && formRef.value.validate((valid, errInfo) => {
-      errInfo && validFailAction(errInfo, dynamicMapComp)
-      cb && cb(valid, errInfo)
+  if (!cb) {
+    const ret = formRef.value && formRef.value.validate().catch(err => {
+      return Promise.reject(err)
     })
-  } else {
-    if (!cb) {
-      return Promise.resolve(true)
-    }
-    return cb?.(true)
+    ret.finally(() => {
+      recoverCbs?.forEach(cb => cb?.())
+    })
+    return ret
   }
+  return formRef.value && formRef.value.validate((valid, errInfo) => {
+    recoverCbs?.forEach(cb => cb?.())
+    cb && cb(valid, errInfo)
+  })
 }
 
 // 校验的一些附加动作， 例如校验失败，tab需要聚焦到失败tab页面，组件失败，需要展开
@@ -117,9 +119,10 @@ function validateConfig({
   lang,
   rootValue,
   dynamicMapComp,
-  messageInstance
+  messageInstance,
+  recoverCbs = []
 }) {
-  return travelConfig(validConfig, (config) => {
+  return travelConfig(validConfig, async (config) => {
     const compProps = {
       disabled: calcDisable(config, mode)
     }
@@ -136,24 +139,52 @@ function validateConfig({
       messageInstance
     }
     const rules = getFormItemRule(config, lang, params, compProps, true)
-    if (rules && rules.length) {
-      const validator = new AsyncValidator({
-        [config.dynamicHireRelat]: rules
-      })
-      
-      async function toValidate() {
-        try {
-          await validator.validate({[config.dynamicHireRelat]: toRaw(config?.refValue)})
-        } catch (error) {
-          travelParentConfigLazy(config)
-          await nextTick()
-          validFailAction({[config.dynamicHireRelat]: true}, dynamicMapComp)
-          return Promise.reject()
+    let promiseRet = null
+    if (config._formFields) {
+      const valids = config._formFields.map(field => field.validate())
+      promiseRet = Promise.all(valids)
+    } else {
+      if (rules && rules.length) {
+        const validator = new AsyncValidator({
+          [config.dynamicHireRelat]: rules
+        })
+        promiseRet = validator.validate({[config.dynamicHireRelat]: toRaw(config?.refValue)})
+      }
+    }
+    if (promiseRet) {
+      try {
+        await promiseRet
+        // 如果走到这一步，说明验证通过了
+        definePrivatelyProp(config, '_isValidated', true)
+        recoverCbs.push(() => {
+          // 恢复未验证状态
+          config._isValidated = false
+        })
+      } catch (error) {
+        const vnodeLoadedList = ref([]) // 需要设置显示的组件的 config 集合
+        function initVnodeLoadedList(config) {
+          vnodeLoadedList.value.push(config)
         }
-        return true
+        travelParentConfigLazy(config, initVnodeLoadedList)
+        // 所有 config 上的 vmIsBind 为true 的时候表示组件都加载了
+        const isLoaded = computed(() => {
+          return vnodeLoadedList.value.every(config => config.vmIsBind)
+        })
+
+        await new Promise((resolve) => {
+          watch(isLoaded, (val) => {
+            if (val) {
+              resolve()
+            }
+          }, {
+            immediate: true
+          })
+        })
+        validFailAction({[config.dynamicHireRelat]: true}, dynamicMapComp)
+        return Promise.reject()
       }
-      return toValidate()
     }
+    return true
   })
 }