resolver-egretimp-plus 0.0.115 → 0.0.117

package/package.json

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

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

@@ -53,7 +53,7 @@ const initSelEmployee = async () => {
   let feiShuTokens = ''
   const { getToken, loadStyle, loadScript, initSelUser } = useSelEmployeeJs()
   let ret = await Promise.all([getToken(), loadStyle(), loadScript()])
-  if (ret && ret.length) {
+    if (ret && ret.length) {
     feiShuTokens = ret[0]
     if (!feiShuTokens) return
   }
@@ -62,7 +62,7 @@ const initSelEmployee = async () => {
   }, async (val) => {
     if (!val) return
     await seelp(200)
-    console('select-employees modelValue:', modelValue.value)
+    console.log('select-employees modelValue:', modelValue.value)
     const data = modelValue.value ? modelValue.value.split(',') : []
     const initParams = {
       el: `#${metaCode.value}`,

package/src/utils/render.jsx

@@ -408,7 +408,7 @@ export function getRenderComponentProps({ props, component, modelValue, selects,
     ...getRenderCompMargins(config),
     width: commonProps.width || getBuildCompDefaultWidth(config)
   }
-  if (config.hidden === '1') {
+  if (!isHidden(config)) {
     defprops.style.display = 'none'
   }
   
@@ -524,7 +524,7 @@ function elColSpecialProsp (config) {
   const style = {
     textAlign: config.colTextAlign
   }
-  if ((typeof config.hidden === 'boolean' && config.hidden) || config.hidden === '1') {
+  if (!isHidden(config)) {
     style.display = 'none'
   } else {
     if (hasOwn(config, 'elWidth')) {
@@ -666,7 +666,7 @@ function getFormItemExtendProps(config, lang, params) {
   const style = {
     ...getFormItemMargins(config)
   }
-  if (config.hidden === '1') {
+  if (!isHidden(config)) {
     style.display = 'none'
   }
   return {
@@ -687,7 +687,14 @@ function getFormItemRule(config, lang, params) {
   const rules = [{
     // required,
     validator: (rule, value, callback) => {
-      if (config.editFlag === '0') callback()
+      if (config.editFlag === '0') {
+        callback()
+        return
+      }
+      if (!isHidden(config)) {
+        callback()
+        return
+      }
       const val = config.bindValue
       const message = lang.indexOf('zh') > -1 ? `${config.metaNameZh}不能为空` : `${config.metaNameEn} can not be empty`
       if (!onlyRequiredFlag && required) {
@@ -730,7 +737,14 @@ function getFormItemRule(config, lang, params) {
   if (regexPattern?.length) {
     rules.push({
       validator: (rule, value, callback) => {
-        if (config.editFlag === '0') callback()
+        if (config.editFlag === '0') {
+          callback()
+          return
+        }
+        if (!isHidden(config)) {
+          callback()
+          return
+        }
         const val = (config.bindValue === null || config.bindValue === undefined) ? '' : config.bindValue
 
         for (let i = 0; i < regexPattern.length; i++) {
@@ -759,7 +773,17 @@ function getFormItemRule(config, lang, params) {
     validators.forEach(validator => {
       if (isFunction(validator)) {
         rules.push({
-          validator,
+          validator: (rule, value, callback) => {
+            if (config.editFlag === '0') {
+              callback()
+              return
+            }
+            if (!isHidden(config)) {
+              callback()
+              return
+            }
+            return validator(rule, value, callback)
+          },
           trigger: ['blur', 'change']
         })
       }
@@ -848,4 +872,8 @@ export function getComponentPropsKeys(comp, config) {
 
 function isTransCellMobile(config, disabled) {
   return config?.alwaysNative !== '1' && disabled && findComponent(TRANS_CELL_COMPONETS, config.renderby || config.metaType) !== -1
+}
+
+function isHidden({config}) {
+  return (typeof config.hidden === 'boolean' && config.hidden) || config.hidden === '1'
 }