easy3wui 1.5.88-beta8 → 1.5.88

package/LICENSE.md

@@ -1,4 +1,4 @@
-
-Copyright (c) 上海同在互联网科技有限公司 版权所有
-
+
+Copyright (c) 上海同在互联网科技有限公司 版权所有
+
 上海同在互联网科技有限公司 版权所有，使用必须获得授权，否则将追究法律责任。

package/README.md

@@ -1,28 +1,28 @@
-# easy3wUI
-easy3w UI 组件
-# 编译
-npm run compile
-# 发布代码
-npm publish
-npm publish --tag V1
-# 测试版发布
-npm publish --tag beta
-
-react-data-grid使用6.0.1版本对应的react@16
-7版本未形成稳定版本，暂时使用6.0.1版本；对应的react@18+版本
-https://www.npmjs.com/
-登录npm
-在终端输入npm login ,在登录前一定要将npm源设置为官方源
-// 官方镜像源
-npm config set registry https://registry.npmjs.org/
-// 淘宝镜像源
-npm config set registry http://registry.npm.taobao.org/
-检查当前npm源：
-npm config get registry
-
-# 生成令牌‌‌操作步骤‌：
-* 登录 npm 官网，进入令牌管理页面（https://www.npmjs.com/settings/(您的用户名)/tokens）。
-* ‌删除旧令牌‌：点击令牌右侧的“Delete”（删除）按钮。
-* ‌创建新令牌‌：点击“Generate New Token”（生成新令牌），输入名称并勾选“Bypass two-factor authentication”（绕过 2FA）。
-* ‌立即复制新令牌‌：创建后立即点击复制按钮，‌避免离开页面‌。
+# easy3wUI
+easy3w UI 组件
+# 编译
+npm run compile
+# 发布代码
+npm publish
+npm publish --tag V1
+# 测试版发布
+npm publish --tag beta
+
+react-data-grid使用6.0.1版本对应的react@16
+7版本未形成稳定版本，暂时使用6.0.1版本；对应的react@18+版本
+https://www.npmjs.com/
+登录npm
+在终端输入npm login ,在登录前一定要将npm源设置为官方源
+// 官方镜像源
+npm config set registry https://registry.npmjs.org/
+// 淘宝镜像源
+npm config set registry http://registry.npm.taobao.org/
+检查当前npm源：
+npm config get registry
+
+# 生成令牌‌‌操作步骤‌：
+* 登录 npm 官网，进入令牌管理页面（https://www.npmjs.com/settings/(您的用户名)/tokens）。
+* ‌删除旧令牌‌：点击令牌右侧的“Delete”（删除）按钮。
+* ‌创建新令牌‌：点击“Generate New Token”（生成新令牌），输入名称并勾选“Bypass two-factor authentication”（绕过 2FA）。
+* ‌立即复制新令牌‌：创建后立即点击复制按钮，‌避免离开页面‌。
 * 配置令牌到 .npmrc 文件,在项目根目录下

package/assets/formPage.css

@@ -37,6 +37,9 @@
 .e3wFormPageWrap .inputDigit .inputNumberBtns .e3wFootBtn {
   margin: 0;
 }
