easy3wui 1.5.78-beta.1 → 1.5.79-beta.1

package/assets/formPage.css

@@ -216,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

@@ -2624,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

@@ -15,9 +15,9 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'd
 var isMobile = window.matchMedia('(max-width: 768px)').matches;
 var Easy3wCard = void 0;
 if (isMobile) {
-  Easy3wCard = _indexPC2['default'];
-} else {
   Easy3wCard = _indexM2['default'];
+} else {
+  Easy3wCard = _indexPC2['default'];
 }
 
 exports['default'] = Easy3wCard;

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

@@ -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

@@ -154,6 +154,11 @@ var Easy3wGridPageM = function (_Component) {
         }
       }
     }
+    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,
         selectedRowKeysState = _state.selectedRowKeysState,
         selectedRowsState = _state.selectedRowsState,

package/package.json

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