easy3wui 1.5.78 → 1.5.79-beta.2

package/assets/formPage.css

@@ -138,11 +138,22 @@ 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: auto;
-    line-height: 20px;
+    line-height: 30px;
     text-align: right;
     white-space: wrap;
     overflow: visible;
@@ -154,12 +165,8 @@ input.ant-input-number-input {
     display: inline-block;
     width: 80%;
   }
-  :global .ant-form-item-label::after {
-    content: "：";
-    color: rgba(0, 0, 0, 0.75);
-  }
   :global .ant-form-item-control {
-    line-height: 20px;
+    line-height: 30px;
     white-space: wrap;
     color: black;
   }
@@ -178,7 +185,7 @@ input.ant-input-number-input {
   }
   :global .ant-form-item {
     font-size: 12px !important;
-    margin-bottom: 12px !important;
+    margin-bottom: 8px !important;
   }
   :global .ant-radio-wrapper {
     font-size: 12px !important;
@@ -209,6 +216,6 @@ input.ant-input-number-input {
   }
   :global .adm-text-area-element,
   :global .adm-text-area-count {
-    font-size: var(--adm-font-size-6);
+    font-size: 14px;
   }
 }

package/assets/index.css

@@ -2546,11 +2546,22 @@ 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: auto;
-    line-height: 20px;
+    line-height: 30px;
     text-align: right;
     white-space: wrap;
     overflow: visible;
@@ -2562,12 +2573,8 @@ input.ant-input-number-input {
     display: inline-block;
     width: 80%;
   }
-  :global .ant-form-item-label::after {
-    content: "：";
-    color: rgba(0, 0, 0, 0.75);
-  }
   :global .ant-form-item-control {
-    line-height: 20px;
+    line-height: 30px;
     white-space: wrap;
     color: black;
   }