+.e3wFormPageWrap .bf-container {
+  border: 1px solid #eee;
+}
 input.ant-input-number-input {
   text-align: right;
   padding-right: 21px;

package/assets/index.css

@@ -2440,6 +2440,9 @@
 .e3wFormPageWrap .inputDigit .inputNumberBtns .e3wFootBtn {
   margin: 0;
 }
+.e3wFormPageWrap .bf-container {
+  border: 1px solid #eee;
+}
 input.ant-input-number-input {
   text-align: right;
   padding-right: 21px;

package/lib/Easy3wFormPage/indexM.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');
 
@@ -215,23 +215,23 @@ var _easy3wui = require('easy3wui');
 
 var _comonConfig = require('comonConfigPath/comonConfig');
 
-var _Easy3wSpin = require('../Easy3wSpin');
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
-var _Easy3wSpin2 = _interopRequireDefault(_Easy3wSpin);
+// import Easy3wSpin from '../Easy3wSpin';
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
-// import TagSelect from '../Easy3wTagSelect/index.js';
-// import Easy3wUpload from '../../Easy3wUpload';
-// import Easy3wUploadB from '../../Easy3wUploadB';
-// import Easy3wUploadM from '../../Easy3wUploadM';
+// 引入富文本表格功能
 var objOptions = {
   defaultRows: 3, // 默认行数
   defaultColumns: 3, // 默认列数
   withDropdown: false, // 插入表格前是否弹出下拉菜单
   columnResizable: false, // 是否允许拖动调整列宽， 默认false
   exportAttrString: 'style="border: 1"' // 指定输出HTML时附加到table标签上的属性字符串
-}; // 引入富文本表格功能
+};
+// import TagSelect from '../Easy3wTagSelect/index.js';
+// import Easy3wUpload from '../../Easy3wUpload';
+// import Easy3wUploadB from '../../Easy3wUploadB';
+// import Easy3wUploadM from '../../Easy3wUploadM';
 
 _braftEditor2['default'].use((0, _table2['default'])(objOptions)); // 表格
 
@@ -751,7 +751,8 @@ var Easy3wFormPageM = exports.Easy3wFormPageM = function (_Component) {
           readFlag = item.readFlag,
           cmptPros = item.cmptPros,
           disableFlag = item.disableFlag,
-          numberFormat = item.numberFormat;
+          numberFormat = item.numberFormat,
+          fieldId = item.fieldId;
 
       var _ref2 = globalData || {},
           dataDesensitizationEyeFlag = _ref2.dataDesensitizationEyeFlag;
@@ -788,13 +789,30 @@ var Easy3wFormPageM = exports.Easy3wFormPageM = function (_Component) {
       //   return strValue;
       // }
       if (fieldType === 'braftEditor') {
-        return _braftEditor2['default'].createEditorState(value);
+        // 缓存 EditorState，保证每次 render 返回同一个对象引用，
+        // 否则 BraftEditor 受控 value 每次都是新对象，componentWillReceiveProps
+        // 会反复触发 onChange -> setFieldsValue -> 重渲染，形成死循环。
+        var cacheKey = 'braftEditorState_' + fieldId;
+        var cacheRawKey = 'braftEditorStateRaw_' + fieldId;
+        if (Object.prototype.hasOwnProperty.call(_this, cacheKey) && _this[cacheRawKey] === value) {
+          return _this[cacheKey];
+        }
+        var braftContent = _braftEditor2['default'].createEditorState(value);
+        _this[cacheKey] = braftContent;
+        _this[cacheRawKey] = value;
+        return braftContent;
       }
       if (allReadFlag || readFlag) {
         if (fieldType === 'rangePicker' && value instanceof Array) {
           value = value.length ? value.join(' 至 ') : '';
         } else if (fieldType === 'input' || fieldType === 'mobile') {
+          var strValue = value;
           value = _comonConfig.dataDesensitizationFlag ? dataDesensitizationEyeFlag ? value : (0, _easy3wui.Easy3wGetDesensitization)(value) : value;
+          if (fieldType === 'mobile' && value) {
+            var e3wMobileNation = _this.fetchMobileInfo(strValue, fieldId);
+            value = e3wMobileNation ? e3wMobileNation + ' ' + value : value;
+            // console.log('valuevaluevaluevalue', value, e3wMobileNation);
+          }
         }
         return value;
       }
@@ -1045,6 +1063,11 @@ var Easy3wFormPageM = exports.Easy3wFormPageM = function (_Component) {
           });
         }
       }
