easy3wui 1.5.55-beta13 → 1.5.55-beta15

package/lib/Easy3wEditBigTable/Easy3wEditBigTableForm.js

@@ -1,272 +1,177 @@
-'use strict';
-
-exports.__esModule = true;
-
-var _form = require('antd/lib/form');
-
-var _form2 = _interopRequireDefault(_form);
-
-var _objectWithoutProperties2 = require('babel-runtime/helpers/objectWithoutProperties');
-
-var _objectWithoutProperties3 = _interopRequireDefault(_objectWithoutProperties2);
-
-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);
-
-require('antd/lib/form/style');
-
-var _react = require('react');
-
-var _react2 = _interopRequireDefault(_react);
-
-var _antd = require('antd');
-
-var _easy3wui = require('easy3wui');
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
-
-var Easy3wEditBigTableForm = function (_PureComponent) {
-  (0, _inherits3['default'])(Easy3wEditBigTableForm, _PureComponent);
-
-  function Easy3wEditBigTableForm(props) {
-    (0, _classCallCheck3['default'])(this, Easy3wEditBigTableForm);
-
-    var _this = (0, _possibleConstructorReturn3['default'])(this, _PureComponent.call(this, props));
-
-    _this.bidPureComponent = function (pureComponentName, that) {
-      _this[pureComponentName] = that;
-    };
-
-    _this.getOptionLst = function () {
-      var objOtherParameters = _this.props.objOtherParameters;
-      var columns = objOtherParameters.columns;
-
-      var arrColumns = [];
-      var columnsNew = [].concat(columns);
-      columnsNew.map(function (item, index) {
-        var strName = item.strName,
-            name = item.name,
-            editable = item.editable,
-            editor = item.editor,
-            otherEditable = item.otherEditable;
-
-        if (editable || editor || otherEditable) {
-          // 编辑
-          arrColumns.push({
-            label: strName || name,
-            value: index
-          });
-        }
-        return item;
-      });
-      _this.arrColumns = arrColumns;
-    };
-
-    _this.getBatchField = function () {
-      var _this$props = _this.props,
-          form = _this$props.form,
-          objOtherParameters = _this$props.objOtherParameters;
-      var columns = objOtherParameters.columns;
-
-      var batchField = form.getFieldValue('batchField_easy3wView');
-      var fieldRowItems = [];
-      var hiddenItems = [];
-      if (batchField) {
-        var objColumn = columns[batchField];
-        var strName = objColumn.strName,
-            name = objColumn.name,
-            key = objColumn.key,
-            fieldId = objColumn.fieldId,
-            rowItem = objColumn.rowItem,
-            unit = objColumn.unit,
-            hiddeKeys = objColumn.hiddeKeys,
-            _objColumn$required = objColumn.required,
-            required = _objColumn$required === undefined ? true : _objColumn$required,
-            fieldType = objColumn.fieldType,
-            _objColumn$optionLst = objColumn.optionLst,
-            optionLst = _objColumn$optionLst === undefined ? [] : _objColumn$optionLst,
-            _objColumn$options = objColumn.options,
-            options = _objColumn$options === undefined ? [] : _objColumn$options,
-            _objColumn$rules = objColumn.rules,
-            rules = _objColumn$rules === undefined ? [] : _objColumn$rules,
-            ruleType = objColumn.ruleType,
-            regex = objColumn.regex,
-            regexMsg = objColumn.regexMsg;
-        // strNName 字段名称
-        // name 字段名称
-        // key 字段key
-        // rowItem 字段行
-        // unit 字段单位
-        // hiddeKeys 隐藏字段key
-        // required 是否必填
-        // fieldType 字段类型
-        // optionLst 选项列表
-        // rules 校验规则
-        // ruleType 校验规则类型
-        // onChange 字段值变化回调
-
-        var arrHiddenItems = [];
-        if (hiddeKeys) {
-          var arrHiddenKeys = hiddeKeys.split(',');
-          arrHiddenKeys.map(function (item) {
-            arrHiddenItems.push({
-              fieldId: item
-            });
-            return item;
-          });
-          hiddenItems = [].concat(arrHiddenItems);
-        }
-        var arrRules = [].concat(rules);
-        if (ruleType === 'phone') {
-          arrRules.push({ pattern: /^1\d{10}$/, message: '手机格式错误！' });
-        } else if (ruleType === 'email') {
-          arrRules.push({ type: 'email', message: '邮箱地址格式错误！' });
-        } else if (ruleType === 'idcard') {
-          arrRules.push({ pattern: /(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{2}[0-9Xx]$)/, message: '身份证格式错误！' });
-        } else if (regex) {
-          arrRules.push({ pattern: new RegExp(regex), message: regexMsg || '数据格式错误！' });
-        }
-        var fieldRowItem = {
-          cols: [rowItem || {
-            label: strName || name,
-            fieldId: fieldId || key,
-            fieldType: fieldType || 'input',
-            value: '',
-            required: required,
-            cmptPros: {
-              optionLst: optionLst,
-              options: options,
-              addonAfter: unit || '',
-              rules: arrRules,
-              onChange: function onChange() {
-                for (var _len = arguments.length, arg = Array(_len), _key = 0; _key < _len; _key++) {
-                  arg[_key] = arguments[_key];
-                }
-
-                return _this.onChange(arg, objColumn);
-              }
-            }
-          }]
-        };
-        fieldRowItems.push(fieldRowItem);
-      }
-      return { fieldRowItems: fieldRowItems, hiddenItems: hiddenItems };
-    };
-
-    _this.onChange = function (arg, objColumn) {
-      var form = _this.props.form;
-      var onChange = objColumn.onChange;
-
-      if (onChange && typeof onChange === 'function') {
-        onChange(form, arg, objColumn);
-      }
-    };
-
-    _this.touchConfirm = function () {
-      var _this$props2 = _this.props,
-          confirmCallback = _this$props2.confirmCallback,
-          objOtherParameters = _this$props2.objOtherParameters;
-
-      _this.props.form.validateFieldsAndScroll(function (err, values) {
-        if (!err) {
-          var batchField = values.batchField_easy3wView,
-              valuesNew = (0, _objectWithoutProperties3['default'])(values, ['batchField_easy3wView']);
-          // delete values.batchField_easy3wView;
-
-          if (confirmCallback && typeof confirmCallback === 'function') {
-            var columns = objOtherParameters.columns;
-
-            var objColumn = columns[batchField];
-            confirmCallback(valuesNew, objColumn);
-          }
-          _this.touchCancel();
-        }
-      });
-    };
-
-    _this.touchCancel = function () {
-      var hideModal = _this.props.hideModal;
-
-      if (hideModal && typeof hideModal === 'function') {
-        hideModal();
-      }
-    };
-
-    var bidPureComponent = _this.props.bidPureComponent;
-
-    if (bidPureComponent && typeof bidPureComponent === 'function') {
-      bidPureComponent(_this);
-    }
-    _this.getOptionLst();
-    _this.state = {};
-    return _this;
-  }
-
-  Easy3wEditBigTableForm.prototype.componentDidMount = function componentDidMount() {};
-
-  Easy3wEditBigTableForm.prototype.componentWillUnmount = function componentWillUnmount() {};
-  // 绑定组件
-
-  // 创建columns
-
-  // 获取批量录入字段
-
-  // 字段值变化回调
-
-  // 保存
-
-  // 取消
-
-
-  Easy3wEditBigTableForm.prototype.render = function render() {
-    var _props = this.props,
-        objOtherParameters = _props.objOtherParameters,
-        visible = _props.visible,
-        form = _props.form;
-    var batchButtonText = objOtherParameters.batchButtonText;
-
-    var footBtnArr = [{ func: this.touchConfirm, cName: '保存' }, { func: this.touchCancel, cName: '取消' }];
-
-    var _getBatchField = this.getBatchField(),
-        fieldRowItems = _getBatchField.fieldRowItems,
-        hiddenItems = _getBatchField.hiddenItems;
-
-    var rowItems = [{
-      cols: [{
-        label: '录入内容',
-        fieldId: 'batchField_easy3wView',
-        fieldType: 'select',
-        required: true,
-        value: '',
-        cmptPros: {
-          optionLst: this.arrColumns
-        }
-      }]
-    }].concat(fieldRowItems);
-    return _react2['default'].createElement(
-      _easy3wui.Easy3wModal,
-      {
-        title: batchButtonText || '批量录入',
-        visible: visible,
-        onCancel: this.touchCancel,
-        footBtnArr: footBtnArr,
-        width: '80%'
-      },
-      _react2['default'].createElement(_easy3wui.Easy3wFormPage, { rowItems: rowItems, hiddenItems: hiddenItems, form: form, mixColFlag: true })
-    );
-  };
-
-  return Easy3wEditBigTableForm;
-}(_react.PureComponent);
-
-exports['default'] = _form2['default'].create()(Easy3wEditBigTableForm);
-module.exports = exports['default'];
+// import React, { PureComponent } from 'react';
+// import { Form } from 'antd';
+// import { Easy3wModal, Easy3wFormPage } from 'easy3wui';
+
+// class Easy3wEditBigTableForm extends PureComponent {
+//   constructor(props) {
+//     super(props);
+//     const { bidPureComponent } = this.props;
+//     if (bidPureComponent && typeof bidPureComponent === 'function') {
+//       bidPureComponent(this);
+//     }
+//     this.getOptionLst();
+//     this.state = {
+//     };
+//   }
+//   componentDidMount() {
+//   }
+//   componentWillUnmount() {
+//   }
+//   // 绑定组件
+//   bidPureComponent = (pureComponentName, that) => {
+//     this[pureComponentName] = that;
+//   }
+//   // 创建columns
+//   getOptionLst = () => {
+//     const { objOtherParameters } = this.props;
+//     const { columns } = objOtherParameters;
+//     const arrColumns = [];
+//     const columnsNew = [...columns];
+//     columnsNew.map((item, index) => {
+//       const { strName, name, editable, editor, otherEditable } = item;
+//       if (editable || editor || otherEditable) { // 编辑
+//         arrColumns.push({
+//           label: strName || name,
+//           value: index,
+//         });
+//       }
+//       return item;
+//     });
+//     this.arrColumns = arrColumns;
+//   }
+//   // 获取批量录入字段
+//   getBatchField = () => {
+//     const { form, objOtherParameters } = this.props;
+//     const { columns } = objOtherParameters;
+//     const batchField = form.getFieldValue('batchField_easy3wView');
+//     const fieldRowItems = [];
+//     let hiddenItems = [];
+//     if (batchField) {
+//       const objColumn = columns[batchField];
+//       const { strName, name, key, fieldId, rowItem, unit, hiddeKeys, required = true, fieldType, optionLst = [], options = [], rules = [], ruleType, regex, regexMsg } = objColumn;
+//       // strNName 字段名称
+//       // name 字段名称
+//       // key 字段key
+//       // rowItem 字段行
+//       // unit 字段单位
+//       // hiddeKeys 隐藏字段key
+//       // required 是否必填
+//       // fieldType 字段类型
+//       // optionLst 选项列表
+//       // rules 校验规则
+//       // ruleType 校验规则类型
+//       // onChange 字段值变化回调
+//       const arrHiddenItems = [];
+//       if (hiddeKeys) {
+//         const arrHiddenKeys = hiddeKeys.split(',');
+//         arrHiddenKeys.map((item) => {
+//           arrHiddenItems.push({
+//             fieldId: item,
+//           });
+//           return item;
+//         });
+//         hiddenItems = [...arrHiddenItems];
+//       }
+//       const arrRules = [...rules];
+//       if (ruleType === 'phone') {
+//         arrRules.push({ pattern: /^1\d{10}$/, message: '手机格式错误！' });
+//       } else if (ruleType === 'email') {
+//         arrRules.push({ type: 'email', message: '邮箱地址格式错误！' });
+//       } else if (ruleType === 'idcard') {
+//         arrRules.push({ pattern: /(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{2}[0-9Xx]$)/, message: '身份证格式错误！' });
+//       } else if (regex) {
+//         arrRules.push({ pattern: new RegExp(regex), message: regexMsg || '数据格式错误！' });
+//       }
+//       const fieldRowItem = {
+//         cols: [
+//           rowItem || {
+//             label: strName || name,
+//             fieldId: fieldId || key,
+//             fieldType: fieldType || 'input',
+//             value: '',
+//             required,
+//             cmptPros: {
+//               optionLst,
+//               options,
+//               addonAfter: unit || '',
+//               rules: arrRules,
+//               onChange: (...arg) => this.onChange(arg, objColumn),
+//             },
+//           },
+//         ],
+//       };
+//       fieldRowItems.push(fieldRowItem);
+//     }
+//     return { fieldRowItems, hiddenItems };
+//   }
+//   // 字段值变化回调
+//   onChange = (arg, objColumn) => {
+//     const { form } = this.props;
+//     const { onChange } = objColumn;
+//     if (onChange && typeof onChange === 'function') {
+//       onChange(form, arg, objColumn);
+//     }
+//   }
+//   // 保存
+//   touchConfirm = () => {
+//     const { confirmCallback, objOtherParameters } = this.props;
+//     this.props.form.validateFieldsAndScroll((err, values) => {
+//       if (!err) {
+//         const { batchField_easy3wView: batchField, ...valuesNew } = values;
+//         // delete values.batchField_easy3wView;
+//         if (confirmCallback && typeof confirmCallback === 'function') {
+//           const { columns } = objOtherParameters;
+//           const objColumn = columns[batchField];
+//           confirmCallback(valuesNew, objColumn);
+//         }
+//         this.touchCancel();
+//       }
+//     });
+//   }
+//   // 取消
+//   touchCancel = () => {
+//     const { hideModal } = this.props;
+//     if (hideModal && typeof hideModal === 'function') {
+//       hideModal();
+//     }
+//   }
+//   render() {
+//     const { objOtherParameters, visible, form } = this.props;
+//     const { batchButtonText } = objOtherParameters;
+//     const footBtnArr = [
+//       { func: this.touchConfirm, cName: '保存' },
+//       { func: this.touchCancel, cName: '取消' },
+//     ];
+//     const { fieldRowItems, hiddenItems } = this.getBatchField();
+//     const rowItems = [
+//       {
+//         cols: [
+//           {
+//             label: '录入内容',
+//             fieldId: 'batchField_easy3wView',
+//             fieldType: 'select',
+//             required: true,
+//             value: '',
+//             cmptPros: {
+//               optionLst: this.arrColumns,
+//             },
+//           },
+//         ],
+//       },
+//       ...fieldRowItems,
+//     ];
+//     return (
+//       <Easy3wModal
+//         title={batchButtonText || '批量录入'}
+//         visible={visible}
+//         onCancel={this.touchCancel}
+//         footBtnArr={footBtnArr}
+//         width="80%"
+//       >
+//         <Easy3wFormPage rowItems={rowItems} hiddenItems={hiddenItems} form={form} mixColFlag />
+//       </Easy3wModal>
+//     );
+//   }
+// }
+// export default Form.create()(Easy3wEditBigTableForm);
+"use strict";

