resolver-egretimp-plus 0.1.109 → 0.1.111

package/package.json

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

package/src/components/helper/FormPolyfill.jsx

@@ -0,0 +1,25 @@
+import { formContextKey } from "element-plus"
+import { inject } from "vue"
+
+export default {
+  name: 'FormPolyfill',
+  props: {
+    form: Object
+  },
+  setup(props, { slots }) {
+    const formContext = inject(formContextKey, undefined)
+    formContext.removeField = (field) => {
+      const fields = props.form?.fields
+      if (field.prop && fields) {
+        const idx = fields.indexOf(field)
+        if (idx !== -1) {
+          fields.splice(idx, 1)
+        }
+      }
+    }
+
+    return () => {
+      return slots?.default?.() || null
+    }
+  }
+}

package/src/components/helper/resolver.js

@@ -87,16 +87,37 @@ export async function executeLoadServices(services = [], {
   }
 }
 
-export function normalPageConfigs(pageConfig) {
+export function normalPageConfigs(pageConfig, target) {
   const rootOptionComp = pageConfig?.pmPageMetaList?.find(item => item.metaType === 'PC-root-panel' || item.metaType === 'H5-root-panel')
   if (rootOptionComp) {
     pageConfig.pmPageMetaList = rootOptionComp.pmPageMetaList
     delete rootOptionComp.pmPageMetaList
     pageConfig.rootOptionComp = rootOptionComp
   }
+  if (target) {
+    const targetComp = getTargetComp(pageConfig, target)
+    if (targetComp) {
+      pageConfig.pmPageMetaList = [targetComp]
+    }
+  }
   return pageConfig
 }
 
+// 获取配置的时候，设置了只需要展示指定的部分
+function getTargetComp(config, target = '') {
+  let ret = config
+  if (target) {
+    metaCodes = target.split('->')
+    ret = metaCodes.reduce((ret, metaCode) => {
+      if (ret && ret.pmPageMetaList && Array.isArray(ret.pmPageMetaList)) {
+        return ret.pmPageMetaList.find(item => item.metaCode === metaCode)
+      }
+      return ret
+    }, config)
+  }
+  return ret
+}
+
 export function resetConfigEventInit(dynamicMapComp) {
   Object.keys(dynamicMapComp).forEach(key => {
     if (hasOwn(dynamicMapComp[key], 'eventInit')) {

package/src/components/helper/table.jsx

@@ -27,44 +27,70 @@ export async function tableValidate({
   lang,
   rootValue,
   dynamicMapComp,
-  messageInstance
+  messageInstance,
+  isFrontPage,
+  page
 }) {
+  // 如果没有开启前端分页功能，不需进行表格校验处理
+  if (!isFrontPage) {
+    return true
+  }
   const multiPmPageMetaList = props.config.multiPmPageMetaList || []
   const list = (data || [])
+  const currentStart = (page.pageNum - 1) * page.pageSize
+  const currentEnd = page.pageNum * page.pageSize
   for (let index = 0; index < list.length; index++) {
-    const row = list[index];
-    const configColumns = multiPmPageMetaList[index]
-    const rowScope = {row, $index: index}
-    for (let j = 0; j < configColumns.length; j++) {
-      const columnConfig = configColumns[j];
-      const renderProps = getItemRenderProps(columnConfig, props, rowScope)
-      const params = {
-        lang,
-        rootValue,
-        dynamicMapComp,
-        props: renderProps,
-        messageInstance
-      }
-      const compProps = {
-        disabled: calcDisable(columnConfig, props.mode)
-      }
-      const rules = getFormItemRule(columnConfig, lang, params, compProps)
-      const validator = new AsyncValidator({
-        // [props.config.metaCode]: rules
-        validator: (rule, value, callback) => {
-          callback(new Error('test error'))
-          return
+    if (index < currentStart || index >= currentEnd) {
+      const row = list[index];
+      const configColumns = multiPmPageMetaList[index] || multiPmPageMetaList[index % page.pageSize]
+      const rowScope = {row, $index: index}
+      for (let j = 0; j < configColumns.length; j++) {
+        const columnConfig = configColumns[j];
+        const renderProps = getItemRenderProps(columnConfig, props, rowScope)
+        const params = {
+          lang,
+          rootValue,
+          dynamicMapComp,
+          props: renderProps,
+          messageInstance
         }
-      })
-      const a = await validator.validate({[columnConfig.metaCode]: row[columnConfig.metaCode]})
-      debugger
+        const compProps = {
+          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 ++
+                  }
+                }
+                page.pageNum = failPageNum
+                inject({})
+              });
+            })
+          }
+          return true
+        }
+        await toValidate()
+      }
     }
   }
-  
+  return true
 }
 
 function getItemRenderProps(itemConfig, tableProps, rowScope) {
-  const {row } = rowScope
+  const { row } = rowScope
   return {
     config: itemConfig,
     modelValue: row[itemConfig.metaCode],

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

@@ -1,15 +1,17 @@
 <template>
   <ElForm v-bind="formProps" :ref="refFn" :model="props.modelValue">
-    <ElRow v-bind="rowProps">
-      <Renderer :config="pmPageMetaList" v-model="val"></Renderer>
-    </ElRow>
+    <FormPolyfill :form="rootForm">
+      <ElRow v-bind="rowProps">
+        <Renderer :config="pmPageMetaList" v-model="val"></Renderer>
+      </ElRow>
+    </FormPolyfill>
   </ElForm>
 </template>
 <script setup>
 import Renderer from '../../renderer.jsx'
 import { computed, inject } from "vue"
 import { ElForm, ElRow } from 'element-plus'
-
+import FormPolyfill from '../helper/FormPolyfill.jsx'
 
 const emits = defineEmits(['update:modelValue'])
 const props = defineProps({

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

@@ -36,9 +36,9 @@ export default {
     const isFrontPage = computed(() => {
       return props.config?.frontPageFlag == '1'
     })
-    // 是否配置分页功能     ====== start======
+    // 是否开启分页功能     ====== start======
     const pageable = computed(() => {
-      return props.config?.pageable == '1'
+      return isFrontPage.value || props.config?.pageable == '1'
     })
     // 分页器布局模式
     const pageAlign = computed(() => {
@@ -554,22 +554,20 @@ export default {
     }, {})
 
     function validate() {
-      // lang,
-      // rootValue,
-      // dynamicMapComp,
-      // props,
-      // messageInstance: messageInstance?.value
       return tableValidate({
         props,
         data: unref(modelValue),
-        lang,
+        lang: unref(lang),
         rootValue,
         dynamicMapComp,
-        messageInstance: messageInstance?.value
+        messageInstance: messageInstance?.value,
+        isFrontPage: unref(isFrontPage),
+        page,
       })
     }
 
     const context = reactive({
+      prop: props.config.dynamicHireRelat,
       // ...toRefs(props),
       // $el: formItemRef,
       // size: _size,
@@ -586,7 +584,7 @@ export default {
       validate,
     })
     onMounted(() => {
-      // formContext?.addField(context)
+      formContext?.addField(context)
     })
 
     // 是否配置分页功能     ====== end======

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/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,
@@ -418,6 +417,7 @@ export function getComponentForConfig({messageInstance, config, disabled, getNat
   if (config.isCustom) {
     return () => loadModule(generateVuePath(config.fileId), loadModuleCache, messageInstance)
   }
+  
   // 表格中中的列，是否需要转换为普通形式
   if (isPlainColumn(config, disabled)) {
     return CustomComponentPlain
@@ -449,6 +449,7 @@ export function getComponentForConfig({messageInstance, config, disabled, getNat
         renderbyComp = <div>not component</div>
       }
     }
+
     component = renderbyComp || component
   }
   return component
@@ -809,7 +810,7 @@ function getFormItemExtendProps(config, lang, params, compProps) {
   }
 }
 
-export function getFormItemRule(config, lang, params, compProps) {
+export function getFormItemRule(config, lang, params, compProps, fromCustValid) {
   const required = config.requiredFlag == '1'
   const onlyRequiredFlag = config.onlyRequiredFlag
   let trigger = ['blur', 'change']
@@ -828,7 +829,10 @@ export function getFormItemRule(config, lang, params, compProps) {
         callback()
         return
       }
-      const val = config?.refValue
+      let val = config?.refValue
+      if (fromCustValid) {
+        val = value
+      }
       const message = lang.indexOf('zh') > -1 ? `${config.metaNameZh || ''}不能为空` : `${config.metaNameEn || ''} can not be empty`
       if (!onlyRequiredFlag && required) {
         if (val === '' || val === null || val === undefined || (Array.isArray(val) && !val.length)) {
@@ -879,6 +883,9 @@ export function getFormItemRule(config, lang, params, compProps) {
           return
         }
         const bingdValue = config?.refValue
+        if (fromCustValid) {
+          val = value
+        }
         const val = (bingdValue === null || bingdValue === undefined) ? '' : bingdValue
         if (!val) callback() // 为空不进行正则校验
         for (let i = 0; i < regexPattern.length; i++) {