easy3wui 1.5.89-beta8 → 1.5.89

package/assets/formPage.css

@@ -77,40 +77,40 @@
 .e3wFormPageWrapPC .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper .e3wFootBtn:first-child {
   margin-left: 0;
 }
-.approval_flag_only .e3wFormPageWrapPC .bf-container {
+.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .bf-container {
   border: 1px solid #eee;
 }
-.approval_flag_only .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper {
+.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper {
   border-bottom: 1px solid var(--primary-color);
   height: auto;
 }
-.approval_flag_only .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper textarea {
+.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper textarea {
   border: none;
   padding: 0;
 }
-.approval_flag_only .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper .bf-container {
+.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper .bf-container {
   border: none;
 }
-.approval_flag_only .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper .bf-container .public-DraftEditor-content > div {
+.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper .bf-container .public-DraftEditor-content > div {
   padding-bottom: 0;
 }
-.approval_flag_only .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper .bf-container .public-DraftEditor-content {
+.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper .bf-container .public-DraftEditor-content {
   padding: 0;
 }
-.approval_flag_only .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper .bf-content {
+.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper .bf-content {
   padding-bottom: 0;
 }
-.approval_flag_only .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-fieldtype="e3wFormCol_strTemplate"] .e3wFormStrTemplate .ant-form-item > .ant-form-item-control-wrapper {
+.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-fieldtype="e3wFormCol_strTemplate"] .e3wFormStrTemplate .ant-form-item > .ant-form-item-control-wrapper {
   width: 100%;
   height: auto;
 }
-.approval_flag_only .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-fieldtype="e3wFormCol_strTemplate"] .e3wFormStrTemplate .ant-form-item > .ant-form-item-control-wrapper .e3wFootBtn:first-child {
+.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-fieldtype="e3wFormCol_strTemplate"] .e3wFormStrTemplate .ant-form-item > .ant-form-item-control-wrapper .e3wFootBtn:first-child {
   margin-left: 0;
 }
-.approval_flag_only .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"][data-fieldtype="e3wFormCol_strTemplate"] .e3wFormStrTemplate .ant-form-item > .ant-form-item-control-wrapper {
+.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"][data-fieldtype="e3wFormCol_strTemplate"] .e3wFormStrTemplate .ant-form-item > .ant-form-item-control-wrapper {
   border-bottom: 1px solid var(--primary-color);
 }
-.approval_flag_only .e3wFormPageWrapPC .ant-row.ant-form-item {
+.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .ant-row.ant-form-item {
   display: -ms-flexbox;
   display: flex;
   -ms-flex-direction: row;

package/assets/index.css

@@ -2561,40 +2561,40 @@
 .e3wFormPageWrapPC .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper .e3wFootBtn:first-child {
   margin-left: 0;
 }
-.approval_flag_only .e3wFormPageWrapPC .bf-container {
+.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .bf-container {
   border: 1px solid #eee;
 }
-.approval_flag_only .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper {
+.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper {
   border-bottom: 1px solid var(--primary-color);
   height: auto;
 }
-.approval_flag_only .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper textarea {
+.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper textarea {
   border: none;
   padding: 0;
 }
-.approval_flag_only .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper .bf-container {
+.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper .bf-container {
   border: none;
 }
-.approval_flag_only .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper .bf-container .public-DraftEditor-content > div {
+.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper .bf-container .public-DraftEditor-content > div {
   padding-bottom: 0;
 }
-.approval_flag_only .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper .bf-container .public-DraftEditor-content {
+.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper .bf-container .public-DraftEditor-content {
   padding: 0;
 }
-.approval_flag_only .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper .bf-content {
+.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper .bf-content {
   padding-bottom: 0;
 }
-.approval_flag_only .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-fieldtype="e3wFormCol_strTemplate"] .e3wFormStrTemplate .ant-form-item > .ant-form-item-control-wrapper {
+.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-fieldtype="e3wFormCol_strTemplate"] .e3wFormStrTemplate .ant-form-item > .ant-form-item-control-wrapper {
   width: 100%;
   height: auto;
 }
-.approval_flag_only .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-fieldtype="e3wFormCol_strTemplate"] .e3wFormStrTemplate .ant-form-item > .ant-form-item-control-wrapper .e3wFootBtn:first-child {
+.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-fieldtype="e3wFormCol_strTemplate"] .e3wFormStrTemplate .ant-form-item > .ant-form-item-control-wrapper .e3wFootBtn:first-child {
   margin-left: 0;
 }
-.approval_flag_only .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"][data-fieldtype="e3wFormCol_strTemplate"] .e3wFormStrTemplate .ant-form-item > .ant-form-item-control-wrapper {
+.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"][data-fieldtype="e3wFormCol_strTemplate"] .e3wFormStrTemplate .ant-form-item > .ant-form-item-control-wrapper {
   border-bottom: 1px solid var(--primary-color);
 }
-.approval_flag_only .e3wFormPageWrapPC .ant-row.ant-form-item {
+.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .ant-row.ant-form-item {
   display: -ms-flexbox;
   display: flex;
   -ms-flex-direction: row;

package/lib/Easy3wFormPage/indexPC.js

@@ -683,7 +683,7 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
           var strValue = value;
           value = _comonConfig.dataDesensitizationFlag ? dataDesensitizationEyeFlag ? value : (0, _easy3wui.Easy3wGetDesensitization)(value) : value;
           if (fieldType === 'mobile' && value) {
-            var e3wMobileNation = _this.fetchMobileInfo(strValue, fieldId);
+            var e3wMobileNation = _this.fetchMobileInfo(strValue, fieldId) || '+86';
             value = e3wMobileNation ? e3wMobileNation + ' ' + value : value;
             // console.log('valuevaluevaluevalue', value, e3wMobileNation);
           }
@@ -1390,15 +1390,20 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
     }, _this.getColItem = function (colObj, formItemLayout, disableCheckFlag) {
       var allReadFlag = _this.props.allReadFlag;
       var fieldType = colObj.fieldType,
-          readFlag = colObj.readFlag,
           disableFlag = colObj.disableFlag,
           cmptPros = colObj.cmptPros;
+      var readFlag = colObj.readFlag;
 
       var _ref6 = cmptPros || {},
           disabled = _ref6.disabled,
           templateArray = _ref6.templateArray,
           isRead = _ref6.isRead;
 
+      var isApprovalFlag = document.body.innerHTML.includes('data-e3wpagetype="approval"');
+      if (isApprovalFlag && disableFlag && (fieldType === 'input' || fieldType === 'textarea' || fieldType === 'checkBox' || fieldType === 'radio')) {
+        colObj.readFlag = true;
+        readFlag = true;
+      }
       var itemArea = _this.getItemArea(colObj);
       var itemValue = _this.getItemValue(colObj);
       var afterBtns = _this.getAfterBtn(colObj);
@@ -1652,7 +1657,8 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
           required = item.required,
           _item$cmptPros4 = item.cmptPros,
           cmptPros = _item$cmptPros4 === undefined ? {} : _item$cmptPros4,
-          value = item.value;
+          value = item.value,
+          readFlag = item.readFlag;
       var disabled = cmptPros.disabled;
 
       var addonBeforeCmptPros = item.addonBeforeCmptPros || {};
@@ -1666,18 +1672,18 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
           disabled: disabled
         }, addonBeforeCmptPros)
       });
-      var strMobileAssociation = '+86';
+      var strMobileAssociation = '';
       if (value) {
-        strMobileAssociation = _this.fetchMobileInfo(value, fieldId);
+        strMobileAssociation = _this.fetchMobileInfo(value, fieldId) || '+86';
         // value = e3wMobileNation ? `${e3wMobileNation} ${value}` : value;
         // console.log('valuevaluevaluevalue', value, e3wMobileNation);
       }
       var decoratorObj = {
         rules: [{ required: required, message: '请选择区号' }],
-        initialValue: strMobileAssociation
+        initialValue: readFlag ? 'easy3wView' : strMobileAssociation
       };
       return _react2['default'].createElement(_input2['default'], (0, _extends3['default'])({
-        addonBefore: _this.props.form.getFieldDecorator(fieldId + 'AddonBefore', (0, _extends3['default'])({}, decoratorObj))(itemArea),
+        addonBefore: _this.props.form.getFieldDecorator(readFlag ? fieldId + 'AddonBeforeEasy3wView' : fieldId + 'AddonBefore', (0, _extends3['default'])({}, decoratorObj))(itemArea),
         onBlur: function onBlur(e) {
           return _this.onBlurMobile(e, fieldId);
         }
@@ -1708,6 +1714,7 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
         xhr.send(data); // 发送请求
       }
     }, _this.fetchMobileInfo = function (value, fieldId) {
+      var e3wMobileNation = void 0;
       if (_comonConfig.easy3w4fMobileLibFetchUrl) {
         // 同步请求，直接返回查询到的 e3wMobileNation（而非 Promise）
         var cacheKey = fieldId + '-' + value;
@@ -1715,7 +1722,6 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
           // 已查询过，直接返回缓存结果
           return _this[cacheKey];
         }
-        var e3wMobileNation = void 0;
         var xhr = new XMLHttpRequest();
         xhr.open('POST', _comonConfig.easy3w4fMobileLibFetchUrl, false); // 同步请求
         xhr.setRequestHeader('Content-Type', 'application/json'); // 设置请求头
@@ -1739,8 +1745,9 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
         // 缓存结果，避免重复请求
         _this[cacheKey] = e3wMobileNation;
         // 直接返回数据
-        return e3wMobileNation;
       }
+      e3wMobileNation = e3wMobileNation || '+86';
+      return e3wMobileNation;
     }, _this.selectHandler = function (item) {
       var cmptPros = item.cmptPros;
       var optionLst = cmptPros.optionLst;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy3wui",
-  "version": "1.5.89-beta8",
+  "version": "1.5.89",
   "description": "easy3wui components for react",
   "keywords": [
     "react",