tntd 3.0.31-beta.1 → 3.0.32

package/es/query-form/index.less

@@ -1,39 +1,73 @@
 .tnt-queryform {
-  &-top {
-    display: flex;
-    flex: 1;
-    &-body {
-      flex: 1;
-      .ant-btn {
-        margin-right: 10px;
-      }
-    }
-  }
-  &-inline {
-    .tnt-queryform-top-body {
-      display: flex;
-      .tnt-queryform-composition-input {
-        flex: 1;
-      }
-    }
-  }
+  display: flex;
 
   &-extra {
+    line-height: 32px;
+    margin-left: 12px;
     & > * {
-      margin-left: 10px;
+      margin-left: 8px;
+    }
+  }
+
+  &-actions {
+    align-items: center;
+    display: inline-block;
+    height: 32px;
+    line-height: 32px;
+
+    & > *:not(.expand-link) {
+      margin-right: 10px;
+    }
+    & > .expand-link {
+      padding: 0;
+      margin-right: 0;
+    }
+    & > .ant-badge {
+      .tnt-icon {
+        margin-right: 8px;
+      }
     }
   }
 
   .ant-form {
-    // margin-bottom: @margin-sm;
+    display: inline-block;
+    margin-bottom: 12px;
+    display: flex;
+    flex: 1;
     &.ant-form-inline {
       flex-wrap: unset;
-      position: relative;
+    }
+
+    & > div:nth-child(1) {
+      height: 32px;
+      overflow: hidden;
+      .ant-form-item-label {
+        label {
+          // bottom: 4px;
+        }
+      }
+    }
+
+    &.expanded {
+      & > div:nth-child(1) {
+        height: auto !important;
+      }
+    }
+
+    &.showMore {
+      & > div:nth-child(1) {
+        .ant-form-item {
+          margin-bottom: 12px;
+        }
+      }
+    }
+
+    & > div:nth-child(2) {
+      display: flex;
     }
 
     &.ant-form-inline .ant-form-item {
       margin-right: 10px;
-      margin-bottom: @margin-sm;
       display: inline-block;
     }
 
@@ -41,7 +75,7 @@
       // min-width: 160px;
       line-height: unset;
       .ant-calendar-picker-input {
-        padding: 0 @padding-sm;
+        padding: 0 11px;
       }
       .ant-form-item-children {
         & > .ant-input,
@@ -54,7 +88,7 @@
   }
 
   &-drawer {
-    margin-top: @margin-xxl;
+    margin-top: 50px;
     &.large-size {
       margin-top: 60px;
     }
@@ -69,7 +103,7 @@
       .ant-form-item {
         display: block;
         margin-right: 0;
-        margin-bottom: @margin-md;
+        margin-bottom: 20px;
         width: 100%;
       }
       .ant-form-item-label {
@@ -91,7 +125,7 @@
         width: 100%;
         margin-bottom: 10px;
         &.ant-btn-primary {
-          margin-top: @margin-md;
+          margin-top: 20px;
         }
       }
     }

package/es/query-list-scene/List.js

@@ -1,5 +1,3 @@
-import _trim from "lodash/trim";
-import _isString from "lodash/isString";
 import _throttle from "lodash/throttle";
 import _pickBy from "lodash/pickBy";
 import _isEmpty from "lodash/isEmpty";
@@ -23,17 +21,6 @@ import { findDOMNode } from 'react-dom';
 import { getLanguage, getText } from '../prev-locale';
 import Spin from '../spin';
 import Table from '../table';
-const trimSpace = params => {
-  if (params) {
-    Object.keys(params).forEach(key => {
-      const value = params[key];
-      if (_isString(value)) {
-        params[key] = _trim(value);
-      }
-    });
-  }
-  return params;
-};
 export default class QueryList extends React.PureComponent {
   constructor(props) {
     var _a;
@@ -154,7 +141,8 @@ export default class QueryList extends React.PureComponent {
         callback,
         showLoading = true
       } = {}) => {
-        this.formData = trimSpace(Object.assign(Object.assign({}, this.formData), values));
+        this.formData = Object.assign(Object.assign({}, this.formData), values);
+        // this.props.actions.setData('formData', this.formData);
         return this.fetchData(this.formData, {
           callback,
           showLoading

package/es/query-list-scene/List.js.map

@@ -1 +1 @@
-{"version":3,"file":"List.js","sourceRoot":"","sources":["../../src/query-list-scene/List.js"],"names":[],"mappings":";;;;;;;;;;;AAAA;;;GAGG;AACH,OAAO,EAAE,MAAM,YAAY,CAAA;AAC3B,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AACjF,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AAEvC,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAA;AACrD,OAAO,IAAI,MAAM,SAAS,CAAA;AAC1B,OAAO,KAAK,MAAM,UAAU,CAAA;AAE5B,MAAM,SAAS,GAAG,CAAC,MAAM,EAAE,EAAE;IAC3B,IAAI,MAAM,EAAE;QACV,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YAClC,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAA;YACzB,IAAI,QAAQ,CAAC,KAAK,CAAC,EAAE;gBACnB,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAA;aAC1B;QACH,CAAC,CAAC,CAAA;KACH;IACD,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AAED,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,KAAK,CAAC,aAAa;IACxD,YAAY,KAAK;;QACf,KAAK,CAAC,KAAK,CAAC,CAAA;QAoFd;;;;mBAAiB,QAAQ,CAAC,GAAG,EAAE;gBAC7B,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;gBAE7B,IAAI,CAAC,QAAQ,CAAC;oBACZ,MAAM,kCACD,MAAM,KACT,CAAC,EAAE,MAAM,CAAC,WAAW,GAAG,CAAC,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,IAAI,GAAG,CAAC,GACnE;iBACF,CAAC,CAAA;YACJ,CAAC,EAAE,EAAE,CAAC;WAAA;QAgEN;;;;mBAAY,CAAC,MAAM,GAAG,EAAE,EAAE,EAAE,QAAQ,EAAE,WAAW,GAAG,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,EAAE,EAAE;gBAC7E,MAAM,EACJ,QAAQ,EAAE,EAAE,KAAK,EAAE,EACnB,oBAAoB,EACpB,MAAM,EACN,OAAO,GACR,GAAG,IAAI,CAAC,KAAK,CAAA;gBACd,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;gBACjC,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,KAAK,KAAK,CAAA;gBAErD,IAAI,aAAa,EAAE;oBACjB,MAAM,mBACJ,QAAQ,EAAE,UAAU,CAAC,QAAQ,EAC7B,OAAO,EAAE,UAAU,CAAC,OAAO,IACxB,MAAM,CACV,CAAA;iBACF;gBAED,WAAW;oBACT,IAAI,CAAC,QAAQ,CAAC;wBACZ,OAAO,EAAE,IAAI;qBACd,CAAC,CAAA;gBAEJ,qCAAqC;gBACrC,IAAI,CAAC,UAAU,EAAE;oBACf,IAAI,CAAC,UAAU,GAAG,IAAI,CAAA;iBACvB;gBAED,OAAO,CAAC,OAAO,CAAC,mBAAmB,EAAE,MAAM,CAAC,CAAA;gBAE5C,OAAO,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,EAAE,IAAI,GAAG,KAAK,IAAI,IAAI,GAAG,KAAK,SAAS,CAAC,CAAC;qBACnF,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;oBACf,MAAM,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,MAAM,CAAA;oBAE7D,IAAI,CAAC,QAAQ,iBAET,OAAO,EAAE,KAAK,EACd,UAAU,EACV,UAAU,EAAE,aAAa;4BACvB,CAAC,CAAC;gCACE,QAAQ,EAAE,MAAM,CAAC,QAAQ,IAAI,UAAU,CAAC,QAAQ,IAAI,EAAE;gCACtD,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,OAAO,IAAI,UAAU,CAAC,OAAO,IAAI,CAAC;gCACpE,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,CAAC;6BACzB;4BACH,CAAC,CAAC,IAAI,IACL,CAAC,oBAAoB;wBACtB,CAAC,CAAC;4BACE,eAAe,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;yBACtD;wBACH,CAAC,CAAC,EAAE,CAAC,GAET,GAAG,EAAE;wBACH,OAAO,CAAC,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;wBACpD,OAAO,CAAC,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;oBACtD,CAAC,CACF,CAAA;gBACH,CAAC,CAAC;qBACD,OAAO,CAAC,GAAG,EAAE;oBACZ,IAAI,CAAC,UAAU,GAAG,KAAK,CAAA;oBACvB,WAAW;wBACT,IAAI,CAAC,QAAQ,CAAC;4BACZ,OAAO,EAAE,KAAK;yBACf,CAAC,CAAA;oBACJ,QAAQ,IAAI,QAAQ,EAAE,CAAA;gBACxB,CAAC,CAAC,CAAA;YACN,CAAC;WAAA;QAED;;;;mBAAmB,CAAC,UAAU,EAAE,EAAE;gBAChC,IAAI,CAAC,QAAQ,CAAC;oBACZ,UAAU;iBACX,CAAC,CAAA;gBACF,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,YAAY,EAAE,UAAU,CAAC,CAAA;YACtD,CAAC;WAAA;QAED;;;;mBAAmB,CAAC,UAAU,EAAE,EAAE;gBAChC,IAAI,CAAC,QAAQ,CAAC;oBACZ,UAAU;iBACX,CAAC,CAAA;gBACF,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,YAAY,EAAE,UAAU,CAAC,CAAA;YACtD,CAAC;WAAA;QAED;;;;mBAAe,CAAC,MAAM,EAAE,EAAE;gBACxB,IAAI,CAAC,QAAQ,GAAG,MAAM,iCAEf,MAAM,KACT,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,EACpC,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,SAAS,CAAC,KAExC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,SAAS,CAC3B,CAAA;YACH,CAAC;WAAA;QAED;;;;mBAAW,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,WAAW,GAAG,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE;gBAC3D,IAAI,CAAC,QAAQ,GAAG,SAAS,iCACpB,IAAI,CAAC,QAAQ,GACb,MAAM,EACT,CAAA;gBACF,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,CAAA;YACjE,CAAC;WAAA;QAED;;;;mBAAgB,CAAC,UAAU,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;gBAC9C,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;gBAC/C,MAAM,WAAW,GAAG;oBAClB,QAAQ,EAAE,UAAU,CAAC,QAAQ;oBAC7B,OAAO,EAAE,UAAU,CAAC,OAAO;oBAC3B,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO;oBAC/C,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM;iBAC7C,CAAA;gBAED,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAA;gBAEzC,kCAAkC;gBAClC,iBAAiB;gBACjB,IAAI,CAAC,eAAe,EAAE;oBACpB,IAAI,CAAC,SAAS,iCACT,OAAO,CAAC,oBAAoB,EAAE,GAC9B,WAAW,EACd,CAAA;oBACF,OAAM;iBACP;gBAED,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;gBAEjC,SAAS;gBACT,IAAI,eAAe,EAAE;oBACnB,IAAI,CAAC,QAAQ,CACX;wBACE,UAAU;wBACV,UAAU,EAAE;4BACV,OAAO,EAAE,UAAU,CAAC,OAAO;4BAC3B,QAAQ,EAAE,UAAU,CAAC,QAAQ;4BAC7B,KAAK,EAAE,UAAU,CAAC,KAAK;yBACxB;qBACF,EACD,GAAG,EAAE;wBACH,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAA;wBAC1C,OAAO,CAAC,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;oBACtD,CAAC,CACF,CAAA;iBACF;YACH,CAAC;WAAA;QAED;;;;mBAAoB,QAAQ,CAAC,CAAC,GAAG,EAAE,EAAE;gBACnC,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;YACzC,CAAC,EAAE,EAAE,CAAC;WAAA;QAEN;;;;mBAAyB,CAAC,SAAS,EAAE,EAAE;gBACrC,MAAM,gBAAgB,GAAG,CAAC,SAAS,EAAE,EAAE;oBACrC,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,YAAY,EAAE,GAAG,SAAS,CAAA;oBAE3D,OAAO,YAAY,KAAK,SAAS,GAAG,YAAY,CAAA;gBAClD,CAAC,CAAA;gBAED,IAAI,CAAC,QAAQ,CAAC;oBACZ,iBAAiB,EAAE,gBAAgB,CAAC,SAAS,CAAC;iBAC/C,CAAC,CAAA;YACJ,CAAC;WAAA;QAxTC,IAAI,CAAC,KAAK,GAAG;YACX,OAAO,EAAE,KAAK;YACd,UAAU,EAAE,EAAE;YACd,UAAU,EAAE;gBACV,gBAAgB;gBAChB,OAAO,EAAE,CAAC;gBACV,KAAK,EAAE,CAAC;aACT;YACD,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,iBAAiB,EAAE,CAAC,CAAA,MAAA,KAAK,CAAC,MAAM,0CAAE,CAAC,CAAA;SACpC,CAAA;QAED,IAAI,CAAC,QAAQ,GAAG,SAAS,EAAE,CAAA;QAE3B,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAA;QACzB,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAA;QACnC,OAAO,CAAC,EAAE,CAAC,oBAAoB,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAA;QACvD,OAAO,CAAC,EAAE,CAAC,eAAe,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAA;QAClD,OAAO,CAAC,EAAE,CAAC,aAAa,EAAE,IAAI,CAAC,YAAY,CAAC,CAAA;IAC9C,CAAC;IAED,MAAM;QACJ,MAAM,KASF,IAAI,CAAC,KAAK,EATR,EACJ,OAAO,EACP,QAAQ,EACR,UAAU,EACV,eAAe,GAAG,KAAK,EACvB,gBAAgB,GAAG,KAAK,EACxB,SAAS,GAAG,EAAE,EACd,QAAQ,OAEI,EADT,IAAI,cARH,qGASL,CAAa,CAAA;QACd,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,eAAe,GAAG,EAAE,EAAE,MAAM,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;QAC3F,MAAM,aAAa,GAAG,OAAO,UAAU,KAAK,WAAW,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAA;QAC3E,MAAM,cAAc,+CAClB,gBAAgB,EAAE,KAAK,IACpB,IAAI,CAAC,KAAK,CAAC,UAAU;YACxB,iBAAiB;YACjB,eAAe,EAAE,IAAI,EACrB,eAAe,EAAE,IAAI,EACrB,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,CAAC,cAAc,EAAE,WAAW,EAAE,EAAE,KAAK,CAAC,KAChE,CAAC,UAAU,IAAI,EAAE,CAAC,CACtB,CAAA;QACD,MAAM,WAAW,qBACZ,CAAC,IAAI,CAAC,oBAAoB;YAC3B,CAAC,CAAC;gBACE,eAAe;gBACf,oBAAoB,EAAE,IAAI,CAAC,oBAAoB;aAChD;YACH,CAAC,CAAC,EAAE,CAAC,CACR,CAAA;QAED,OAAO,CACL,6BACE,SAAS,EAAE,EAAE,CAAC,2BAA2B,SAAS,EAAE,EAAE;gBACpD,gBAAgB;gBAChB,iBAAiB;aAClB,CAAC;YAEF,oBAAC,IAAI,IAAC,QAAQ,EAAE,OAAO;gBACrB,oBAAC,KAAK,kBACJ,GAAG,EAAE,IAAI,CAAC,QAAQ,EAClB,QAAQ,EAAE,KAAK,EACf,QAAQ,EAAE,KAAK,IACX,WAAW,EACX,IAAI,EACJ,CAAC,OAAO;oBACV,CAAC,CAAC;wBACE,OAAO;qBACR;oBACH,CAAC,CAAC,EAAE,CAAC,IACP,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,aAAa,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,eAAe,EAC5D,QAAQ,EAAE,IAAI,CAAC,aAAa,KAE3B,CAAC,OAAO,IAAI,QAAQ,CACf,CACH,CACH,CACP,CAAA;IACH,CAAC;IAaD,iBAAiB;;QACf,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;QAExC,IAAI,CAAC,QAAQ,mCACR,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,GAE7B,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CACpD,CAAA;QAED,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE;YACxB,UAAU;YACV,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE;gBACzC,KAAK;gBACL,IAAI,QAAQ,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;oBAC1C,MAAM,eAAe,GAAG,CAAC,EAAE,EAAE,EAAE;wBAC7B,uBAAuB;wBACvB,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;4BACrB,IAAI,CAAC,MAAM,GAAG,UAAU,CAAC,GAAG,EAAE;gCAC5B,gCAAgC;gCAChC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;oCACpB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,oBAAoB,EAAE,EAAE;wCAC7C,UAAU,EAAE,IAAI;wCAChB,WAAW,EAAE,KAAK;qCACnB,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;wCACX,eAAe,CAAC,EAAE,CAAC,CAAA;oCACrB,CAAC,CAAC,CAAA;iCACH;qCAAM;oCACL,eAAe,CAAC,EAAE,CAAC,CAAA;iCACpB;4BACH,CAAC,EAAE,EAAE,CAAC,CAAA;yBACP;oBACH,CAAC,CAAA;oBACD,eAAe,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;iBACnC;YACH,CAAC,CAAC,CAAA;SACH;QACD,IAAI,MAAA,IAAI,CAAC,KAAK,CAAC,MAAM,0CAAE,CAAC,EAAE;YACxB,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,IAAI,CAAC,cAAc,CAAC,CAAA;YAEtD,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE;gBACzB,6BAA6B;gBAC7B,MAAM,SAAS,GAAG,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAA;gBACrF,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAA;gBAC1D,IAAI,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAA;gBACtC,SAAS,CAAC,gBAAgB,CAAC,QAAQ,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAA;aAC7D;SACF;IACH,CAAC;IAED,oBAAoB;QAClB,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;QAE9B,IAAI,CAAC,WAAW,GAAG,IAAI,CAAA;QAEvB,OAAO,CAAC,cAAc,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAA;QAC/C,OAAO,CAAC,cAAc,CAAC,oBAAoB,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAA;QACnE,OAAO,CAAC,cAAc,CAAC,eAAe,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAA;QAC9D,OAAO,CAAC,cAAc,CAAC,aAAa,EAAE,IAAI,CAAC,YAAY,CAAC,CAAA;QACxD,MAAM,CAAC,mBAAmB,CAAC,QAAQ,EAAE,IAAI,CAAC,cAAc,CAAC,CAAA;QACzD,IAAI,CAAC,MAAM,IAAI,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAC1C,CAAC;CA+JF","sourcesContent":["/**\n * @file QueryList\n * @author you.zhang\n */\nimport cn from 'classnames'\nimport { debounce, get, isEmpty, pickBy, throttle, isString, trim } from 'lodash'\nimport React, { createRef } from 'react'\nimport { findDOMNode } from 'react-dom'\n\nimport { getLanguage, getText } from '../prev-locale'\nimport Spin from '../spin'\nimport Table from '../table'\n\nconst trimSpace = (params) => {\n  if (params) {\n    Object.keys(params).forEach((key) => {\n      const value = params[key]\n      if (isString(value)) {\n        params[key] = trim(value)\n      }\n    })\n  }\n  return params\n}\n\nexport default class QueryList extends React.PureComponent {\n  constructor(props) {\n    super(props)\n    this.state = {\n      loading: false,\n      dataSource: [],\n      pagination: {\n        // pageSize: 20,\n        current: 1,\n        total: 0,\n      },\n      scroll: props.scroll,\n      hasScrollToBottom: !props.scroll?.y,\n    }\n\n    this.tableRef = createRef()\n\n    const { actions } = props\n    actions.on('search', this.onSearch)\n    actions.on('setTableDataSource', this.updateDataSource)\n    actions.on('setPagination', this.updatePagination)\n    actions.on('setFormData', this.onFormChange)\n  }\n\n  render() {\n    const {\n      columns,\n      children,\n      pagination,\n      localPagination = false,\n      paginationSticky = false,\n      className = '',\n      qlsProps,\n      ...rest\n    } = this.props\n    const { dataSource, loading, expandedRowKeys = [], scroll, hasScrollToBottom } = this.state\n    const hasPagination = typeof pagination !== 'undefined' ? pagination : true\n    const paginationInfo = {\n      hideOnSinglePage: false,\n      ...this.state.pagination,\n      // size: 'small',\n      showQuickJumper: true,\n      showSizeChanger: true,\n      showTotal: (total) => getText('totalRecords', getLanguage(), total),\n      ...(pagination || {}),\n    }\n    const expandProps = {\n      ...(rest.defaultExpandAllRows\n        ? {\n            expandedRowKeys,\n            onExpandedRowsChange: this.onExpandedRowsChange,\n          }\n        : {}),\n    }\n\n    return (\n      <div\n        className={cn(`tnt-querylistscene-list ${className}`, {\n          paginationSticky,\n          hasScrollToBottom,\n        })}\n      >\n        <Spin spinning={loading}>\n          <Table\n            ref={this.tableRef}\n            shadowed={false}\n            bordered={false}\n            {...expandProps}\n            {...rest}\n            {...(columns\n              ? {\n                  columns,\n                }\n              : {})}\n            scroll={scroll}\n            dataSource={dataSource}\n            pagination={hasPagination ? paginationInfo : localPagination}\n            onChange={this.onTableChange}\n          >\n            {!columns && children}\n          </Table>\n        </Spin>\n      </div>\n    )\n  }\n\n  onWindowResize = debounce(() => {\n    const { scroll } = this.state\n\n    this.setState({\n      scroll: {\n        ...scroll,\n        y: window.innerHeight - (this.initialTop || this.props.top || 200),\n      },\n    })\n  }, 50)\n\n  componentDidMount() {\n    const { qlsProps, actions } = this.props\n\n    this.formData = {\n      ...(actions.getFormData() || {}),\n      // 记住上次查询的分页参数\n      ...(qlsProps.memory ? actions.getPagination() : {}),\n    }\n\n    if (!qlsProps.initSearch) {\n      // 默认进来不请求\n      this.fetchData(this.formData).finally(() => {\n        // 轮询\n        if (qlsProps.interval && !this.isUnmounted) {\n          const doIntervalQuery = (ms) => {\n            // 组件unmounted后，不执行轮训逻辑\n            if (!this.isUnmounted) {\n              this.timmer = setTimeout(() => {\n                // 如果有查询请求还未结束，则该次轮询不执行，重新设置下次轮询\n                if (!this.isFetching) {\n                  this.fetchData(actions.getSubmittedFormData(), {\n                    isInterval: true,\n                    showLoading: false,\n                  }).then(() => {\n                    doIntervalQuery(ms)\n                  })\n                } else {\n                  doIntervalQuery(ms)\n                }\n              }, ms)\n            }\n          }\n          doIntervalQuery(qlsProps.interval)\n        }\n      })\n    }\n    if (this.state.scroll?.y) {\n      window.addEventListener('resize', this.onWindowResize)\n\n      if (this.tableRef.current) {\n        // table内垂直滚动，需要动态设置分页组件上阴影样式\n        const tableBody = findDOMNode(this.tableRef.current).querySelector('.ant-table-body')\n        this.initialTop = window.innerHeight - this.state.scroll.y\n        this.updateIsScrollToBottom(tableBody)\n        tableBody.addEventListener('scroll', this.onTableBodyScroll)\n      }\n    }\n  }\n\n  componentWillUnmount() {\n    const { actions } = this.props\n\n    this.isUnmounted = true\n\n    actions.removeListener('search', this.onSearch)\n    actions.removeListener('setTableDataSource', this.updateDataSource)\n    actions.removeListener('setPagination', this.updatePagination)\n    actions.removeListener('setFormData', this.onFormChange)\n    window.removeEventListener('resize', this.onWindowResize)\n    this.timmer && clearTimeout(this.timmer)\n  }\n\n  fetchData = (params = {}, { callback, showLoading = true, isInterval } = {}) => {\n    const {\n      qlsProps: { query },\n      defaultExpandAllRows,\n      rowKey,\n      actions,\n    } = this.props\n    const { pagination } = this.state\n    const hasPagination = this.props.pagination !== false\n\n    if (hasPagination) {\n      params = {\n        pageSize: pagination.pageSize,\n        current: pagination.current,\n        ...params,\n      }\n    }\n\n    showLoading &&\n      this.setState({\n        loading: true,\n      })\n\n    // 当用户操作查询还未得到服务端响应前,不要执行轮询请求时序问题导致覆盖\n    if (!isInterval) {\n      this.isFetching = true\n    }\n\n    actions.setData('submittedFormData', params)\n\n    return query(pickBy(params, (val) => val !== '' && val !== null && val !== undefined))\n      .then((result) => {\n        const dataSource = hasPagination ? result.data || [] : result\n\n        this.setState(\n          {\n            loading: false,\n            dataSource,\n            pagination: hasPagination\n              ? {\n                  pageSize: result.pageSize || pagination.pageSize || 10,\n                  current: result.current || params.current || pagination.current || 1,\n                  total: result.total || 0,\n                }\n              : null,\n            ...(defaultExpandAllRows\n              ? {\n                  expandedRowKeys: dataSource.map((row) => row[rowKey]),\n                }\n              : {}),\n          },\n          () => {\n            actions.setData('pagination', this.state.pagination)\n            actions.setData('dataSource', this.state.dataSource)\n          }\n        )\n      })\n      .finally(() => {\n        this.isFetching = false\n        showLoading &&\n          this.setState({\n            loading: false,\n          })\n        callback && callback()\n      })\n  }\n\n  updateDataSource = (dataSource) => {\n    this.setState({\n      dataSource,\n    })\n    this.props.actions.setData('dataSource', dataSource)\n  }\n\n  updatePagination = (pagination) => {\n    this.setState({\n      pagination,\n    })\n    this.props.actions.setData('pagination', pagination)\n  }\n\n  onFormChange = (values) => {\n    this.formData = pickBy(\n      {\n        ...values,\n        sorter: get(this.formData, 'sorter'),\n        filters: get(this.formData, 'filters'),\n      },\n      (val) => val !== undefined\n    )\n  }\n\n  onSearch = (values, { callback, showLoading = true } = {}) => {\n    this.formData = trimSpace({\n      ...this.formData,\n      ...values,\n    })\n    return this.fetchData(this.formData, { callback, showLoading })\n  }\n\n  onTableChange = (pagination, filters, sorter) => {\n    const { actions, localPagination } = this.props\n    const tableParams = {\n      pageSize: pagination.pageSize,\n      current: pagination.current,\n      filters: isEmpty(filters) ? undefined : filters,\n      sorter: isEmpty(sorter) ? undefined : sorter,\n    }\n\n    Object.assign(this.formData, tableParams)\n\n    // 排序变化暂时不处理，因为有时可能是前端sorter不需要走请求\n    // 所以暂时排序有使用者自己处理\n    if (!localPagination) {\n      this.fetchData({\n        ...actions.getSubmittedFormData(),\n        ...tableParams,\n      })\n      return\n    }\n\n    const { dataSource } = this.state\n\n    // 前端本地分页\n    if (localPagination) {\n      this.setState(\n        {\n          dataSource,\n          pagination: {\n            current: pagination.current,\n            pageSize: pagination.pageSize,\n            total: pagination.total,\n          },\n        },\n        () => {\n          actions.setData('formData', this.formData)\n          actions.setData('pagination', this.state.pagination)\n        }\n      )\n    }\n  }\n\n  onTableBodyScroll = throttle((evt) => {\n    this.updateIsScrollToBottom(evt.target)\n  }, 50)\n\n  updateIsScrollToBottom = (tableBody) => {\n    const isScrollToBottom = (tableBody) => {\n      const { scrollHeight, scrollTop, offsetHeight } = tableBody\n\n      return scrollHeight === scrollTop + offsetHeight\n    }\n\n    this.setState({\n      hasScrollToBottom: isScrollToBottom(tableBody),\n    })\n  }\n}\n"]}
+{"version":3,"file":"List.js","sourceRoot":"","sources":["../../src/query-list-scene/List.js"],"names":[],"mappings":"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","sourcesContent":["/**\n * @file QueryList\n * @author you.zhang\n */\nimport cn from 'classnames'\nimport { debounce, get, isEmpty, pickBy, throttle } from 'lodash'\nimport React, { createRef } from 'react'\nimport { findDOMNode } from 'react-dom'\n\nimport { getLanguage, getText } from '../prev-locale'\nimport Spin from '../spin'\nimport Table from '../table'\n\nexport default class QueryList extends React.PureComponent {\n  constructor(props) {\n    super(props)\n    this.state = {\n      loading: false,\n      dataSource: [],\n      pagination: {\n        // pageSize: 20,\n        current: 1,\n        total: 0,\n      },\n      scroll: props.scroll,\n      hasScrollToBottom: !props.scroll?.y,\n    }\n\n    this.tableRef = createRef()\n\n    const { actions } = props\n    actions.on('search', this.onSearch)\n    actions.on('setTableDataSource', this.updateDataSource)\n    actions.on('setPagination', this.updatePagination)\n    actions.on('setFormData', this.onFormChange)\n  }\n\n  render() {\n    const {\n      columns,\n      children,\n      pagination,\n      localPagination = false,\n      paginationSticky = false,\n      className = '',\n      qlsProps,\n      ...rest\n    } = this.props\n    const { dataSource, loading, expandedRowKeys = [], scroll, hasScrollToBottom } = this.state\n    const hasPagination = typeof pagination !== 'undefined' ? pagination : true\n    const paginationInfo = {\n      hideOnSinglePage: false,\n      ...this.state.pagination,\n      // size: 'small',\n      showQuickJumper: true,\n      showSizeChanger: true,\n      showTotal: (total) => getText('totalRecords', getLanguage(), total),\n      ...(pagination || {}),\n    }\n    const expandProps = {\n      ...(rest.defaultExpandAllRows\n        ? {\n            expandedRowKeys,\n            onExpandedRowsChange: this.onExpandedRowsChange,\n          }\n        : {}),\n    }\n\n    return (\n      <div\n        className={cn(`tnt-querylistscene-list ${className}`, {\n          paginationSticky,\n          hasScrollToBottom,\n        })}\n      >\n        <Spin spinning={loading}>\n          <Table\n            ref={this.tableRef}\n            shadowed={false}\n            bordered={false}\n            {...expandProps}\n            {...rest}\n            {...(columns\n              ? {\n                  columns,\n                }\n              : {})}\n            scroll={scroll}\n            dataSource={dataSource}\n            pagination={hasPagination ? paginationInfo : localPagination}\n            onChange={this.onTableChange}\n          >\n            {!columns && children}\n          </Table>\n        </Spin>\n      </div>\n    )\n  }\n\n  onWindowResize = debounce(() => {\n    const { scroll } = this.state\n\n    this.setState({\n      scroll: {\n        ...scroll,\n        y: window.innerHeight - (this.initialTop || this.props.top || 200),\n      },\n    })\n  }, 50)\n\n  componentDidMount() {\n    const { qlsProps, actions } = this.props\n\n    this.formData = {\n      ...(actions.getFormData() || {}),\n      // 记住上次查询的分页参数\n      ...(qlsProps.memory ? actions.getPagination() : {}),\n    }\n\n    if (!qlsProps.initSearch) {\n      // 默认进来不请求\n      this.fetchData(this.formData).finally(() => {\n        // 轮询\n        if (qlsProps.interval && !this.isUnmounted) {\n          const doIntervalQuery = (ms) => {\n            // 组件unmounted后，不执行轮训逻辑\n            if (!this.isUnmounted) {\n              this.timmer = setTimeout(() => {\n                // 如果有查询请求还未结束，则该次轮询不执行，重新设置下次轮询\n                if (!this.isFetching) {\n                  this.fetchData(actions.getSubmittedFormData(), {\n                    isInterval: true,\n                    showLoading: false,\n                  }).then(() => {\n                    doIntervalQuery(ms)\n                  })\n                } else {\n                  doIntervalQuery(ms)\n                }\n              }, ms)\n            }\n          }\n          doIntervalQuery(qlsProps.interval)\n        }\n      })\n    }\n    if (this.state.scroll?.y) {\n      window.addEventListener('resize', this.onWindowResize)\n\n      if (this.tableRef.current) {\n        // table内垂直滚动，需要动态设置分页组件上阴影样式\n        const tableBody = findDOMNode(this.tableRef.current).querySelector('.ant-table-body')\n        this.initialTop = window.innerHeight - this.state.scroll.y\n        this.updateIsScrollToBottom(tableBody)\n        tableBody.addEventListener('scroll', this.onTableBodyScroll)\n      }\n    }\n  }\n\n  componentWillUnmount() {\n    const { actions } = this.props\n\n    this.isUnmounted = true\n\n    actions.removeListener('search', this.onSearch)\n    actions.removeListener('setTableDataSource', this.updateDataSource)\n    actions.removeListener('setPagination', this.updatePagination)\n    actions.removeListener('setFormData', this.onFormChange)\n    window.removeEventListener('resize', this.onWindowResize)\n    this.timmer && clearTimeout(this.timmer)\n  }\n\n  fetchData = (params = {}, { callback, showLoading = true, isInterval } = {}) => {\n    const {\n      qlsProps: { query },\n      defaultExpandAllRows,\n      rowKey,\n      actions,\n    } = this.props\n    const { pagination } = this.state\n    const hasPagination = this.props.pagination !== false\n\n    if (hasPagination) {\n      params = {\n        pageSize: pagination.pageSize,\n        current: pagination.current,\n        ...params,\n      }\n    }\n\n    showLoading &&\n      this.setState({\n        loading: true,\n      })\n\n    // 当用户操作查询还未得到服务端响应前,不要执行轮询请求时序问题导致覆盖\n    if (!isInterval) {\n      this.isFetching = true\n    }\n\n    actions.setData('submittedFormData', params)\n\n    return query(pickBy(params, (val) => val !== '' && val !== null && val !== undefined))\n      .then((result) => {\n        const dataSource = hasPagination ? result.data || [] : result\n\n        this.setState(\n          {\n            loading: false,\n            dataSource,\n            pagination: hasPagination\n              ? {\n                  pageSize: result.pageSize || pagination.pageSize || 10,\n                  current: result.current || params.current || pagination.current || 1,\n                  total: result.total || 0,\n                }\n              : null,\n            ...(defaultExpandAllRows\n              ? {\n                  expandedRowKeys: dataSource.map((row) => row[rowKey]),\n                }\n              : {}),\n          },\n          () => {\n            actions.setData('pagination', this.state.pagination)\n            actions.setData('dataSource', this.state.dataSource)\n          }\n        )\n      })\n      .finally(() => {\n        this.isFetching = false\n        showLoading &&\n          this.setState({\n            loading: false,\n          })\n        callback && callback()\n      })\n  }\n\n  updateDataSource = (dataSource) => {\n    this.setState({\n      dataSource,\n    })\n    this.props.actions.setData('dataSource', dataSource)\n  }\n\n  updatePagination = (pagination) => {\n    this.setState({\n      pagination,\n    })\n    this.props.actions.setData('pagination', pagination)\n  }\n\n  onFormChange = (values) => {\n    this.formData = pickBy(\n      {\n        ...values,\n        sorter: get(this.formData, 'sorter'),\n        filters: get(this.formData, 'filters'),\n      },\n      (val) => val !== undefined\n    )\n  }\n\n  onSearch = (values, { callback, showLoading = true } = {}) => {\n    this.formData = {\n      ...this.formData,\n      ...values,\n    }\n    // this.props.actions.setData('formData', this.formData);\n    return this.fetchData(this.formData, { callback, showLoading })\n  }\n\n  onTableChange = (pagination, filters, sorter) => {\n    const { actions, localPagination } = this.props\n    const tableParams = {\n      pageSize: pagination.pageSize,\n      current: pagination.current,\n      filters: isEmpty(filters) ? undefined : filters,\n      sorter: isEmpty(sorter) ? undefined : sorter,\n    }\n\n    Object.assign(this.formData, tableParams)\n\n    // 排序变化暂时不处理，因为有时可能是前端sorter不需要走请求\n    // 所以暂时排序有使用者自己处理\n    if (!localPagination) {\n      this.fetchData({\n        ...actions.getSubmittedFormData(),\n        ...tableParams,\n      })\n      return\n    }\n\n    const { dataSource } = this.state\n\n    // 前端本地分页\n    if (localPagination) {\n      this.setState(\n        {\n          dataSource,\n          pagination: {\n            current: pagination.current,\n            pageSize: pagination.pageSize,\n            total: pagination.total,\n          },\n        },\n        () => {\n          actions.setData('formData', this.formData)\n          actions.setData('pagination', this.state.pagination)\n        }\n      )\n    }\n  }\n\n  onTableBodyScroll = throttle((evt) => {\n    this.updateIsScrollToBottom(evt.target)\n  }, 50)\n\n  updateIsScrollToBottom = (tableBody) => {\n    const isScrollToBottom = (tableBody) => {\n      const { scrollHeight, scrollTop, offsetHeight } = tableBody\n\n      return scrollHeight === scrollTop + offsetHeight\n    }\n\n    this.setState({\n      hasScrollToBottom: isScrollToBottom(tableBody),\n    })\n  }\n}\n"]}

package/es/query-list-scene/QueryForm.js

@@ -6,13 +6,11 @@ var __rest = this && this.__rest || function (s, e) {
   }
   return t;
 };
-import classnames from 'classnames';
 import React from 'react';
-// import Form from '../query-form'
+import classnames from 'classnames';
 import Form from '../query-form';
-import Field from '../query-form/Field';
 const clsPrefix = 'tnt-querylistscene-queryform';
-class QueryForm extends React.PureComponent {
+export default class QueryForm extends React.PureComponent {
   constructor(props) {
     super(props);
     Object.defineProperty(this, "onSearch", {
@@ -42,14 +40,11 @@ class QueryForm extends React.PureComponent {
       writable: true,
       value: () => {
         const {
-          initialValues = {},
+          initialValues,
           onReset,
           actions
         } = this.props;
-        const resetValues = Object.assign(Object.assign({}, initialValues), {
-          pageSize: initialValues.pageSize || 10
-        });
-        actions.setFormData(resetValues, false);
+        actions.setFormData(initialValues, false);
         onReset === null || onReset === void 0 ? void 0 : onReset(initialValues);
         this.onSearch();
       }
@@ -58,24 +53,13 @@ class QueryForm extends React.PureComponent {
       enumerable: true,
       configurable: true,
       writable: true,
-      value: (newValues, changedInfo) => {
+      value: (newValues, changedInfo, ...rest) => {
         const {
           onChange,
           actions
         } = this.props;
         actions.setFormData(newValues, false);
-        onChange === null || onChange === void 0 ? void 0 : onChange(newValues, changedInfo);
-      }
-    });
-    Object.defineProperty(this, "_setFormData", {
-      enumerable: true,
-      configurable: true,
-      writable: true,
-      value: (data, needSearch) => {
-        const values = actions.getFormData();
-        actions.setFormData(Object.assign(Object.assign({}, data), {
-          current: 1
-        }), needSearch);
+        onChange === null || onChange === void 0 ? void 0 : onChange(newValues, changedInfo, ...rest);
       }
     });
     Object.defineProperty(this, "setFormData", {
@@ -119,20 +103,17 @@ class QueryForm extends React.PureComponent {
         actions,
         extraActions,
         extralActions,
-        qlsProps,
-        onChange
+        qlsProps
       } = _a,
-      props = __rest(_a, ["className", "actions", "extraActions", "extralActions", "qlsProps", "onChange"]);
+      props = __rest(_a, ["className", "actions", "extraActions", "extralActions", "qlsProps"]);
     return React.createElement(Form, Object.assign({}, props, {
       form: this.form,
       className: classnames(clsPrefix, className),
       // 前期拼写错误，导致需要兼容错误的api
       extraActions: extraActions || extralActions,
-      hasOnChange: !!onChange,
       onChange: this.onChange,
       onSearch: this.onSearch,
-      onReset: this.onReset,
-      setFormData: this._setFormData
+      onReset: this.onReset
     }));
   }
   componentDidMount() {
@@ -143,12 +124,7 @@ class QueryForm extends React.PureComponent {
       memory
     } = this.props;
     if (qlsProps.memory || memory) {
-      const formData = Object.assign(Object.assign({}, initialValues), actions.getFormData());
-      actions.setData('formData', formData);
-      setTimeout(() => {
-        // 回写Composition
-        this.form.setValues(formData);
-      }, 100);
+      actions.setFormData(Object.assign(Object.assign({}, initialValues), actions.getFormData()), false);
     } else {
       actions.setData('formData', initialValues);
     }
@@ -161,5 +137,4 @@ class QueryForm extends React.PureComponent {
     actions.removeListener('resetFormData', this.resetFormData);
   }
 }
-QueryForm.Field = Field;
-export default QueryForm;
+QueryForm.Field = Form.Field;

package/es/query-list-scene/QueryForm.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryForm.js","sourceRoot":"","sources":["../../src/query-list-scene/QueryForm.js"],"names":[],"mappings":"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","sourcesContent":["import classnames from 'classnames'\nimport React from 'react'\n// import Form from '../query-form'\nimport Form from '../query-form'\nimport Field from '../query-form/Field'\n\nconst clsPrefix = 'tnt-querylistscene-queryform'\n\nclass QueryForm extends React.PureComponent {\n  constructor(props) {\n    super(props)\n    const { actions, form } = props\n\n    this.form = form || Form.createForm()\n\n    actions.on('setFormData', this.setFormData)\n    actions.on('resetFormData', this.resetFormData)\n  }\n\n  render() {\n    const { className, actions, extraActions, extralActions, qlsProps, onChange, ...props } =\n      this.props\n\n    return (\n      <Form\n        {...props}\n        form={this.form}\n        className={classnames(clsPrefix, className)}\n        // 前期拼写错误，导致需要兼容错误的api\n        extraActions={extraActions || extralActions}\n        hasOnChange={!!onChange}\n        onChange={this.onChange}\n        onSearch={this.onSearch}\n        onReset={this.onReset}\n        setFormData={this._setFormData}\n      />\n    )\n  }\n\n  componentDidMount() {\n    const { initialValues = {}, actions, qlsProps, memory } = this.props\n\n    if (qlsProps.memory || memory) {\n      const formData = {\n        ...initialValues,\n        ...actions.getFormData(),\n      }\n      actions.setData('formData', formData)\n      setTimeout(() => {\n        // 回写Composition\n        this.form.setValues(formData)\n      }, 100)\n    } else {\n      actions.setData('formData', initialValues)\n    }\n  }\n\n  onSearch = (searchObj) => {\n    const { onSearch, actions } = this.props\n    const values = actions.getFormData()\n    const params = { ...values, ...(searchObj || {}), current: 1 }\n\n    // memory 与 url解析setForm时 监听事件异步\n    actions.setData('formData', values)\n    Promise.resolve().then(() => {\n      onSearch && onSearch(params)\n      actions.emit('search', params)\n    })\n  }\n\n  onReset = () => {\n    const { initialValues = {}, onReset, actions } = this.props\n\n    const resetValues = {\n      ...initialValues,\n      pageSize: initialValues.pageSize || 10, // Set default pageSize if not provided\n    }\n\n    actions.setFormData(resetValues, false)\n\n    onReset?.(initialValues)\n    this.onSearch()\n  }\n\n  onChange = (newValues, changedInfo) => {\n    const { onChange, actions } = this.props\n\n    actions.setFormData(newValues, false)\n    onChange?.(newValues, changedInfo)\n  }\n\n  _setFormData = (data, needSearch) => {\n    const values = actions.getFormData()\n    actions.setFormData({ ...data, current: 1 }, needSearch)\n  }\n\n  setFormData = (data, needSearch) => {\n    const { actions } = this.props\n    actions.setData('formData', data)\n    this.form.setValues(data)\n    needSearch && this.onSearch()\n  }\n\n  resetFormData = (needSearch) => {\n    const { initialValues, actions } = this.props\n\n    actions.setFormData(initialValues, needSearch)\n    this.form.resetValues()\n  }\n\n  componentWillUnmount() {\n    const { actions } = this.props\n\n    actions.removeListener('setFormData', this.setFormData)\n    actions.removeListener('resetFormData', this.resetFormData)\n  }\n}\n\nQueryForm.Field = Field\n\nexport default QueryForm\n"]}
+{"version":3,"file":"QueryForm.js","sourceRoot":"","sources":["../../src/query-list-scene/QueryForm.js"],"names":[],"mappings":"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","sourcesContent":["import React from 'react'\nimport classnames from 'classnames'\nimport Form from '../query-form'\n\nconst clsPrefix = 'tnt-querylistscene-queryform'\n\nexport default class QueryForm extends React.PureComponent {\n  constructor(props) {\n    super(props)\n    const { actions, form } = props\n\n    this.form = form || Form.createForm()\n\n    actions.on('setFormData', this.setFormData)\n    actions.on('resetFormData', this.resetFormData)\n  }\n\n  render() {\n    const { className, actions, extraActions, extralActions, qlsProps, ...props } = this.props\n\n    return (\n      <Form\n        {...props}\n        form={this.form}\n        className={classnames(clsPrefix, className)}\n        // 前期拼写错误，导致需要兼容错误的api\n        extraActions={extraActions || extralActions}\n        onChange={this.onChange}\n        onSearch={this.onSearch}\n        onReset={this.onReset}\n      />\n    )\n  }\n\n  componentDidMount() {\n    const { initialValues = {}, actions, qlsProps, memory } = this.props\n\n    if (qlsProps.memory || memory) {\n      actions.setFormData(\n        {\n          ...initialValues,\n          ...actions.getFormData(),\n        },\n        false\n      )\n    } else {\n      actions.setData('formData', initialValues)\n    }\n  }\n\n  onSearch = (searchObj) => {\n    const { onSearch, actions } = this.props\n    const values = actions.getFormData()\n    const params = { ...values, ...(searchObj || {}), current: 1 }\n\n    // memory 与 url解析setForm时 监听事件异步\n    actions.setData('formData', values)\n    Promise.resolve().then(() => {\n      onSearch && onSearch(params)\n      actions.emit('search', params)\n    })\n  }\n\n  onReset = () => {\n    const { initialValues, onReset, actions } = this.props\n\n    actions.setFormData(initialValues, false)\n\n    onReset?.(initialValues)\n    this.onSearch()\n  }\n\n  onChange = (newValues, changedInfo, ...rest) => {\n    const { onChange, actions } = this.props\n\n    actions.setFormData(newValues, false)\n    onChange?.(newValues, changedInfo, ...rest)\n  }\n\n  setFormData = (data, needSearch) => {\n    const { actions } = this.props\n    actions.setData('formData', data)\n    this.form.setValues(data)\n    needSearch && this.onSearch()\n  }\n\n  resetFormData = (needSearch) => {\n    const { initialValues, actions } = this.props\n\n    actions.setFormData(initialValues, needSearch)\n    this.form.resetValues()\n  }\n\n  componentWillUnmount() {\n    const { actions } = this.props\n\n    actions.removeListener('setFormData', this.setFormData)\n    actions.removeListener('resetFormData', this.resetFormData)\n  }\n}\n\nQueryForm.Field = Form.Field\n"]}

package/es/query-list-scene/index.js

@@ -5,7 +5,6 @@ import Toolbar from './Toolbar';
 import List from './List';
 import Actions from './createActions';
 import useActions from './useActions';
-import Field from '../query-form/Field';
 import './index.less';
 export const QueryForm = Form;
 export const QueryList = List;
@@ -14,7 +13,7 @@ QueryListScene.Title = Title;
 QueryListScene.QueryForm = Form;
 QueryListScene.Toolbar = Toolbar;
 QueryListScene.QueryList = List;
-QueryListScene.Field = Field;
+QueryListScene.Field = Form.Field;
 QueryListScene.useActions = useActions;
 QueryListScene.createActions = createActions;
 export default QueryListScene;

package/es/query-list-scene/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/query-list-scene/index.js"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,kBAAkB,CAAA;AAC7C,OAAO,KAAK,MAAM,SAAS,CAAA;AAC3B,OAAO,IAAI,MAAM,aAAa,CAAA;AAC9B,OAAO,OAAO,MAAM,WAAW,CAAA;AAC/B,OAAO,IAAI,MAAM,QAAQ,CAAA;AACzB,OAAO,OAAO,MAAM,iBAAiB,CAAA;AACrC,OAAO,UAAU,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,MAAM,qBAAqB,CAAC;AACxC,OAAO,cAAc,CAAA;AAErB,MAAM,CAAC,MAAM,SAAS,GAAG,IAAI,CAAA;AAC7B,MAAM,CAAC,MAAM,SAAS,GAAG,IAAI,CAAA;AAC7B,MAAM,CAAC,MAAM,aAAa,GAAG,OAAO,CAAA;AAEpC,cAAc,CAAC,KAAK,GAAG,KAAK,CAAA;AAC5B,cAAc,CAAC,SAAS,GAAG,IAAI,CAAA;AAC/B,cAAc,CAAC,OAAO,GAAG,OAAO,CAAA;AAChC,cAAc,CAAC,SAAS,GAAG,IAAI,CAAA;AAC/B,cAAc,CAAC,KAAK,GAAG,KAAK,CAAA;AAE5B,cAAc,CAAC,UAAU,GAAG,UAAU,CAAA;AACtC,cAAc,CAAC,aAAa,GAAG,aAAa,CAAA;AAE5C,eAAe,cAAc,CAAA","sourcesContent":["import QueryListScene from './QueryListScene'\nimport Title from './Title'\nimport Form from './QueryForm'\nimport Toolbar from './Toolbar'\nimport List from './List'\nimport Actions from './createActions'\nimport useActions from './useActions'\nimport Field from '../query-form/Field';\nimport './index.less'\n\nexport const QueryForm = Form\nexport const QueryList = List\nexport const createActions = Actions\n\nQueryListScene.Title = Title\nQueryListScene.QueryForm = Form\nQueryListScene.Toolbar = Toolbar\nQueryListScene.QueryList = List\nQueryListScene.Field = Field\n\nQueryListScene.useActions = useActions\nQueryListScene.createActions = createActions\n\nexport default QueryListScene\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/query-list-scene/index.js"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,kBAAkB,CAAA;AAC7C,OAAO,KAAK,MAAM,SAAS,CAAA;AAC3B,OAAO,IAAI,MAAM,aAAa,CAAA;AAC9B,OAAO,OAAO,MAAM,WAAW,CAAA;AAC/B,OAAO,IAAI,MAAM,QAAQ,CAAA;AACzB,OAAO,OAAO,MAAM,iBAAiB,CAAA;AACrC,OAAO,UAAU,MAAM,cAAc,CAAA;AACrC,OAAO,cAAc,CAAA;AAErB,MAAM,CAAC,MAAM,SAAS,GAAG,IAAI,CAAA;AAC7B,MAAM,CAAC,MAAM,SAAS,GAAG,IAAI,CAAA;AAC7B,MAAM,CAAC,MAAM,aAAa,GAAG,OAAO,CAAA;AAEpC,cAAc,CAAC,KAAK,GAAG,KAAK,CAAA;AAC5B,cAAc,CAAC,SAAS,GAAG,IAAI,CAAA;AAC/B,cAAc,CAAC,OAAO,GAAG,OAAO,CAAA;AAChC,cAAc,CAAC,SAAS,GAAG,IAAI,CAAA;AAC/B,cAAc,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAA;AAEjC,cAAc,CAAC,UAAU,GAAG,UAAU,CAAA;AACtC,cAAc,CAAC,aAAa,GAAG,aAAa,CAAA;AAE5C,eAAe,cAAc,CAAA","sourcesContent":["import QueryListScene from './QueryListScene'\nimport Title from './Title'\nimport Form from './QueryForm'\nimport Toolbar from './Toolbar'\nimport List from './List'\nimport Actions from './createActions'\nimport useActions from './useActions'\nimport './index.less'\n\nexport const QueryForm = Form\nexport const QueryList = List\nexport const createActions = Actions\n\nQueryListScene.Title = Title\nQueryListScene.QueryForm = Form\nQueryListScene.Toolbar = Toolbar\nQueryListScene.QueryList = List\nQueryListScene.Field = Form.Field\n\nQueryListScene.useActions = useActions\nQueryListScene.createActions = createActions\n\nexport default QueryListScene\n"]}

package/es/radio/radio-group.js

@@ -0,0 +1,5 @@
+import 'react';
+import Radio from 'antd/es/radio';
+import { connectReadonlyComponent } from '../connect';
+import PreviewText from '../preview-text';
+export default connectReadonlyComponent(Radio.Group, PreviewText.Select);

package/es/radio/radio-group.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"radio-group.js","sourceRoot":"","sources":["../../src/radio/radio-group.tsx"],"names":[],"mappings":"AAAA,OAAkB,OAAO,CAAA;AAEzB,OAAO,KAAK,MAAM,eAAe,CAAA;AACjC,OAAO,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAA;AACrD,OAAO,WAAW,MAAM,iBAAiB,CAAA;AAMzC,eAAe,wBAAwB,CAAC,KAAK,CAAC,KAAK,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA","sourcesContent":["import React from 'react'\nimport type { RadioGroupProps as AntdRadioGroupProps } from 'antd/es/radio'\nimport Radio from 'antd/es/radio'\nimport { connectReadonlyComponent } from '../connect'\nimport PreviewText from '../preview-text'\n\nexport type RadioGroupProps = AntdRadioGroupProps & {\n  readonly?: boolean\n}\n\nexport default connectReadonlyComponent(Radio.Group, PreviewText.Select)\n"]}

package/es/steps/stepStyle/small.less

@@ -0,0 +1,5 @@
+.@{steps-prefix-cls}-small {
+    .@{steps-prefix-cls}-item-title {
+      padding-right: 10px;
+    }
+}

package/es/table/resizableTable/index.less

@@ -13,7 +13,7 @@
                         position: absolute;
                         top:50%;
                         margin-top: -10px;
-                        left:50%;
+                        left:4px;
                         width:1px;
                         background-color: @grey-split;
                     }

package/es/tntd-rc-select/style/index.less

@@ -935,7 +935,7 @@
 .tntd-rc-select-single .tntd-rc-select-selector .tntd-rc-select-selection-item,
 .tntd-rc-select-single .tntd-rc-select-selector .tntd-rc-select-selection-placeholder {
   padding: 0;
-  line-height: 30px;
+  line-height: calc(@input-height-base - 2px);
   transition: all 0.3s, visibility 0s;
 }
 .tntd-rc-select-single .tntd-rc-select-selector .tntd-rc-select-selection-item {
@@ -969,16 +969,16 @@
 }
 .tntd-rc-select-single:not(.tntd-rc-select-customize-input) .tntd-rc-select-selector {
   width: 100%;
-  height: 32px;
+  height: @input-height-base;
   padding: 0 11px;
 }
 .tntd-rc-select-single:not(.tntd-rc-select-customize-input)
   .tntd-rc-select-selector
   .tntd-rc-select-selection-search-input {
-  height: 30px;
+  height: calc(@input-height-base - 2px);
 }
 .tntd-rc-select-single:not(.tntd-rc-select-customize-input) .tntd-rc-select-selector::after {
-  line-height: 30px;
+  line-height: calc(@input-height-base - 2px);
 }
 .tntd-rc-select-single.tntd-rc-select-customize-input .tntd-rc-select-selector::after {
   display: none;
@@ -1118,12 +1118,12 @@
   flex: none;
   box-sizing: border-box;
   max-width: 100%;
-  height: 24px;
+  height: 20px;
   margin-top: 2px;
   margin-bottom: 2px;
-  line-height: 22px;
-  background: #f5f5f5;
-  border: 1px solid #f0f0f0;
+  line-height: 20px;
+  background: #f1f2f5;
+  border: 1px solid #e1e6ee;
   border-radius: 2px;
   cursor: default;
   transition: font-size 0.3s, line-height 0.3s, height 0.3s;
@@ -1136,8 +1136,8 @@
   padding-inline-end: 4px;
 }
 .tntd-rc-select-disabled.tntd-rc-select-multiple .tntd-rc-select-selection-item {
-  color: #bfbfbf;
-  border-color: #d9d9d9;
+  color: rgba(0, 0, 0, 0.33);
+  border-color: #e1e6ee;
   cursor: not-allowed;
 }
 .tntd-rc-select-multiple .tntd-rc-select-selection-item-content {
@@ -1338,7 +1338,7 @@
 .tntd-rc-select:not(.tntd-rc-select-customize-input) .tntd-rc-select-selector {
   position: relative;
   background-color: #fff;
-  border: 1px solid #d9d9d9;
+  border: 1px solid @border-color;
   border-radius: 2px;
   transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
 }
@@ -1358,15 +1358,16 @@
     .tntd-rc-select-customize-input
   )
   .tntd-rc-select-selector {
-  border-color: #40a9ff;
+  border-color: @blue-6;
   box-shadow: 0 0 0 2px rgba(24, 144, 255, 0.2);
   border-right-width: 1px;
   outline: 0;
 }
 .tntd-rc-select-disabled.tntd-rc-select:not(.tntd-rc-select-customize-input)
   .tntd-rc-select-selector {
-  color: rgba(0, 0, 0, 0.25);
-  background: #f5f5f5;
+  color: rgba(23, 35, 61, 0.3);
+  background: @fill-color-tertiary;
+  border: 1px solid #c9d2dd;
   cursor: not-allowed;
 }
 .tntd-rc-select-multiple.tntd-rc-select-disabled.tntd-rc-select:not(.tntd-rc-select-customize-input)
@@ -1398,7 +1399,7 @@
   -webkit-appearance: none;
 }
 .tntd-rc-select:not(.tntd-rc-select-disabled):hover .tntd-rc-select-selector {
-  border-color: #40a9ff;
+  border-color: @blue-6;
   border-right-width: 1px;
 }
 .tntd-rc-select-selection-item {
@@ -1417,7 +1418,7 @@
 .tntd-rc-select-selection-placeholder {
   flex: 1;
   overflow: hidden;
-  color: #bfbfbf;
+  color: rgba(23, 35, 61, 0.3);
   white-space: nowrap;
   text-overflow: ellipsis;
   pointer-events: none;
@@ -1487,7 +1488,7 @@
   display: inline-block;
   width: 12px;
   height: 12px;
-  margin-top: -6px;
+  margin-top: -8px;
   color: rgba(0, 0, 0, 0.25);
   font-size: 12px;
   font-style: normal;
@@ -1594,7 +1595,7 @@
   flex: none;
 }
 .tntd-rc-select-item-option-active:not(.tntd-rc-select-item-option-disabled) {
-  background-color: #f5f5f5;
+  background-color: @blue-1;
 }
 .tntd-rc-select-item-option-selected:not(.tntd-rc-select-item-option-disabled) {
   color: rgba(0, 0, 0, 0.85);
@@ -1603,7 +1604,7 @@
 }
 .tntd-rc-select-item-option-selected:not(.tntd-rc-select-item-option-disabled)
   .tntd-rc-select-item-option-state {
-  color: #1890ff;
+  color: @blue-6;
 }
 .tntd-rc-select-item-option-disabled {
   color: rgba(0, 0, 0, 0.25);
@@ -1763,3 +1764,10 @@
 .tntd-rc-select:not(.tntd-rc-select-customize-input) .tntd-rc-select-selector {
   border-radius: @border-radius-base;
 }
+
+.tntd-rc-select{
+  &:active{
+    border-color: @blue-5;
+    box-shadow: 0 0 0 2px fade(@blue-6, 20);
+  }
+}