easy3wui 1.5.87 → 1.5.88-beta2

package/assets/card.css

@@ -30,7 +30,7 @@ s {
   width: 3px;
   height: 20px;
   margin: 0 8px -4px 0;
-  background-color: #ad7c59;
+  background-color: var(--primary-color, #ad7c59);
 }
 @media (max-width: 768px) {
   :global .positionDiv {

package/assets/index.css

@@ -93,7 +93,7 @@ s {
   width: 3px;
   height: 20px;
   margin: 0 8px -4px 0;
-  background-color: #ad7c59;
+  background-color: var(--primary-color, #ad7c59);
 }
 @media (max-width: 768px) {
   :global .positionDiv {

package/lib/Easy3wFormPage/indexPC.js

@@ -129,11 +129,11 @@ var _inputNumber2 = _interopRequireDefault(_inputNumber);
 
 require('antd/lib/input-number/style');
 
-var _mention = require('antd/lib/mention');
+var _mentions = require('antd/lib/mentions');
 
-var _mention2 = _interopRequireDefault(_mention);
+var _mentions2 = _interopRequireDefault(_mentions);
 
-require('antd/lib/mention/style');
+require('antd/lib/mentions/style');
 
 var _rate = require('antd/lib/rate');
 
@@ -912,6 +912,11 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
           rules: [(0, _extends3['default'])({ required: isDisableRuleFlag, message: requiredMessage || '\u8BF7' + strRMsg + label }, objValidator)].concat(addRules)
         });
       }
+      if (fieldType === 'switch') {
+        decoratorObj = (0, _extends3['default'])({}, decoratorObj, {
+          valuePropName: 'checked' // 关键：告诉 Form 取 checked 属性
+        });
+      }
       if (itemValue || itemValue === 0) {
         decoratorObj = (0, _extends3['default'])({}, decoratorObj, {
           initialValue: itemValue
@@ -2117,7 +2122,20 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
     }, _this.mentionHandler = function (item) {
       var cmptPros = item.cmptPros;
 
-      return _react2['default'].createElement(_mention2['default'], cmptPros);
+      var _ref6 = cmptPros || {},
+          options = _ref6.options;
+
+      return _react2['default'].createElement(
+        _mentions2['default'],
+        cmptPros,
+        options && options instanceof Array ? options.map(function (option) {
+          return option ? _react2['default'].createElement(
+            _mentions2['default'].Option,
+            { value: option },
+            option
+          ) : '';
+        }) : ''
+      );
     }, _this.rateHandler = function (item) {
       var cmptPros = item.cmptPros;
 
@@ -2197,7 +2215,11 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
     }, _this.descHandler = function (item) {
       var value = item.value;
 
-      return value;
+      return _react2['default'].createElement(
+        'span',
+        null,
+        value
+      );
     }, _this.btnHandler = function (obj) {
       var func = obj.func,
           cName = obj.cName,
@@ -3023,18 +3045,18 @@ var Easy3wFormPageTightPC = exports.Easy3wFormPageTightPC = function (_Component
 
       var threeRowItemFlag = false;
       for (var _iterator2 = rowItems, _isArray2 = Array.isArray(_iterator2), _i3 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-        var _ref6;
+        var _ref7;
 
         if (_isArray2) {
           if (_i3 >= _iterator2.length) break;
-          _ref6 = _iterator2[_i3++];
+          _ref7 = _iterator2[_i3++];
         } else {
           _i3 = _iterator2.next();
           if (_i3.done) break;
-          _ref6 = _i3.value;
+          _ref7 = _i3.value;
         }
 
-        var rItem = _ref6;
+        var rItem = _ref7;
 
         if (rItem.cols.length === 3) {
           threeRowItemFlag = true;
@@ -3934,7 +3956,22 @@ var Easy3wFormPageTightPC = exports.Easy3wFormPageTightPC = function (_Component
     }, _this2.mentionHandler = function (item) {
       var cmptPros = item.cmptPros;
 
-      return _react2['default'].createElement(_mention2['default'], (0, _extends3['default'])({}, cmptPros, { size: 'small' }));
+      var _ref8 = cmptPros || {},
+          options = _ref8.options;
+
+      return _react2['default'].createElement(
+        _mentions2['default'],
+        (0, _extends3['default'])({}, cmptPros, {
+          size: 'small'
+        }),
+        options && options instanceof Array ? options.map(function (option) {
+          return option ? _react2['default'].createElement(
+            _mentions2['default'].Option,
+            { value: option },
+            option
+          ) : '';
+        }) : ''
+      );
     }, _this2.rateHandler = function (item) {
       var cmptPros = item.cmptPros;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy3wui",
-  "version": "1.5.87",
+  "version": "1.5.88-beta2",
   "description": "easy3wui components for react",
   "keywords": [
     "react",