easy3wui 1.5.70-beta1 → 1.5.70-beta10

package/assets/formPage.css

@@ -13,7 +13,9 @@
 .e3wFormPageWrap .e3wFormItem .ant-form-item {
   margin-bottom: 8px;
 }
-.e3wFormPageWrap .inputNumberFormat {
+.e3wFormPageWrap .inputNumberFormat,
+.e3wFormPageWrap .inputAmount,
+.e3wFormPageWrap .inputDigit {
   display: -ms-flexbox;
   display: flex;
   -ms-flex-direction: row;
@@ -22,18 +24,24 @@
       flex-wrap: nowrap;
   line-height: 32px;
 }
-.e3wFormPageWrap .inputNumberFormat .addonBtns {
+.e3wFormPageWrap .inputNumberFormat .addonBtns,
+.e3wFormPageWrap .inputAmount .addonBtns,
+.e3wFormPageWrap .inputDigit .addonBtns {
   height: 32px;
   width: auto;
   border-left: none;
   border-right: 1px solid #d9d9d9;
 }
-.e3wFormPageWrap .inputNumberFormat .inputNumberBtns .e3wFootBtn {
+.e3wFormPageWrap .inputNumberFormat .inputNumberBtns .e3wFootBtn,
+.e3wFormPageWrap .inputAmount .inputNumberBtns .e3wFootBtn,
+.e3wFormPageWrap .inputDigit .inputNumberBtns .e3wFootBtn {
   margin: 0;
 }
+.ant-input-number:hover input.ant-input-number-input {
+  padding-right: 33px;
+}
 input.ant-input-number-input {
   text-align: right;
-  padding-right: 22px;
 }
 .rightText {
   text-align: right;

package/assets/gridPage.css

@@ -53,25 +53,32 @@
   white-space: nowrap;
   overflow: hidden;
 }
-.scrollPrint .ant-table-thead > tr > th {
+.scrollPrint .ant-table-thead > tr > th,
+.e3wFormPageWrap .scrollX .ant-table-thead > tr > th {
   text-align: center;
 }
-.scrollPrint .ant-table-tbody > .ant-table-row td {
+.scrollPrint .ant-table-tbody > .ant-table-row td,
+.e3wFormPageWrap .scrollX .ant-table-tbody > .ant-table-row td {
   max-width: 240px;
 }
-.scrollPrint .ant-table-tbody > .ant-table-row .e3wText {
+.scrollPrint .ant-table-tbody > .ant-table-row .e3wText,
+.e3wFormPageWrap .scrollX .ant-table-tbody > .ant-table-row .e3wText {
   text-align: left;
 }
-.scrollPrint .ant-table-tbody > .ant-table-row .e3wGridShortText {
+.scrollPrint .ant-table-tbody > .ant-table-row .e3wGridShortText,
+.e3wFormPageWrap .scrollX .ant-table-tbody > .ant-table-row .e3wGridShortText {
   text-align: center;
 }
-.scrollPrint .ant-table-tbody > .ant-table-row .e3wGridLongText {
+.scrollPrint .ant-table-tbody > .ant-table-row .e3wGridLongText,
+.e3wFormPageWrap .scrollX .ant-table-tbody > .ant-table-row .e3wGridLongText {
   text-align: justify;
 }
-.scrollPrint .ant-table-tbody > .ant-table-row .e3wGridNumber {
+.scrollPrint .ant-table-tbody > .ant-table-row .e3wGridNumber,
+.e3wFormPageWrap .scrollX .ant-table-tbody > .ant-table-row .e3wGridNumber {
   text-align: right;
 }
-.scrollPrint .ant-table-tbody > .ant-table-row .e3wMaxText {
+.scrollPrint .ant-table-tbody > .ant-table-row .e3wMaxText,
+.e3wFormPageWrap .scrollX .ant-table-tbody > .ant-table-row .e3wMaxText {
   max-width: 240px;
   text-align: left;
 }

package/assets/index.css

@@ -2352,25 +2352,32 @@ s {
   white-space: nowrap;
   overflow: hidden;
 }
-.scrollPrint .ant-table-thead > tr > th {
+.scrollPrint .ant-table-thead > tr > th,
+.e3wFormPageWrap .scrollX .ant-table-thead > tr > th {
   text-align: center;
 }
-.scrollPrint .ant-table-tbody > .ant-table-row td {
+.scrollPrint .ant-table-tbody > .ant-table-row td,
+.e3wFormPageWrap .scrollX .ant-table-tbody > .ant-table-row td {
   max-width: 240px;
 }
-.scrollPrint .ant-table-tbody > .ant-table-row .e3wText {
+.scrollPrint .ant-table-tbody > .ant-table-row .e3wText,
+.e3wFormPageWrap .scrollX .ant-table-tbody > .ant-table-row .e3wText {
   text-align: left;
 }
-.scrollPrint .ant-table-tbody > .ant-table-row .e3wGridShortText {
+.scrollPrint .ant-table-tbody > .ant-table-row .e3wGridShortText,
+.e3wFormPageWrap .scrollX .ant-table-tbody > .ant-table-row .e3wGridShortText {
   text-align: center;
 }
-.scrollPrint .ant-table-tbody > .ant-table-row .e3wGridLongText {
+.scrollPrint .ant-table-tbody > .ant-table-row .e3wGridLongText,
+.e3wFormPageWrap .scrollX .ant-table-tbody > .ant-table-row .e3wGridLongText {
   text-align: justify;
 }
-.scrollPrint .ant-table-tbody > .ant-table-row .e3wGridNumber {
+.scrollPrint .ant-table-tbody > .ant-table-row .e3wGridNumber,
+.e3wFormPageWrap .scrollX .ant-table-tbody > .ant-table-row .e3wGridNumber {
   text-align: right;
 }
-.scrollPrint .ant-table-tbody > .ant-table-row .e3wMaxText {
+.scrollPrint .ant-table-tbody > .ant-table-row .e3wMaxText,
+.e3wFormPageWrap .scrollX .ant-table-tbody > .ant-table-row .e3wMaxText {
   max-width: 240px;
   text-align: left;
 }
@@ -2404,7 +2411,9 @@ s {
 .e3wFormPageWrap .e3wFormItem .ant-form-item {
   margin-bottom: 8px;
 }
-.e3wFormPageWrap .inputNumberFormat {
+.e3wFormPageWrap .inputNumberFormat,
+.e3wFormPageWrap .inputAmount,
+.e3wFormPageWrap .inputDigit {
   display: -ms-flexbox;
   display: flex;
   -ms-flex-direction: row;
@@ -2413,18 +2422,24 @@ s {
       flex-wrap: nowrap;
   line-height: 32px;
 }
-.e3wFormPageWrap .inputNumberFormat .addonBtns {
+.e3wFormPageWrap .inputNumberFormat .addonBtns,
+.e3wFormPageWrap .inputAmount .addonBtns,
+.e3wFormPageWrap .inputDigit .addonBtns {
   height: 32px;
   width: auto;
   border-left: none;
   border-right: 1px solid #d9d9d9;
 }
-.e3wFormPageWrap .inputNumberFormat .inputNumberBtns .e3wFootBtn {
+.e3wFormPageWrap .inputNumberFormat .inputNumberBtns .e3wFootBtn,
+.e3wFormPageWrap .inputAmount .inputNumberBtns .e3wFootBtn,
+.e3wFormPageWrap .inputDigit .inputNumberBtns .e3wFootBtn {
   margin: 0;
 }
+.ant-input-number:hover input.ant-input-number-input {
+  padding-right: 33px;
+}
 input.ant-input-number-input {
   text-align: right;
-  padding-right: 22px;
 }
 .rightText {
   text-align: right;
@@ -2601,3 +2616,7 @@ input.ant-input-number-input {
   border-style: solid;
   border-radius: 3px;
 }
+.easy3wTree .easy3wTreeSearch {
+  width: calc(88%);
+  margin: 0 6px;
+}

package/assets/tree.css

@@ -0,0 +1,4 @@
+.easy3wTree .easy3wTreeSearch {
+  width: calc(88%);
+  margin: 0 6px;
+}

package/lib/Easy3wCol/index.js

@@ -0,0 +1,53 @@
+'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 _col = require('antd/lib/col');
+
+var _col2 = _interopRequireDefault(_col);
+
+require('antd/lib/col/style');
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
+
+var Easy3wCol = function (_Component) {
+  (0, _inherits3['default'])(Easy3wCol, _Component);
+
+  function Easy3wCol() {
+    (0, _classCallCheck3['default'])(this, Easy3wCol);
+    return (0, _possibleConstructorReturn3['default'])(this, _Component.apply(this, arguments));
+  }
+
+  Easy3wCol.prototype.render = function render() {
+    var _props = this.props,
+        objColProps = _props.objColProps,
+        children = _props.children;
+
+    return _react2['default'].createElement(
+      _col2['default'],
+      objColProps,
+      children
+    );
+  };
+
+  return Easy3wCol;
+}(_react.Component);
+
+exports['default'] = Easy3wCol;
+module.exports = exports['default'];

package/lib/Easy3wDownLoad/index.js

@@ -70,9 +70,13 @@ var _Easy3wAESEncrypt = require('../Easy3wAESEncrypt');
 
 var _Easy3wAESEncrypt2 = _interopRequireDefault(_Easy3wAESEncrypt);
 
+var _Easy3wUIConfig = require('../Easy3wUIConfig');
+
+var _Easy3wUIConfig2 = _interopRequireDefault(_Easy3wUIConfig);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
-// const { previewFileUrl, previewFileFlag, previewFileType } = objPreviewFile || {};
+var objPreviewFileDefault = _Easy3wUIConfig2['default'].objPreviewFileDefault;
 
 var Easy3wDownLoad = function (_Component) {
   (0, _inherits3['default'])(Easy3wDownLoad, _Component);
@@ -83,7 +87,7 @@ var Easy3wDownLoad = function (_Component) {
     var _this = (0, _possibleConstructorReturn3['default'])(this, _Component.call(this, props));
 
     _this.onPreview = function (file, url) {
-      var objPreviewFileNew = (0, _extends3['default'])({}, _comonConfig.objPreviewFile, _this.props.objPreviewFile);
+      var objPreviewFileNew = (0, _extends3['default'])({}, objPreviewFileDefault, _comonConfig.objPreviewFile, _this.props.objPreviewFile);
       var previewFileUrl = objPreviewFileNew.previewFileUrl,
           previewFileType = objPreviewFileNew.previewFileType;
       var uid = file.uid,
@@ -198,7 +202,7 @@ var Easy3wDownLoad = function (_Component) {
         fileViewURL = _props.fileViewURL,
         fileCallURL = _props.fileCallURL;
 
-    var objPreviewFileNew = (0, _extends3['default'])({}, _comonConfig.objPreviewFile, this.props.objPreviewFile);
+    var objPreviewFileNew = (0, _extends3['default'])({}, objPreviewFileDefault, _comonConfig.objPreviewFile, this.props.objPreviewFile);
     var previewFileFlag = objPreviewFileNew.previewFileFlag,
         downloadFileFlag = objPreviewFileNew.downloadFileFlag,
         previewFileType = objPreviewFileNew.previewFileType;