resolver-egretimp-plus 0.0.295 → 0.0.297

package/package.json

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

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

@@ -51,3 +51,4 @@
 @import './cycle.scss';
 @import './radio.scss';
 @import './popper.scss';
+@import './tag.scss';

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

@@ -0,0 +1,6 @@
+.el-tag {
+  --el-tag-font-size: 14px;
+  &.el-tag--info {
+    --el-tag-text-color: #1f2329;
+  }
+}

package/src/utils/render.jsx

@@ -669,7 +669,7 @@ function generateFormItemPc (config, lang, compProps, params,) {
     }
     props = {
       ...props,
-      ...getFormItemExtendProps(config, lang, params)
+      ...getFormItemExtendProps(config, lang, params, compProps)
     }
     // labelWidth 需要特殊处理
     if (hasOwn(props, 'labelWidth')) {
@@ -727,7 +727,7 @@ function generateFormItemH5(config, lang, compProps, params = {}) {
     messageInstance,
     hidemessage: config?.hidemessage == '1' ? true : false,
     hideasterisk: config?.hideasterisk == '1' ? true : false,
-    ...getFormItemExtendProps(config, lang, params),
+    ...getFormItemExtendProps(config, lang, params, compProps),
   }
   // labelWidth 需要特殊处理
   if (hasOwn(config, 'labelWidth')) {
@@ -771,7 +771,7 @@ export function generateFormItemPolyfill(config, lang, compProps, _isH5, params)
   }
 }
 
-function getFormItemExtendProps(config, lang, params) {
+function getFormItemExtendProps(config, lang, params, compProps) {
   const prop = config.dynamicHireRelat || ''
   // const propAttr = config.dynamicHireRelat ? config.dynamicHireRelat?.split('->') : []
   // const prop = propAttr.join('->')
@@ -783,7 +783,7 @@ function getFormItemExtendProps(config, lang, params) {
   }
   return {
     prop,
-    rules: getFormItemRule(config, lang, params),
+    rules: getFormItemRule(config, lang, params, compProps),
     class: {
       [`vertical-${config['label-vertical'] || config['labelVertical'] || 'center'}`]: true,
       'content-right': config.contentRight,
@@ -794,7 +794,7 @@ function getFormItemExtendProps(config, lang, params) {
   }
 }
 
-function getFormItemRule(config, lang, params) {
+function getFormItemRule(config, lang, params, compProps) {
   const required = config.requiredFlag === '1'
   const onlyRequiredFlag = config.onlyRequiredFlag
   let trigger = ['blur', 'change']
@@ -805,7 +805,7 @@ function getFormItemRule(config, lang, params) {
   const rules = [{
     // required,
     validator: (rule, value, callback) => {
-      if (config.editFlag === '0' && config.alongValidate != '1') {
+      if (compProps?.disabled && config.alongValidate != '1') {
         callback()
         return
       }
@@ -855,7 +855,7 @@ function getFormItemRule(config, lang, params) {
   if (regexPattern?.length) {
     rules.push({
       validator: (rule, value, callback) => {
-        if (config.editFlag === '0' && config.alongValidate != '1') {
+        if (compProps?.disabled && config.alongValidate != '1') {
           callback()
           return
         }
@@ -893,7 +893,7 @@ function getFormItemRule(config, lang, params) {
       if (isFunction(validator)) {
         rules.push({
           validator: (rule, value, callback) => {
-            if (config.editFlag === '0' && config.alongValidate != '1') {
+            if (compProps?.disabled && config.alongValidate != '1') {
               callback()
               return
             }