tntd 1.3.56 → 1.3.60

package/babel.config.js

@@ -26,7 +26,7 @@ const plugins = [
         {
             loose: true
         }
-    ],
+    ]
     // ['babel-plugin-styless']
 ];
 
@@ -35,7 +35,7 @@ if (process.env.BUILD_ENV !== 'umd' && !process.env.WEBPACK_DEV_SERVER) {
         'import',
         {
             libraryName: 'antd',
-            // libraryDirectory: 'es',
+            libraryDirectory: 'es',
             style: true,
 
         }

package/components/Layout/OrgAppList.js

@@ -234,7 +234,7 @@ const GlobalStyle = createGlobalStyle`
                 }
             }
         }
-    }s
+    }
 `;
 
 export default withTheme(

package/components/QueryListScene/List.js

@@ -3,7 +3,7 @@
  * @author you.zhang
  */
 import React, { createRef } from 'react';
-import { findDOMNode } from 'react-dom'; 
+import { findDOMNode } from 'react-dom';
 import cn from 'classnames';
 import { get, pickBy, isEmpty, debounce, throttle } from 'lodash';
 import { Spin } from 'antd';
@@ -91,7 +91,7 @@ export default class QueryList extends React.PureComponent {
     }
 
     onWindowResize = debounce(() => {
-        const {scroll} = this.state;
+        const { scroll } = this.state;
 
         this.setState({
             scroll: {
@@ -102,7 +102,7 @@ export default class QueryList extends React.PureComponent {
     }, 50)
 
     componentDidMount() {
-        const {qlsProps, actions} = this.props;
+        const { qlsProps, actions } = this.props;
 
         this.formData = {
             ...(actions.getFormData() || {}),
@@ -169,7 +169,7 @@ export default class QueryList extends React.PureComponent {
             rowKey,
             actions
         } = this.props;
-        const {pagination} = this.state;
+        const { pagination } = this.state;
         const hasPagination = this.props.pagination !== false;
 
         if (hasPagination) {
@@ -245,30 +245,34 @@ export default class QueryList extends React.PureComponent {
         }, val => val !== undefined);
     }
 
-    onSearch = (values, {callback, showLoading = true} = {}) => {
+    onSearch = (values, { callback, showLoading = true } = {}) => {
         this.formData = {
             ...this.formData,
             ...values
         };
         // this.props.actions.setData('formData', this.formData);
-        return this.fetchData(this.formData, {callback, showLoading});
+        return this.fetchData(this.formData, { callback, showLoading });
     };
 
     onTableChange = (pagination, filters, sorter) => {
         const { actions, localPagination } = this.props;
-
-        this.formData = {
-            ...this.formData,
+        const tableParams = {
             pageSize: pagination.pageSize,
             current: pagination.current,
             filters: isEmpty(filters) ? undefined : filters,
             sorter: isEmpty(sorter) ? undefined : sorter
         };
+        console.log('onTableChange...', actions.getSubmittedFormData(), this.formData);
+
+        Object.assign(this.formData, tableParams);
 
         // 排序变化暂时不处理，因为有时可能是前端sorter不需要走请求
         // 所以暂时排序有使用者自己处理
         if (!localPagination) {
-            this.fetchData(this.formData);
+            this.fetchData({
+                ...actions.getSubmittedFormData(),
+                ...tableParams
+            });
             return;
         }
 
@@ -292,7 +296,7 @@ export default class QueryList extends React.PureComponent {
             );
         }
     };
-    
+
     onTableBodyScroll = throttle(evt => {
         console.log('onTableBodyScroll', evt.target.scrollTop);
         this.updateIsScrollToBottom(evt.target);
@@ -306,7 +310,7 @@ export default class QueryList extends React.PureComponent {
         };
 
         this.setState({
-            hasScrollToBottom: isScrollToBottom(tableBody) 
-        }); 
+            hasScrollToBottom: isScrollToBottom(tableBody)
+        });
     }
 };

package/lib/ArrayInput/icon.js

@@ -1,28 +1,32 @@
-export const plusIcon = (
-    <svg
-        viewBox="64 64 896 896"
-        focusable="false"
-        data-icon="plus-circle"
-        width="1em"
-        height="1em"
-        fill="currentColor"
-        aria-hidden="true"
-    >
-        <path d="M696 480H544V328c0-4.4-3.6-8-8-8h-48c-4.4 0-8 3.6-8 8v152H328c-4.4 0-8 3.6-8 8v48c0 4.4 3.6 8 8 8h152v152c0 4.4 3.6 8 8 8h48c4.4 0 8-3.6 8-8V544h152c4.4 0 8-3.6 8-8v-48c0-4.4-3.6-8-8-8z"></path>
-        <path d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm0 820c-205.4 0-372-166.6-372-372s166.6-372 372-372 372 166.6 372 372-166.6 372-372 372z"></path>
-    </svg>
-);
+"use strict";
 
-export const deleteIcon = (
-    <svg
-        viewBox="64 64 896 896"
-        focusable="false"
-        data-icon="delete"
-        width="1em"
-        height="1em"
-        fill="currentColor"
-        aria-hidden="true"
-    >
-        <path d="M360 184h-8c4.4 0 8-3.6 8-8v8h304v-8c0 4.4 3.6 8 8 8h-8v72h72v-80c0-35.3-28.7-64-64-64H352c-35.3 0-64 28.7-64 64v80h72v-72zm504 72H160c-17.7 0-32 14.3-32 32v32c0 4.4 3.6 8 8 8h60.4l24.7 523c1.6 34.1 29.8 61 63.9 61h454c34.2 0 62.3-26.8 63.9-61l24.7-523H888c4.4 0 8-3.6 8-8v-32c0-17.7-14.3-32-32-32zM731.3 840H292.7l-24.2-512h487l-24.2 512z"></path>
-    </svg>
-);
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.deleteIcon = exports.plusIcon = void 0;
+var plusIcon = React.createElement("svg", {
+  viewBox: "64 64 896 896",
+  focusable: "false",
+  "data-icon": "plus-circle",
+  width: "1em",
+  height: "1em",
+  fill: "currentColor",
+  "aria-hidden": "true"
+}, React.createElement("path", {
+  d: "M696 480H544V328c0-4.4-3.6-8-8-8h-48c-4.4 0-8 3.6-8 8v152H328c-4.4 0-8 3.6-8 8v48c0 4.4 3.6 8 8 8h152v152c0 4.4 3.6 8 8 8h48c4.4 0 8-3.6 8-8V544h152c4.4 0 8-3.6 8-8v-48c0-4.4-3.6-8-8-8z"
+}), React.createElement("path", {
+  d: "M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm0 820c-205.4 0-372-166.6-372-372s166.6-372 372-372 372 166.6 372 372-166.6 372-372 372z"
+}));
+exports.plusIcon = plusIcon;
+var deleteIcon = React.createElement("svg", {
+  viewBox: "64 64 896 896",
+  focusable: "false",
+  "data-icon": "delete",
+  width: "1em",
+  height: "1em",
+  fill: "currentColor",
+  "aria-hidden": "true"
+}, React.createElement("path", {
+  d: "M360 184h-8c4.4 0 8-3.6 8-8v8h304v-8c0 4.4 3.6 8 8 8h-8v72h72v-80c0-35.3-28.7-64-64-64H352c-35.3 0-64 28.7-64 64v80h72v-72zm504 72H160c-17.7 0-32 14.3-32 32v32c0 4.4 3.6 8 8 8h60.4l24.7 523c1.6 34.1 29.8 61 63.9 61h454c34.2 0 62.3-26.8 63.9-61l24.7-523H888c4.4 0 8-3.6 8-8v-32c0-17.7-14.3-32-32-32zM731.3 840H292.7l-24.2-512h487l-24.2 512z"
+}));
+exports.deleteIcon = deleteIcon;