fmui-base 2.3.69 → 2.3.71

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.3.71：移动端办理列表缓急标签样式
+- 2.3.70：移动端支持表单的规则设置校验
 - 2.3.69：移动端批示意见字段落款支持表单上的自定义样式
 - 2.3.68：批示意见字段支持根据节点设置控制显示隐藏
 - 2.3.67：邮件转发按钮根据流程设置显示隐藏，办理缓急图标颜色支持自定义

package/lib/common/complianceRuleUtil.js

@@ -0,0 +1,145 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.normalizeComplianceRuleExp = normalizeComplianceRuleExp;
+exports.getComplianceFieldNumber = getComplianceFieldNumber;
+exports.evaluateComplianceRules = evaluateComplianceRules;
+exports.buildComplianceDialogText = buildComplianceDialogText;
+/**
+ * 移动端合规规则工具（与 PC form.runtime.util.api.js complianceRuleFunc 对齐）
+ */
+
+function normalizeComplianceRuleExp(exp) {
+  if (exp == null || exp === '') {
+    return '';
+  }
+  exp = String(exp);
+  exp = exp.replace(/&nbsp;/gi, ' ').replace(/&lt;/gi, '<').replace(/&gt;/gi, '>').replace(/&quot;/gi, '"').replace(/&#39;/g, "'").replace(/&amp;/gi, '&');
+  exp = exp.replace(/＞/g, '>').replace(/＜/g, '<').replace(/＝/g, '=').replace(/≥/g, '>=').replace(/≤/g, '<=');
+  return exp;
+}
+
+function getFieldArray(exp) {
+  var fieldArray = [];
+  if (!exp) {
+    return fieldArray;
+  }
+  var stepOne = String(exp).split('[');
+  for (var i = 1; i < stepOne.length; i++) {
+    var stepTwo = stepOne[i].split(']');
+    if (stepTwo.length > 0 && stepTwo[0].length > 0) {
+      fieldArray.push(stepTwo[0]);
+    }
+  }
+  return fieldArray;
+}
+
+function toNumberVal(raw) {
+  if (raw === null || typeof raw === 'undefined' || raw === '') {
+    return 0;
+  }
+  var num = Number(raw);
+  return isNaN(num) ? 0 : num;
+}
+
+/**
+ * 从 editFormData 按唯一名（如表名_字段名）取数值
+ */
+function getComplianceFieldNumber(fieldUniqueName, editFormData) {
+  if (!fieldUniqueName || !editFormData) {
+    return 0;
+  }
+  var name = String(fieldUniqueName).replace(/^\[|\]$/g, '');
+  var mainTblName = editFormData.mainTblName || '';
+  var mainTblData = editFormData.mainTblData || [];
+  for (var i = 0; i < mainTblData.length; i++) {
+    var full = mainTblName + '_' + mainTblData[i].key;
+    if (full === name || mainTblData[i].key === name) {
+      return toNumberVal(mainTblData[i].value);
+    }
+  }
+  var subTbl = editFormData.subTbl || [];
+  for (var s = 0; s < subTbl.length; s++) {
+    var subTblName = subTbl[s].subTblName || '';
+    var rows = subTbl[s].subTblData || [];
+    for (var r = 0; r < rows.length; r++) {
+      var row = rows[r] || [];
+      for (var c = 0; c < row.length; c++) {
+        var subFull = subTblName + '_' + row[c].key;
+        if (subFull === name || row[c].key === name) {
+          return toNumberVal(row[c].value);
+        }
+      }
+    }
+  }
+  return 0;
+}
+
+/**
+ * 评估合规规则列表
+ * @returns {{pass:boolean, blockDeal:string|null, rows:Array}}
+ * blockDeal: 0 仅提醒可继续；1 禁止提交；2/null 不打断
+ */
+function evaluateComplianceRules(ruleList, editFormData) {
+  var rows = [];
+  var checkFlag = true;
+  var blockDeal = null;
+  if (!ruleList || !ruleList.length) {
+    return { pass: true, blockDeal: null, rows: rows };
+  }
+  for (var i = 0; i < ruleList.length; i++) {
+    var rule = ruleList[i] || {};
+    var ruleContent = normalizeComplianceRuleExp(rule.ruleContent);
+    var rulenoDeal = rule.rulenoDeal;
+    var ruletips = rule.ruleTips || '';
+    var rulenotips = rule.ruleNoTips || '';
+    var fieldArray = getFieldArray(ruleContent);
+    for (var k = 0; k < fieldArray.length; k++) {
+      var fieldStr = '[' + fieldArray[k] + ']';
+      var fieldVal = getComplianceFieldNumber(fieldArray[k], editFormData);
+      var replaceVal = fieldVal < 0 ? '(' + fieldVal + ')' : String(fieldVal);
+      ruleContent = ruleContent.split(fieldStr).join(replaceVal);
+    }
+    var pass = false;
+    try {
+      pass = !!eval(ruleContent);
+    } catch (e) {
+      console.error('合规规则表达式执行失败:', rule.ruleName, ruleContent, e);
+      pass = false;
+    }
+    if (pass) {
+      rows.push({
+        ruleName: rule.ruleName || '',
+        tip: ruletips,
+        pass: true
+      });
+    } else {
+      checkFlag = false;
+      rows.push({
+        ruleName: rule.ruleName || '',
+        tip: rulenotips,
+        pass: false
+      });
+      if (blockDeal == null || rulenoDeal == 1 || rulenoDeal === '1') {
+        blockDeal = rulenoDeal;
+      }
+    }
+  }
+  return { pass: checkFlag, blockDeal: blockDeal, rows: rows };
+}
+
+/** 组装弹窗文案 */
+function buildComplianceDialogText(rows) {
+  if (!rows || !rows.length) {
+    return '合规检测未通过';
+  }
+  var lines = [];
+  for (var i = 0; i < rows.length; i++) {
+    var mark = rows[i].pass ? '通过' : '不通过';
+    var tip = rows[i].tip || '';
+    lines.push((rows[i].ruleName || '规则') + '：' + tip + '（' + mark + '）');
+  }
+  return lines.join('\n');
+}

package/lib/db/db.js

@@ -1209,6 +1209,15 @@ context.create('FlowModuleAPI', {
       // });
     }
   },
+  getComplianceRule: {
+    mockUrl: 'query/queryCanBack.json',
+    url: _variables2.default.URLS.getComplianceRule,
+    method: 'GET',
+    header: {
+      Authorization: 'Bearer ' + getLoginUserInfo().token
+    },
+    willFetch: function willFetch() {}
+  },
   getUserSetInfo: {
     mockUrl: 'query/getUserSetInfo.json',
     url: _variables2.default.URLS.getUserSetInfo,

package/lib/db/variables.js

@@ -149,6 +149,7 @@ exports.default = {
         getRelaObjByRelaId: approveUrlPrefix + "getRelaObjByRelaId" + '?', //获取相关对象
         getUrgencyEnum: approveUrlPrefix + "getUrgencyEnum" + '?', //获取枚举
         getSysSettingByMark: approveUrlPrefix + "getSysSettingByMark" + '?', //获取系统设置
+        getComplianceRule: approveUrlPrefix + "getComplianceRule" + '?', //表单合规规则
         getUserSetInfo: urlBasicPrefix + 'setting/userinfo/getUserSetInfo' + '?', //获取用户组织信息
         orgSwitch: urlBasicPrefix + 'front/personal/orgSwitch' + '?', //切换组织
         updateStartUserOrg: approveUrlPrefix + 'updateStartUserOrg' + '?', //更新发起人组织

package/lib/form_info/formInfo.js

@@ -80,6 +80,8 @@ var _filterEmptySubTblRows = require('../form/filterEmptySubTblRows');
 
 var _formValidUtil = require('../common/formValidUtil');
 
+var _complianceRuleUtil = require('../common/complianceRuleUtil');
+
 var _FlowChart = require('./FlowChart');
 
 var _FlowChart2 = _interopRequireDefault(_FlowChart);
@@ -231,6 +233,7 @@ var PageHome = function (_React$Component) {
             dataId: dataId,
             formId: props.formId,
             editFormData: {},
+            complianceRuleContent: null,
             formDataNew: {},
             data: {
                 dataId: "",
@@ -1229,6 +1232,57 @@ var PageHome = function (_React$Component) {
             return "";
         }
 
+        /**
+         * 合规规则闸门（对齐 PC / processInfo）
+         */
+
+    }, {
+        key: 'runComplianceRuleGate',
+        value: function runComplianceRuleGate(onContinue) {
+            var t = this;
+            var formId = t.state.formId;
+            var editFormData = t.state.editFormData;
+            var applyResult = function applyResult(ruleList) {
+                var result = (0, _complianceRuleUtil.evaluateComplianceRules)(ruleList, editFormData);
+                if (result.pass || result.blockDeal == 2 || result.blockDeal === '2' || result.blockDeal == null) {
+                    onContinue();
+                    return;
+                }
+                var text = (0, _complianceRuleUtil.buildComplianceDialogText)(result.rows);
+                if (result.blockDeal == 1 || result.blockDeal === '1') {
+                    _Dialog2.default.alert({
+                        locale: 'zh_CN',
+                        title: '合规检测',
+                        content: text
+                    });
+                    return;
+                }
+                _Dialog2.default.confirm({
+                    locale: 'zh_CN',
+                    title: '合规检测',
+                    content: text,
+                    onConfirm: function onConfirm() {
+                        onContinue();
+                    }
+                });
+            };
+            if (t.state.complianceRuleContent != null) {
+                applyResult(t.state.complianceRuleContent);
+                return;
+            }
+            if (!formId) {
+                onContinue();
+                return;
+            }
+            _db2.default.FlowModuleAPI.getComplianceRule({ formId: formId }).then(function (content) {
+                var list = content || [];
+                t.setState({ complianceRuleContent: list });
+                applyResult(list);
+            }).catch(function () {
+                onContinue();
+            });
+        }
+
         /**
          * 提交按钮的点击事件（获得下一个活动节点列表）
          */
@@ -1330,20 +1384,22 @@ var PageHome = function (_React$Component) {
                 }
             }
             if (operate == 1) {
-                //当提交时校验form表单
-                //表单提交前
-                if (typeof FlowCommon.saveBefore === "function") {
-                    FlowCommon.saveBefore(0, t.state, function (param) {
-                        t.handleSubmitFunc(operate);
-                    }, function (error) {
-                        _Toast2.default.show({
-                            type: 'error',
-                            content: error
+                //当提交时校验form表单（含合规规则）
+                t.runComplianceRuleGate(function () {
+                    //表单提交前
+                    if (typeof FlowCommon.saveBefore === "function") {
+                        FlowCommon.saveBefore(0, t.state, function (param) {
+                            t.handleSubmitFunc(operate);
+                        }, function (error) {
+                            _Toast2.default.show({
+                                type: 'error',
+                                content: error
+                            });
                         });
-                    });
-                } else {
-                    t.handleSubmitFunc(operate);
-                }
+                    } else {
+                        t.handleSubmitFunc(operate);
+                    }
+                });
             } else {
                 t.handleSubmitFunc(operate);
             }

package/lib/msg_list/msgList.js

@@ -183,6 +183,53 @@ var ListItem = function (_React$Component) {
         }
       }
     }
+
+    /** 历史枚举未配 fieldColor 时的默认色（对齐原 label-primary/warn/danger） */
+
+  }, {
+    key: 'getDefaultUrgencyColor',
+    value: function getDefaultUrgencyColor(urgencyCode) {
+      var code = urgencyCode != null ? String(urgencyCode) : '';
+      if (code === '60') {
+        return '#5688ed';
+      }
+      if (code === '70') {
+        return '#ff802c';
+      }
+      if (code === '80' || code === '90') {
+        return '#ff3a39';
+      }
+      return '';
+    }
+
+    /** 办理缓急：文字/边框用配置色，背景同色透明度 0.12 */
+
+  }, {
+    key: 'buildUrgencyLabelStyle',
+    value: function buildUrgencyLabelStyle(fieldColor) {
+      if (!fieldColor) {
+        return null;
+      }
+      var color = String(fieldColor).replace(/^\s+|\s+$/g, '');
+      var bg = '';
+      var m;
+      if (/^#([0-9a-fA-F]{3})$/.test(color)) {
+        m = color.substring(1);
+        bg = 'rgba(' + parseInt(m.charAt(0) + m.charAt(0), 16) + ',' + parseInt(m.charAt(1) + m.charAt(1), 16) + ',' + parseInt(m.charAt(2) + m.charAt(2), 16) + ',0.12)';
+      } else if (/^#([0-9a-fA-F]{6})$/.test(color)) {
+        m = color.substring(1);
+        bg = 'rgba(' + parseInt(m.substring(0, 2), 16) + ',' + parseInt(m.substring(2, 4), 16) + ',' + parseInt(m.substring(4, 6), 16) + ',0.12)';
+      } else {
+        m = color.match(/^rgba?\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)/i);
+        if (m) {
+          bg = 'rgba(' + m[1] + ',' + m[2] + ',' + m[3] + ',0.12)';
+        }
+      }
+      if (!bg) {
+        return null;
+      }
+      return { backgroundColor: bg, border: '1px solid ' + color, color: color };
+    }
   }, {
     key: 'render',
     value: function render() {
@@ -195,21 +242,13 @@ var ListItem = function (_React$Component) {
         //待办
         checkIsNotComplete = true;
         // 枚举禁用时后端不回填 urgencyName，此时不渲染角标（避免空 label 色块）
-        // 优先 fieldColor；无配置时回退历史 60/70/80/90 样式
+        // 统一：文字/边框用色，背景同色透明；无 fieldColor 时用 60/70/80/90 默认色
         if (data.urgencyName) {
-          if (data.fieldColor) {
+          var urgencyColor = data.fieldColor || this.getDefaultUrgencyColor(data.urgency);
+          if (urgencyColor) {
             urgencyTag = true;
             tagClass = 'label';
-            urgencyStyle = { backgroundColor: data.fieldColor, borderColor: data.fieldColor, color: '#fff' };
-          } else if (data.urgency == '90' || data.urgency == '80') {
-            urgencyTag = true;
-            tagClass = 'label label-danger';
-          } else if (data.urgency == '70') {
-            urgencyTag = true;
-            tagClass = 'label label-warn';
-          } else if (data.urgency == '60') {
-            urgencyTag = true;
-            tagClass = 'label label-primary';
+            urgencyStyle = this.buildUrgencyLabelStyle(urgencyColor);
           }
         }
       } else if (data.type == 1) {

package/lib/process_info/processInfo.js

@@ -92,6 +92,8 @@ var _filterEmptySubTblRows = require('../form/filterEmptySubTblRows');
 
 var _formValidUtil = require('../common/formValidUtil');
 
+var _complianceRuleUtil = require('../common/complianceRuleUtil');
+
 var _FlowChart = require('./FlowChart');
 
 var _FlowChart2 = _interopRequireDefault(_FlowChart);
@@ -425,6 +427,7 @@ var PageHome = function (_React$Component) {
             dataId: dataId,
             formId: props.formId,
             editFormData: {},
+            complianceRuleContent: null, // 表单合规规则缓存，null=未加载
             formDataOptlock: '',
             formDataNew: {},
             data: {
@@ -2356,6 +2359,58 @@ var PageHome = function (_React$Component) {
             return "";
         }
 
+        /**
+         * 合规规则闸门（对齐 PC complianceRuleFunc）：
+         * 不通过且处理方式=1 禁止提交；=0 弹窗可继续；=2 不打断
+         */
+
+    }, {
+        key: 'runComplianceRuleGate',
+        value: function runComplianceRuleGate(onContinue) {
+            var t = this;
+            var formId = t.state.formId;
+            var editFormData = t.state.editFormData;
+            var applyResult = function applyResult(ruleList) {
+                var result = (0, _complianceRuleUtil.evaluateComplianceRules)(ruleList, editFormData);
+                if (result.pass || result.blockDeal == 2 || result.blockDeal === '2' || result.blockDeal == null) {
+                    onContinue();
+                    return;
+                }
+                var text = (0, _complianceRuleUtil.buildComplianceDialogText)(result.rows);
+                if (result.blockDeal == 1 || result.blockDeal === '1') {
+                    _Dialog2.default.alert({
+                        locale: 'zh_CN',
+                        title: '合规检测',
+                        content: text
+                    });
+                    return;
+                }
+                _Dialog2.default.confirm({
+                    locale: 'zh_CN',
+                    title: '合规检测',
+                    content: text,
+                    onConfirm: function onConfirm() {
+                        onContinue();
+                    }
+                });
+            };
+            if (t.state.complianceRuleContent != null) {
+                applyResult(t.state.complianceRuleContent);
+                return;
+            }
+            if (!formId) {
+                onContinue();
+                return;
+            }
+            _db2.default.FlowModuleAPI.getComplianceRule({ formId: formId }).then(function (content) {
+                var list = content || [];
+                t.setState({ complianceRuleContent: list });
+                applyResult(list);
+            }).catch(function () {
+                onContinue();
+            });
+        }
+
         /**
          * 提交按钮的点击事件（获得下一个活动节点列表）
          */
@@ -2498,10 +2553,80 @@ var PageHome = function (_React$Component) {
                 }
             }
             if (operate == 1) {
-                //当提交时校验form表单
-                //表单提交前
-                if (typeof FlowCommon.saveBefore === "function") {
-                    FlowCommon.saveBefore(0, t.state, function (param) {
+                //当提交时校验form表单（含合规规则，对齐 PC）
+                t.runComplianceRuleGate(function () {
+                    //表单提交前
+                    if (typeof FlowCommon.saveBefore === "function") {
+                        FlowCommon.saveBefore(0, t.state, function (param) {
+                            //项目开发模块统一扩展
+                            var mobileModuleExt;
+                            try {
+                                if (t.state.module) {
+                                    mobileModuleExt = typeof eval(t.state.module + "_mobileExt") !== 'undefined' ? eval(t.state.module + "_mobileExt") : null;
+                                }
+                            } catch (e) {
+                                // alert("exception: "+e.message);
+                            }
+
+                            if (typeof mobileModuleExt !== 'undefined' && typeof mobileModuleExt["submitBefore"] === "function") {
+                                mobileModuleExt["submitBefore"](t.state, function () {
+                                    //项目开发扩展
+                                    var mobileExt;
+                                    try {
+                                        if (t.state.formKey) {
+                                            mobileExt = typeof eval(t.state.module + "_" + t.state.formKey + "_mobileExt") !== 'undefined' ? eval(t.state.module + "_" + t.state.formKey + "_mobileExt") : null;
+                                        }
+                                    } catch (e) {
+                                        // alert("exception: "+e.message);
+                                    }
+                                    if (typeof mobileExt !== 'undefined' && typeof mobileExt["submitBefore"] === "function") {
+                                        mobileExt["submitBefore"](t.state, function () {
+                                            t.handleSubmitFunc(operate);
+                                        }, function (error) {
+                                            _Toast2.default.show({
+                                                type: 'error',
+                                                content: error
+                                            });
+                                        });
+                                    } else {
+                                        t.handleSubmitFunc(operate);
+                                    }
+                                }, function (error) {
+                                    _Toast2.default.show({
+                                        type: 'error',
+                                        content: error
+                                    });
+                                });
+                            } else {
+                                //项目开发扩展
+                                var mobileExt;
+                                try {
+                                    if (t.state.formKey) {
+                                        mobileExt = typeof eval(t.state.module + "_" + t.state.formKey + "_mobileExt") !== 'undefined' ? eval(t.state.module + "_" + t.state.formKey + "_mobileExt") : null;
+                                    }
+                                } catch (e) {
+                                    // alert("exception: "+e.message);
+                                }
+                                if (typeof mobileExt !== 'undefined' && typeof mobileExt["submitBefore"] === "function") {
+                                    mobileExt["submitBefore"](t.state, function () {
+                                        t.handleSubmitFunc(operate);
+                                    }, function (error) {
+                                        _Toast2.default.show({
+                                            type: 'error',
+                                            content: error
+                                        });
+                                    });
+                                } else {
+                                    t.handleSubmitFunc(operate);
+                                }
+                            }
+                        }, function (error) {
+                            _Toast2.default.show({
+                                type: 'error',
+                                content: error
+                            });
+                        });
+                    } else {
                         //项目开发模块统一扩展
                         var mobileModuleExt;
                         try {
@@ -2564,76 +2689,8 @@ var PageHome = function (_React$Component) {
                                 t.handleSubmitFunc(operate);
                             }
                         }
-                    }, function (error) {
-                        _Toast2.default.show({
-                            type: 'error',
-                            content: error
-                        });
-                    });
-                } else {
-                    //项目开发模块统一扩展
-                    var mobileModuleExt;
-                    try {
-                        if (t.state.module) {
-                            mobileModuleExt = typeof eval(t.state.module + "_mobileExt") !== 'undefined' ? eval(t.state.module + "_mobileExt") : null;
-                        }
-                    } catch (e) {
-                        // alert("exception: "+e.message);
                     }
-
-                    if (typeof mobileModuleExt !== 'undefined' && typeof mobileModuleExt["submitBefore"] === "function") {
-                        mobileModuleExt["submitBefore"](t.state, function () {
-                            //项目开发扩展
-                            var mobileExt;
-                            try {
-                                if (t.state.formKey) {
-                                    mobileExt = typeof eval(t.state.module + "_" + t.state.formKey + "_mobileExt") !== 'undefined' ? eval(t.state.module + "_" + t.state.formKey + "_mobileExt") : null;
-                                }
-                            } catch (e) {
-                                // alert("exception: "+e.message);
-                            }
-                            if (typeof mobileExt !== 'undefined' && typeof mobileExt["submitBefore"] === "function") {
-                                mobileExt["submitBefore"](t.state, function () {
-                                    t.handleSubmitFunc(operate);
-                                }, function (error) {
-                                    _Toast2.default.show({
-                                        type: 'error',
-                                        content: error
-                                    });
-                                });
-                            } else {
-                                t.handleSubmitFunc(operate);
-                            }
-                        }, function (error) {
-                            _Toast2.default.show({
-                                type: 'error',
-                                content: error
-                            });
-                        });
-                    } else {
-                        //项目开发扩展
-                        var mobileExt;
-                        try {
-                            if (t.state.formKey) {
-                                mobileExt = typeof eval(t.state.module + "_" + t.state.formKey + "_mobileExt") !== 'undefined' ? eval(t.state.module + "_" + t.state.formKey + "_mobileExt") : null;
-                            }
-                        } catch (e) {
-                            // alert("exception: "+e.message);
-                        }
-                        if (typeof mobileExt !== 'undefined' && typeof mobileExt["submitBefore"] === "function") {
-                            mobileExt["submitBefore"](t.state, function () {
-                                t.handleSubmitFunc(operate);
-                            }, function (error) {
-                                _Toast2.default.show({
-                                    type: 'error',
-                                    content: error
-                                });
-                            });
-                        } else {
-                            t.handleSubmitFunc(operate);
-                        }
-                    }
-                }
+                });
             } else {
                 t.handleSubmitFunc(operate);
             }

package/lib/process_list/processList.js

@@ -378,6 +378,53 @@ var ListItem = function (_React$Component) {
         }
       }
     }
+
+    /** 历史枚举未配 fieldColor 时的默认色（对齐原 label-primary/warn/danger） */
+
+  }, {
+    key: 'getDefaultUrgencyColor',
+    value: function getDefaultUrgencyColor(urgencyCode) {
+      var code = urgencyCode != null ? String(urgencyCode) : '';
+      if (code === '60') {
+        return '#5688ed';
+      }
+      if (code === '70') {
+        return '#ff802c';
+      }
+      if (code === '80' || code === '90') {
+        return '#ff3a39';
+      }
+      return '';
+    }
+
+    /** 办理缓急：文字/边框用配置色，背景同色透明度 0.12 */
+
+  }, {
+    key: 'buildUrgencyLabelStyle',
+    value: function buildUrgencyLabelStyle(fieldColor) {
+      if (!fieldColor) {
+        return null;
+      }
+      var color = String(fieldColor).replace(/^\s+|\s+$/g, '');
+      var bg = '';
+      var m;
+      if (/^#([0-9a-fA-F]{3})$/.test(color)) {
+        m = color.substring(1);
+        bg = 'rgba(' + parseInt(m.charAt(0) + m.charAt(0), 16) + ',' + parseInt(m.charAt(1) + m.charAt(1), 16) + ',' + parseInt(m.charAt(2) + m.charAt(2), 16) + ',0.12)';
+      } else if (/^#([0-9a-fA-F]{6})$/.test(color)) {
+        m = color.substring(1);
+        bg = 'rgba(' + parseInt(m.substring(0, 2), 16) + ',' + parseInt(m.substring(2, 4), 16) + ',' + parseInt(m.substring(4, 6), 16) + ',0.12)';
+      } else {
+        m = color.match(/^rgba?\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)/i);
+        if (m) {
+          bg = 'rgba(' + m[1] + ',' + m[2] + ',' + m[3] + ',0.12)';
+        }
+      }
+      if (!bg) {
+        return null;
+      }
+      return { backgroundColor: bg, border: '1px solid ' + color, color: color };
+    }
   }, {
     key: 'render',
     value: function render() {
@@ -396,21 +443,13 @@ var ListItem = function (_React$Component) {
           checkIsNotComplete = true;
         }
         // 枚举禁用时后端不回填 urgencyName，此时不渲染角标（避免空 label 色块）
-        // 优先 fieldColor；无配置时回退历史 60/70/80/90 样式
+        // 统一：文字/边框用色，背景同色透明；无 fieldColor 时用 60/70/80/90 默认色（不再用无边框的 label-* 类）
         if (data.urgencyName) {
-          if (data.fieldColor) {
+          var urgencyColor = data.fieldColor || this.getDefaultUrgencyColor(data.urgency);
+          if (urgencyColor) {
             urgencyTag = true;
             tagClass = 'label';
-            urgencyStyle = { backgroundColor: data.fieldColor, borderColor: data.fieldColor, color: '#fff' };
-          } else if (data.urgency == '90' || data.urgency == '80') {
-            urgencyTag = true;
-            tagClass = 'label label-danger';
-          } else if (data.urgency == '70') {
-            urgencyTag = true;
-            tagClass = 'label label-warn';
-          } else if (data.urgency == '60') {
-            urgencyTag = true;
-            tagClass = 'label label-primary';
+            urgencyStyle = this.buildUrgencyLabelStyle(urgencyColor);
           }
         }
       } else if (data.listTabType == 1) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fmui-base",
-  "version": "2.3.69",
+  "version": "2.3.71",
   "title": "fmui-base",
   "description": "fmui移动端组件",
   "main": "lib/index.js",