dlt-for-react 2.1.7 → 2.1.9

package/README.md

@@ -14,6 +14,10 @@ npm publish
 
 ##### 版本修改记录
 
+#### V2.1.9—2024 年 6 月 26 日
+
+1. KyTable组件高级搜索新增单个日期的开始|结束搜索条件
+
 #### V2.1.7—2024 年 6 月 12 日
 1. 解决升级echarts5.0版本 部分api不兼容的问题
 

package/lib/components/KyECharts/index.js

@@ -24,9 +24,9 @@ var _core = require('echarts-for-react/lib/core');
 
 var _core2 = _interopRequireDefault(_core);
 
-var _echarts = require('echarts/lib/echarts');
+var _echarts = require('echarts');
 
-var _echarts2 = _interopRequireDefault(_echarts);
+var echarts = _interopRequireWildcard(_echarts);
 
 require('echarts/lib/chart/line');
 
@@ -58,6 +58,8 @@ require('echarts/lib/component/polar');
 
 require('echarts/lib/component/geo');
 
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 //地理坐标系组件
@@ -91,23 +93,26 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 // import 'echarts/lib/chart/sankey';
 // import 'echarts/lib/chart/boxplot';
 // import 'echarts/lib/chart/candlestick';
-//echarts 基础配置，必须引入
+// 5.0.0 版本以上
 /* 按需引入echarts */
 //折线图
 //柱状图
 //饼图
 //散点图
 //雷达图
+
+// import echarts from 'echarts/lib/echarts'
 var KyECharts = function KyECharts(_ref) {
-  var className = _ref.className,
+  var style = _ref.style,
+      className = _ref.className,
       notMerge = _ref.notMerge,
       lazyUpdate = _ref.lazyUpdate,
-      props = (0, _objectWithoutProperties3.default)(_ref, ['className', 'notMerge', 'lazyUpdate']);
+      props = (0, _objectWithoutProperties3.default)(_ref, ['style', 'className', 'notMerge', 'lazyUpdate']);
 
   return _react2.default.createElement(_core2.default, (0, _extends3.default)({
     style: { width: '100%', height: '100%' },
     className: (0, _classnames2.default)('ky-echarts', className),
-    echarts: _echarts2.default,
+    echarts: echarts,
     notMerge: notMerge,
     lazyUpdate: lazyUpdate
   }, props));

package/lib/components/KyTable/highSearchForm.js

@@ -110,8 +110,6 @@ var _equalsObj = require('../../utils/equalsObj');
 
 var _equalsObj2 = _interopRequireDefault(_equalsObj);
 
-var _NHCore = require('../../utils/NHCore');
-
 require('../../../assets/components/KyTable/highSearchForm.less');
 
 var _moment = require('moment');
@@ -426,6 +424,38 @@ var HighSearchForm = function (_React$Component) {
             }))
           );
         }
+      } else if (fieldpro.searchType === 'gtDate') {
+        // 开始日期
+        return _react2.default.createElement(
+          _form2.default.Item,
+          {
+            label: _react2.default.createElement(
+              _tooltip2.default,
+              { title: parentColumnTitle + fieldpro.title, onMouseEnter: _this.showToolTip },
+              parentColumnTitle + fieldpro.title
+            ),
+            key: index
+          },
+          getFieldDecorator('D_' + fieldpro.dataIndex + '_gtdate', {
+            initialValue: fieldpro.defaultValue ? fieldpro.defaultValue : undefined
+          })(_react2.default.createElement(_datePicker2.default, { style: { width: '100%' } }))
+        );
+      } else if (fieldpro.searchType === 'ltDate') {
+        // 结束日期
+        return _react2.default.createElement(
+          _form2.default.Item,
+          {
+            label: _react2.default.createElement(
+              _tooltip2.default,
+              { title: parentColumnTitle + fieldpro.title, onMouseEnter: _this.showToolTip },
+              parentColumnTitle + fieldpro.title
+            ),
+            key: index
+          },
+          getFieldDecorator('D_' + fieldpro.dataIndex + '_ltdate', {
+            initialValue: fieldpro.defaultValue ? fieldpro.defaultValue : undefined
+          })(_react2.default.createElement(_datePicker2.default, { style: { width: '100%' } }))
+        );
       } else if (fieldpro.searchType === 'date') {
         // 日期
         return _react2.default.createElement(
@@ -480,9 +510,8 @@ var HighSearchForm = function (_React$Component) {
             xs: { span: 24 },
             sm: { span: 20 }
           }
-        };
-        // 日期时间
-        return _react2.default.createElement(
+          // 日期时间
+        };return _react2.default.createElement(
           _form2.default.Item,
           (0, _extends3.default)({}, formItemLayout, {
             label: _react2.default.createElement(