package/lib/Easy3wEditBigTable/index.js

@@ -44,13 +44,12 @@ var _numeral = require('numeral');
 
 var _numeral2 = _interopRequireDefault(_numeral);
 
-var _Easy3wEditBigTableForm = require('./Easy3wEditBigTableForm');
-
-var _Easy3wEditBigTableForm2 = _interopRequireDefault(_Easy3wEditBigTableForm);
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
-var Selectors = _reactDataGridAddons.Data.Selectors; /* eslint-disable no-alert */
+// import Easy3wEditBigTableForm from './Easy3wEditBigTableForm';
+
+/* eslint-disable no-alert */
+var Selectors = _reactDataGridAddons.Data.Selectors;
 
 var Easy3wEditBigTable = function (_Component) {
   (0, _inherits3['default'])(Easy3wEditBigTable, _Component);
@@ -879,18 +878,7 @@ var Easy3wEditBigTable = function (_Component) {
             )
           );
         })
-      ) : '',
-      visible ? _react2['default'].createElement(_Easy3wEditBigTableForm2['default'] // 批量录入Modal
-      , { visible: visible // 是否显示
-        , objOtherParameters: (0, _extends3['default'])({}, objToolbarProps, { // 工具栏属性
-          columns: columns // 表头
-        }) // 其他参数
-        , bidPureComponent: function bidPureComponent(that) {
-          return _this2.bidPureComponent('Easy3wEditBigTableForm', that);
-        } // 绑定组件
-        , confirmCallback: this.confirmCallbackBatchEditBigTable,
-        hideModal: this.hideModalBatchEditBigTable
-      }) : ''
+      ) : ''
     );
   };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy3wui",
-  "version": "1.5.55-beta13",
+  "version": "1.5.55-beta15",
   "description": "easy3wui components for react",
   "keywords": [
     "react",