@@ -2586,7 +2593,7 @@ input.ant-input-number-input {
   }
   :global .ant-form-item {
     font-size: 12px !important;
-    margin-bottom: 12px !important;
+    margin-bottom: 8px !important;
   }
   :global .ant-radio-wrapper {
     font-size: 12px !important;
@@ -2617,7 +2624,7 @@ input.ant-input-number-input {
   }
   :global .adm-text-area-element,
   :global .adm-text-area-count {
-    font-size: var(--adm-font-size-6);
+    font-size: 14px;
   }
 }
 .e3wFootBtn {

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 = _indexM2['default'];
+} else {
+  Easy3wCard = _indexPC2['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/Easy3wEditBigTable/index.js

@@ -36,10 +36,6 @@ var _reactDataGrid2 = _interopRequireDefault(_reactDataGrid);
 
 var _reactDataGridAddons = require('react-data-grid-addons');
 
-var _xlsx = require('xlsx');
-
-var _xlsx2 = _interopRequireDefault(_xlsx);
-
 var _numeral = require('numeral');
 
 var _numeral2 = _interopRequireDefault(_numeral);
@@ -54,8 +50,9 @@ var _Easy3wEditBigTableForm2 = _interopRequireDefault(_Easy3wEditBigTableForm);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
-/* eslint-disable no-alert */
 var Selectors = _reactDataGridAddons.Data.Selectors;
+// import XLSX from 'xlsx';
+/* eslint-disable no-alert */
 
 var Easy3wEditBigTable = function (_Component) {
   (0, _inherits3['default'])(Easy3wEditBigTable, _Component);
@@ -506,63 +503,56 @@ var _initialiseProps = function _initialiseProps() {
     }
   };
 
-  this.touchImport = function () {
-    var input = document.getElementById('touchImportExcel');
-    // input.type = 'file';
-    input.onchange = function (e) {
-      var file = e.target.files[0];
-      var reader = new FileReader();
-      reader.onload = function (event) {
-        var _getHearder = _this3.getHearder(),
-            arrColumnsKey = _getHearder.arrColumnsKey;
-
-        var data = event.target.result;
-        var workbook = _xlsx2['default'].read(data, { type: 'binary' });
-        var firstSheetName = workbook.SheetNames[0];
-        var worksheet = workbook.Sheets[firstSheetName];
-        var rows = _xlsx2['default'].utils.sheet_to_json(worksheet, { header: arrColumnsKey });
-        rows.shift(); // 去掉表头
-        var rowsView = _this3.getRows(rows); // 表格显示数据
-        _this3.onGridRowsUpdatedZJ('touchImport', rows, rowsView);
-      };
-      reader.readAsBinaryString(file);
-    };
-    input.click();
-  };
-
-  this.touchExport = function () {
-    var _getHearder2 = _this3.getHearder(),
-        objSheet = _getHearder2.objSheet,
-        arrColInfo = _getHearder2.arrColInfo;
-    // const filterDataList = this.getRows();
-
-
-    var rowsView = _this3.state.rowsView;
-    // 计算 rowsView 中所有对象字段最多的长度
-
-    var maxFieldsLength = 0;
-    rowsView.forEach(function (item) {
-      var fieldsLength = Object.keys(item).length;
-      if (fieldsLength > maxFieldsLength) {
-        maxFieldsLength = fieldsLength;
-      }
-      return item;
-    });
-    if (maxFieldsLength > arrColInfo.length) {
-      for (var i = arrColInfo.length; i < maxFieldsLength;) {
-        arrColInfo.push({ hidden: true });
-        i += 1;
-      }
-    }
-    // 创建工作簿和工作表
-    var worksheet = _xlsx2['default'].utils.json_to_sheet([objSheet].concat(rowsView), { skipHeader: true });
-    worksheet['!cols'] = arrColInfo;
-    var workbook = _xlsx2['default'].utils.book_new();
-    _xlsx2['default'].utils.book_append_sheet(workbook, worksheet, 'Sheet1');
-
-    // 生成Excel文件并触发下载
-    _xlsx2['default'].writeFile(workbook, 'exported_data.xlsx');
-  };
+  this.touchImport = function () {}
+  // const input = document.getElementById('touchImportExcel');
+  // // input.type = 'file';
+  // input.onchange = (e) => {
+  //   const file = e.target.files[0];
+  //   const reader = new FileReader();
+  //   reader.onload = (event) => {
+  //     const { arrColumnsKey } = this.getHearder();
+  //     const data = event.target.result;
+  //     const workbook = XLSX.read(data, { type: 'binary' });
+  //     const firstSheetName = workbook.SheetNames[0];
+  //     const worksheet = workbook.Sheets[firstSheetName];
+  //     const rows = XLSX.utils.sheet_to_json(worksheet, { header: arrColumnsKey });
+  //     rows.shift(); // 去掉表头
+  //     const rowsView = this.getRows(rows); // 表格显示数据
+  //     this.onGridRowsUpdatedZJ('touchImport', rows, rowsView);
+  //   };
+  //   reader.readAsBinaryString(file);
+  // };
+  // input.click();
+  ;
+
+  this.touchExport = function () {}
+  // const { objSheet, arrColInfo } = this.getHearder();
+  // // const filterDataList = this.getRows();
+  // const { rowsView } = this.state;
+  // // 计算 rowsView 中所有对象字段最多的长度
+  // let maxFieldsLength = 0;
+  // rowsView.forEach((item) => {
+  //   const fieldsLength = Object.keys(item).length;
+  //   if (fieldsLength > maxFieldsLength) {
+  //     maxFieldsLength = fieldsLength;
+  //   }
+  //   return item;
+  // });
+  // if (maxFieldsLength > arrColInfo.length) {
+  //   for (let i = arrColInfo.length; i < maxFieldsLength;) {
+  //     arrColInfo.push({ hidden: true });
+  //     i += 1;
+  //   }
+  // }
+  // // 创建工作簿和工作表
+  // const worksheet = XLSX.utils.json_to_sheet([objSheet, ...rowsView], { skipHeader: true });
+  // worksheet['!cols'] = arrColInfo;
+  // const workbook = XLSX.utils.book_new();
+  // XLSX.utils.book_append_sheet(workbook, worksheet, 'Sheet1');
+  //
+  // // 生成Excel文件并触发下载
+  // XLSX.writeFile(workbook, 'exported_data.xlsx');
+  ;
 
   this.showModalBatchEditBigTable = function () {
     _this3.setState({

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）
@@ -413,10 +413,10 @@ var Easy3wFormPageM = exports.Easy3wFormPageM = function (_Component) {
             if (item.fieldType === 'upload' || item.fieldType === 'uploadM' || item.fieldType === 'uploadB') {
               var cmptPros = item.cmptPros;
 
-              if (_this.isValidValue(cmptPros.initialValue)) {
+              if (cmptPros.isRead === true && _this.isValidValue(cmptPros.initialValue)) {
                 haveValueList.push(item);
               }
-            } else if (_this.isValidValue(item.value)) {
+            } else if (item.readFlag === true && _this.isValidValue(item.value)) {
               haveValueList.push(item);
             }
           });

package/lib/Easy3wGridPage/indexM.js

@@ -138,13 +138,25 @@ 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';
+        }
+      }
+    }
+    for (var _i = columns.length - 1; _i >= 0; _i--) {
+      if (columns && columns[_i] && columns[_i].mobileShowFlag === false) {
+        columns.splice(_i, 1);
       }
     }
     var _state = this.state,
@@ -320,33 +332,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.78",
+  "version": "1.5.79-beta.2",
   "description": "easy3wui components for react",
   "keywords": [
     "react",