+      if (fieldType === 'switch') {
+        decoratorObj = (0, _extends3['default'])({}, decoratorObj, {
+          valuePropName: 'checked' // 关键：告诉 Form 取 checked 属性
+        });
+      }
 
       if (cmptPros) {
         if (cmptPros.getValueFromEvent) {
@@ -1692,22 +1715,31 @@ var Easy3wFormPageM = exports.Easy3wFormPageM = function (_Component) {
       var fieldId = item.fieldId,
           required = item.required,
           _item$cmptPros5 = item.cmptPros,
-          cmptPros = _item$cmptPros5 === undefined ? {} : _item$cmptPros5;
+          cmptPros = _item$cmptPros5 === undefined ? {} : _item$cmptPros5,
+          value = item.value;
+      var disabled = cmptPros.disabled;
 
       var addonBeforeCmptPros = item.addonBeforeCmptPros || {};
       addonBeforeCmptPros = (0, _extends3['default'])({ allowClear: false, style: { minWidth: '90px' } }, addonBeforeCmptPros);
       var itemArea = _this.selectHandler({
         cmptPros: (0, _extends3['default'])({
-          onChange: function onChange(value) {
-            return _this.onBlurMobileNation(value, fieldId);
+          onChange: function onChange(strValue) {
+            return _this.onBlurMobileNation(strValue, fieldId);
           },
-          optionLst: _comonConfig.arrMobileAssociation || arrMobileAssociationDefault
+          optionLst: _comonConfig.arrMobileAssociation || arrMobileAssociationDefault,
+          disabled: disabled
         }, addonBeforeCmptPros)
       });
 
+      var strMobileAssociation = '+86';
+      if (value) {
+        strMobileAssociation = _this.fetchMobileInfo(value, fieldId);
+        // value = e3wMobileNation ? `${e3wMobileNation} ${value}` : value;
+        // console.log('valuevaluevaluevalue', value, e3wMobileNation);
+      }
       var decoratorObj = {
         rules: [{ required: required, message: '请选择区号' }],
-        initialValue: '+86'
+        initialValue: strMobileAssociation
       };
       return _react2['default'].createElement(_input2['default'], (0, _extends3['default'])({
         addonBefore: _this.props.form.getFieldDecorator(fieldId + 'AddonBefore', (0, _extends3['default'])({}, decoratorObj))(itemArea),
@@ -1728,16 +1760,52 @@ var Easy3wFormPageM = exports.Easy3wFormPageM = function (_Component) {
         _this.updateMobileInfo(e3wMobile, value);
       }
     }, _this.updateMobileInfo = function (e3wMobile, e3wMobileNation) {
-      var xhr = new XMLHttpRequest();
-      xhr.onreadystatechange = function () {
-        if (xhr.readyState === 4 && xhr.status === 200) {
-          // 请求成功，处理响应数据
+      if (_comonConfig.easy3w4fMobileLibUpdateUrl) {
+        var xhr = new XMLHttpRequest();
+        xhr.onreadystatechange = function () {
+          if (xhr.readyState === 4 && xhr.status === 200) {
+            // 请求成功，处理响应数据
+          }
+        };
+        var data = JSON.stringify({ e3wMobile: e3wMobile, e3wMobileNation: e3wMobileNation });
+        xhr.open('POST', _comonConfig.easy3w4fMobileLibUpdateUrl, true); // 异步请求
+        xhr.setRequestHeader('Content-Type', 'application/json'); // 设置请求头
+        xhr.send(data); // 发送请求
+      }
+    }, _this.fetchMobileInfo = function (value, fieldId) {
+      if (_comonConfig.easy3w4fMobileLibFetchUrl) {
+        // 同步请求，直接返回查询到的 e3wMobileNation（而非 Promise）
+        var cacheKey = fieldId + '-' + value;
+        if (Object.prototype.hasOwnProperty.call(_this, cacheKey)) {
+          // 已查询过，直接返回缓存结果
+          return _this[cacheKey];
         }
-      };
-      var data = JSON.stringify({ e3wMobile: e3wMobile, e3wMobileNation: e3wMobileNation });
-      xhr.open('POST', _comonConfig.easy3w4fMobileLibUpdateUrl, true); // 异步请求
-      xhr.setRequestHeader('Content-Type', 'application/json'); // 设置请求头
-      xhr.send(data); // 发送请求
+        var e3wMobileNation = void 0;
+        var xhr = new XMLHttpRequest();
+        xhr.open('POST', _comonConfig.easy3w4fMobileLibFetchUrl, false); // 同步请求
+        xhr.setRequestHeader('Content-Type', 'application/json'); // 设置请求头
+        try {
+          xhr.send(JSON.stringify({ e3wMobile: value, fieldId: fieldId })); // 发送请求
+          if (xhr.status === 200) {
+            // 请求成功，处理响应数据
+            var obj = JSON.parse(xhr.responseText) || {};
+            if (obj.rspCode === '0000') {
+              var data = obj.data;
+
+              var _ref5 = data || {},
+                  e3wMobileNationRes = _ref5.e3wMobileNation;
+
+              e3wMobileNation = e3wMobileNationRes;
+            }
+          }
+        } catch (e) {
+          e3wMobileNation = undefined;
+        }
+        // 缓存结果，避免重复请求
+        _this[cacheKey] = e3wMobileNation;
+        // 直接返回数据
+        return e3wMobileNation;
+      }
     }, _this.selectHandler = function (item) {
       var cmptPros = item.cmptPros;
       var optionLst = cmptPros.optionLst;
@@ -2266,7 +2334,20 @@ var Easy3wFormPageM = exports.Easy3wFormPageM = 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;
 
@@ -2346,7 +2427,11 @@ var Easy3wFormPageM = exports.Easy3wFormPageM = 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,
@@ -2474,6 +2559,8 @@ var Easy3wFormPageM = exports.Easy3wFormPageM = function (_Component) {
 
   // 更新手机信息
 
+  // 更新手机信息
+
   /** mobile end */
 
   /** select start */
@@ -2608,7 +2695,7 @@ var Easy3wFormPageM = exports.Easy3wFormPageM = function (_Component) {
   Easy3wFormPageM.prototype.render = function render() {
     var spinLoading = this.getLoading();
     return _react2['default'].createElement(
-      _Easy3wSpin2['default'],
+      _easy3wui.Easy3wSpin,
       { noStyle: true, spinLoading: spinLoading },
       _react2['default'].createElement(
         'div',
@@ -2842,7 +2929,8 @@ var Easy3wFormPageTightM = exports.Easy3wFormPageTightM = function (_Component2)
           readFlag = item.readFlag,
           cmptPros = item.cmptPros,
           disableFlag = item.disableFlag,
-          numberFormat = item.numberFormat;
+          numberFormat = item.numberFormat,
+          fieldId = item.fieldId;
       var value = item.value;
 
       if (numberFormat) {
@@ -2852,7 +2940,18 @@ var Easy3wFormPageTightM = exports.Easy3wFormPageTightM = function (_Component2)
         return (0, _numeral2['default'])(value).format('0,0.00');
       }
       if (fieldType === 'braftEditor') {
-        return _braftEditor2['default'].createEditorState(value);
+        // 缓存 EditorState，保证每次 render 返回同一个对象引用，
+        // 否则 BraftEditor 受控 value 每次都是新对象，componentWillReceiveProps
+        // 会反复触发 onChange -> setFieldsValue -> 重渲染，形成死循环。
+        var cacheKey = 'braftEditorState_' + fieldId;
+        var cacheRawKey = 'braftEditorStateRaw_' + fieldId;
+        if (Object.prototype.hasOwnProperty.call(_this2, cacheKey) && _this2[cacheRawKey] === value) {
+          return _this2[cacheKey];
+        }
+        var braftContent = _braftEditor2['default'].createEditorState(value);
+        _this2[cacheKey] = braftContent;
+        _this2[cacheRawKey] = value;
+        return braftContent;
       }
       if (allReadFlag || readFlag) {
         if (fieldType === 'treeSelect') {
@@ -3285,18 +3384,18 @@ var Easy3wFormPageTightM = exports.Easy3wFormPageTightM = function (_Component2)
       rowItems = _this2.touchTransformRowItems(rowItems);
       var threeRowItemFlag = false;
       for (var _iterator2 = rowItems, _isArray2 = Array.isArray(_iterator2), _i3 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-        var _ref5;
+        var _ref7;
 
         if (_isArray2) {
           if (_i3 >= _iterator2.length) break;
-          _ref5 = _iterator2[_i3++];
+          _ref7 = _iterator2[_i3++];
         } else {
           _i3 = _iterator2.next();
           if (_i3.done) break;
-          _ref5 = _i3.value;
+          _ref7 = _i3.value;
         }
 
-        var rItem = _ref5;
+        var rItem = _ref7;
 
         if (rItem.cols.length === 3) {
           threeRowItemFlag = true;
@@ -4197,7 +4296,22 @@ var Easy3wFormPageTightM = exports.Easy3wFormPageTightM = function (_Component2)
     }, _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;
 
@@ -4496,7 +4610,7 @@ var Easy3wFormPageTightM = exports.Easy3wFormPageTightM = function (_Component2)
       noBorderFlag = _comonConfig.noBorderFlag;
     }
     return _react2['default'].createElement(
-      _Easy3wSpin2['default'],
+      _easy3wui.Easy3wSpin,
       { noStyle: true, spinLoading: spinLoading },
       _react2['default'].createElement(
         'div',