easy3wui 1.5.77-beta2 → 1.5.78-beta.1

package/README.md

@@ -6,4 +6,13 @@ npm run compile
 npm publish
 
 react-data-grid使用6.0.1版本对应的react@16
-7版本未形成稳定版本，暂时使用6.0.1版本；对应的react@18+版本
+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 https://registry.npmmirror.com/
+检查当前npm源：
+npm config get registry

package/assets/formPage.css

@@ -138,15 +138,32 @@ input.ant-input-number-input {
   float: right;
   white-space: nowrap;
 }
+@media (max-width: 768px) and (orientation: portrait) {
+  :global .ant-form-item-label::after {
+    content: "：";
+    color: rgba(0, 0, 0, 0.75);
+  }
+}
+@media (max-width: 768px) and (orientation: landscape) {
+  :global .ant-form-item-label::after {
+    content: "";
+  }
+}
 @media (max-width: 768px) {
   :global .ant-form-item-label {
     padding: 0;
-    height: 30px;
+    height: auto;
     line-height: 30px;
     text-align: right;
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
+    white-space: wrap;
+    overflow: visible;
+  }
+  :global .ant-form-item-label .ant-badge {
+    display: none;
+  }
+  :global .ant-form-item-label label {
+    display: inline-block;
+    width: 80%;
   }
   :global .ant-form-item-control {
     line-height: 30px;
@@ -157,9 +174,6 @@ input.ant-input-number-input {
   :global .ant-form-item-control-wrapper {
     width: unset;
   }
-  :global .ant-form-item-label::after {
-    content: "：";
-  }
   :global .ant-col-6 {
     width: 25% !important;
   }
@@ -171,6 +185,7 @@ input.ant-input-number-input {
   }
   :global .ant-form-item {
     font-size: 12px !important;
+    margin-bottom: 8px !important;
   }
   :global .ant-radio-wrapper {
     font-size: 12px !important;

package/assets/index.css

@@ -2546,15 +2546,32 @@ input.ant-input-number-input {
   float: right;
   white-space: nowrap;
 }
+@media (max-width: 768px) and (orientation: portrait) {
+  :global .ant-form-item-label::after {
+    content: "：";
+    color: rgba(0, 0, 0, 0.75);
+  }
+}
+@media (max-width: 768px) and (orientation: landscape) {
+  :global .ant-form-item-label::after {
+    content: "";
+  }
+}
 @media (max-width: 768px) {
   :global .ant-form-item-label {
     padding: 0;
-    height: 30px;
+    height: auto;
     line-height: 30px;
     text-align: right;
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
+    white-space: wrap;
+    overflow: visible;
+  }
+  :global .ant-form-item-label .ant-badge {
+    display: none;
+  }
+  :global .ant-form-item-label label {
+    display: inline-block;
+    width: 80%;
   }
   :global .ant-form-item-control {
     line-height: 30px;
@@ -2565,9 +2582,6 @@ input.ant-input-number-input {
   :global .ant-form-item-control-wrapper {
     width: unset;
   }
-  :global .ant-form-item-label::after {
-    content: "：";
-  }
   :global .ant-col-6 {
     width: 25% !important;
   }
@@ -2579,6 +2593,7 @@ input.ant-input-number-input {
   }
   :global .ant-form-item {
     font-size: 12px !important;
+    margin-bottom: 8px !important;
   }
   :global .ant-radio-wrapper {
     font-size: 12px !important;

package/lib/Easy3wCard/index.js

@@ -2,74 +2,23 @@
 
 exports.__esModule = true;
 
-var _classCallCheck2 = require('babel-runtime/helpers/classCallCheck');
+var _indexM = require('./indexM');
 
-var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
+var _indexM2 = _interopRequireDefault(_indexM);
 
-var _possibleConstructorReturn2 = require('babel-runtime/helpers/possibleConstructorReturn');
+var _indexPC = require('./indexPC');
 
-var _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2);
-
-var _inherits2 = require('babel-runtime/helpers/inherits');
-
-var _inherits3 = _interopRequireDefault(_inherits2);
-
-var _react = require('react');
-
-var _react2 = _interopRequireDefault(_react);
-
-var _card = require('antd/lib/card');
-
-var _card2 = _interopRequireDefault(_card);
-
-require('antd/lib/card/style');
-
-var _classnames = require('classnames');
-
-var _classnames2 = _interopRequireDefault(_classnames);
-
-var _comonConfig = require('comonConfigPath/comonConfig');
+var _indexPC2 = _interopRequireDefault(_indexPC);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
-var _ref = _comonConfig.objEasy3wUIConfig || {},
-    objEasy3wCard = _ref.objEasy3wCard;
-
-var _ref2 = objEasy3wCard || {},
-    size = _ref2.size;
-
-var Easy3wCard = function (_Component) {
-  (0, _inherits3['default'])(Easy3wCard, _Component);
-
-  function Easy3wCard() {
-    (0, _classCallCheck3['default'])(this, Easy3wCard);
-    return (0, _possibleConstructorReturn3['default'])(this, _Component.apply(this, arguments));
-  }
-
-  Easy3wCard.prototype.render = function render() {
-    var _props = this.props,
-        label = _props.label,
-        children = _props.children;
-
-    return _react2['default'].createElement(
-      _card2['default'],
-      {
-        title: label ? _react2['default'].createElement(
-          'span',
-          { className: (0, _classnames2['default'])(['e3wCardSpanCardTitle']) },
-          _react2['default'].createElement('s', null),
-          label
-        ) : '',
-        bordered: false,
-        className: (0, _classnames2['default'])(['e3wCardForm']),
-        size: size || 'default'
-      },
-      children
-    );
-  };
-
-  return Easy3wCard;
-}(_react.Component);
+var isMobile = window.matchMedia('(max-width: 768px)').matches;
+var Easy3wCard = void 0;
+if (isMobile) {
+  Easy3wCard = _indexPC2['default'];
+} else {
+  Easy3wCard = _indexM2['default'];
+}
 
 exports['default'] = Easy3wCard;
 module.exports = exports['default'];

package/lib/Easy3wCard/indexM.js

@@ -0,0 +1,80 @@
+'use strict';
+
+exports.__esModule = true;
+
+var _classCallCheck2 = require('babel-runtime/helpers/classCallCheck');
+
+var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
+
+var _possibleConstructorReturn2 = require('babel-runtime/helpers/possibleConstructorReturn');
+
+var _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2);
+
+var _inherits2 = require('babel-runtime/helpers/inherits');
+
+var _inherits3 = _interopRequireDefault(_inherits2);
+
+var _react = require('react');
+
+var _react2 = _interopRequireDefault(_react);
+
+var _card = require('antd/lib/card');
+
+var _card2 = _interopRequireDefault(_card);
+
+require('antd/lib/card/style');
+
+var _classnames = require('classnames');
+
+var _classnames2 = _interopRequireDefault(_classnames);
+
+var _comonConfig = require('comonConfigPath/comonConfig');
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
+
+var _ref = _comonConfig.objEasy3wUIConfig || {},
+    objEasy3wCard = _ref.objEasy3wCard;
+
+var _ref2 = objEasy3wCard || {},
+    size = _ref2.size;
+
+var Easy3wCardM = function (_Component) {
+  (0, _inherits3['default'])(Easy3wCardM, _Component);
+
+  function Easy3wCardM() {
+    (0, _classCallCheck3['default'])(this, Easy3wCardM);
+    return (0, _possibleConstructorReturn3['default'])(this, _Component.apply(this, arguments));
+  }
+
+  Easy3wCardM.prototype.render = function render() {
+    var _props = this.props,
+        label = _props.label,
+        children = _props.children,
+        mobileShowFlag = _props.mobileShowFlag;
+
+    return _react2['default'].createElement(
+      _react2['default'].Fragment,
+      null,
+      mobileShowFlag === false ? '' : _react2['default'].createElement(
+        _card2['default'],
+        {
+          title: label ? _react2['default'].createElement(
+            'span',
+            { className: (0, _classnames2['default'])(['e3wCardSpanCardTitle']) },
+            _react2['default'].createElement('s', null),
+            label
+          ) : '',
+          bordered: false,
+          className: (0, _classnames2['default'])(['e3wCardForm']),
+          size: size || 'default'
+        },
+        children
+      )
+    );
+  };
+
+  return Easy3wCardM;
+}(_react.Component);
+
+exports['default'] = Easy3wCardM;
+module.exports = exports['default'];

package/lib/Easy3wCard/indexPC.js

@@ -0,0 +1,75 @@
+'use strict';
+
+exports.__esModule = true;
+
+var _classCallCheck2 = require('babel-runtime/helpers/classCallCheck');
+
+var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
+
+var _possibleConstructorReturn2 = require('babel-runtime/helpers/possibleConstructorReturn');
+
+var _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2);
+
+var _inherits2 = require('babel-runtime/helpers/inherits');
+
+var _inherits3 = _interopRequireDefault(_inherits2);
+
+var _react = require('react');
+
+var _react2 = _interopRequireDefault(_react);
+
+var _card = require('antd/lib/card');
+
+var _card2 = _interopRequireDefault(_card);
+
+require('antd/lib/card/style');
+
+var _classnames = require('classnames');
+
+var _classnames2 = _interopRequireDefault(_classnames);
+
+var _comonConfig = require('comonConfigPath/comonConfig');
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
+
+var _ref = _comonConfig.objEasy3wUIConfig || {},
+    objEasy3wCard = _ref.objEasy3wCard;
+
+var _ref2 = objEasy3wCard || {},
+    size = _ref2.size;
+
+var Easy3wCardPC = function (_Component) {
+  (0, _inherits3['default'])(Easy3wCardPC, _Component);
+
+  function Easy3wCardPC() {
+    (0, _classCallCheck3['default'])(this, Easy3wCardPC);
+    return (0, _possibleConstructorReturn3['default'])(this, _Component.apply(this, arguments));
+  }
+
+  Easy3wCardPC.prototype.render = function render() {
+    var _props = this.props,
+        label = _props.label,
+        children = _props.children;
+
+    return _react2['default'].createElement(
+      _card2['default'],
+      {
+        title: label ? _react2['default'].createElement(
+          'span',
+          { className: (0, _classnames2['default'])(['e3wCardSpanCardTitle']) },
+          _react2['default'].createElement('s', null),
+          label
+        ) : '',
+        bordered: false,
+        className: (0, _classnames2['default'])(['e3wCardForm']),
+        size: size || 'default'
+      },
+      children
+    );
+  };
+
+  return Easy3wCardPC;
+}(_react.Component);
+
+exports['default'] = Easy3wCardPC;
+module.exports = exports['default'];

package/lib/Easy3wFormPage/indexM.js

@@ -354,7 +354,7 @@ var Easy3wFormPageM = exports.Easy3wFormPageM = function (_Component) {
       // null 或 undefined
       if (value === null || value === undefined) return false;
       // 空字符串
-      if (typeof value === 'string' && value.trim() === '') return false;
+      if (typeof value === 'string' && value.length === 0) return false;
       // 空数组
       if (Array.isArray(value) && value.length === 0) return false;
       // 空对象（排除数组和 null）
@@ -433,16 +433,16 @@ var Easy3wFormPageM = exports.Easy3wFormPageM = function (_Component) {
         var newRowItems = [];
         for (var i = 0; i < finalList.length; i++) {
           var item = finalList[i];
-          if (!arrNoRowType.includes(item.fieldType)) {
+          if (!arrNoRowType.includes(item.fieldType) || item && item.value && typeof item.value !== 'string') {
             newRowItems.push({ cols: [item] });
             continue;
           }
-          if (item && item.value && item.value.replace(/[^\x00-\xff]/g, 'xx').length > 16) {
+          if (item && item.value && item.value.replace(/[^\x00-\xff]/g, 'xx').length > 12) {
             newRowItems.push({ cols: [item] });
             continue;
           }
           var next = finalList[i + 1];
-          if (next && arrNoRowType.includes(next.fieldType) && next && next.value && typeof next.value === 'string' && next.value.replace(/[^\x00-\xff]/g, 'xx').length <= 16) {
+          if (next && arrNoRowType.includes(next.fieldType) && next && next.value && typeof next.value === 'string' && next.value.replace(/[^\x00-\xff]/g, 'xx').length <= 12) {
             newRowItems.push({ cols: [item, next] });
             i++; // 跳过下一项，避免重复
           } else {
@@ -2482,7 +2482,7 @@ var Easy3wFormPageTightM = exports.Easy3wFormPageTightM = function (_Component2)
         var newRowItems = [];
         for (var i = 0; i < finalList.length; i++) {
           var item = finalList[i];
-          if (!arrNoRowType.includes(item.fieldType)) {
+          if (!arrNoRowType.includes(item.fieldType) || item && item.value && typeof item.value !== 'string') {
             newRowItems.push({ cols: [item] });
             continue;
           }

package/lib/Easy3wGridPage/indexM.js

@@ -138,13 +138,20 @@ var Easy3wGridPageM = function (_Component) {
         scroll = _props.scroll,
         className = _props.className,
         paginationInfo = _props.paginationInfo,
-        handleSearchNew = _props.handleSearchNew;
+        handleSearchNew = _props.handleSearchNew,
+        mobileShowFlag = _props.mobileShowFlag;
+    // 审批页面表格不展示操作列
 
+    var isApproval = document.body.innerHTML.includes('class="approval_flag_only"');
     for (var i = columns.length - 1; i >= 0; i--) {
       var title = columns[i].title;
 
-      if (title === '操作') {
+      if (title === '操作' && isApproval) {
         columns.splice(i, 1);
+      } else if (title === '操作') {
+        if (!columns[i].fixed) {
+          columns[i].fixed = 'right';
+        }
       }
     }
     var _state = this.state,
@@ -320,33 +327,37 @@ var Easy3wGridPageM = function (_Component) {
 
     // console.log('父级是否有 .e3wFormPageWrap:', hasParentClass);
     return _react2['default'].createElement(
-      'div',
-      { className: 'gridBox' },
-      _react2['default'].createElement(
+      _react2['default'].Fragment,
+      null,
+      mobileShowFlag === false ? '' : _react2['default'].createElement(
         'div',
-        { ref: this.myRef, className: gridProps || this.props.rowType ? gridProps.onRow || this.props.rowType ? 'onRow' : null : null },
-        _react2['default'].createElement(_table2['default'], (0, _extends3['default'])({
-          className: printFlag || hasFormParentClass ? 'scrollPrint' : className || 'scrollX',
-          columns: myColumns,
-          dataSource: dataList,
-          pagination: paginationProps,
-          loading: loading,
-          rowKey: rowKey,
-          rowSelection: rowSelection,
-          bordered: bordered,
-          scroll: printFlag ? {} : scroll || { x: true },
-          onChange: this.handleTableChange,
-          onRow: this.props.rowType ? function (record) {
-            return {
-              onClick: function onClick(event) {
-                return _this2.rowSelected(record, event);
-              } // 点击行
-            };
-          } : null
-        }, gridProps, {
-          locale: { emptyText: '暂无数据' }
-        })),
-        chooseFlag && alertRegionFlag ? alertRegion : ''
+        { className: 'gridBox' },
+        _react2['default'].createElement(
+          'div',
+          { ref: this.myRef, className: gridProps || this.props.rowType ? gridProps.onRow || this.props.rowType ? 'onRow' : null : null },
+          _react2['default'].createElement(_table2['default'], (0, _extends3['default'])({
+            className: printFlag || hasFormParentClass ? 'scrollPrint' : className || 'scrollX',
+            columns: myColumns,
+            dataSource: dataList,
+            pagination: paginationProps,
+            loading: loading,
+            rowKey: rowKey,
+            rowSelection: rowSelection,
+            bordered: bordered,
+            scroll: printFlag ? {} : scroll || { x: true },
+            onChange: this.handleTableChange,
+            onRow: this.props.rowType ? function (record) {
+              return {
+                onClick: function onClick(event) {
+                  return _this2.rowSelected(record, event);
+                } // 点击行
+              };
+            } : null
+          }, gridProps, {
+            locale: { emptyText: '暂无数据' }
+          })),
+          chooseFlag && alertRegionFlag ? alertRegion : ''
+        )
       )
     );
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy3wui",
-  "version": "1.5.77-beta2",
+  "version": "1.5.78-beta.1",
   "description": "easy3wui components for react",
   "keywords": [
     "react",