tntd 3.0.0-beta.10 → 3.0.0-beta.12

package/es/query-form2/index.less

@@ -0,0 +1,136 @@
+.tnt-queryform {
+  display: flex;
+
+  &-extra {
+    line-height: 32px;
+    margin-left: @margin-sm;
+    & > * {
+      margin-left: @margin-xs;
+    }
+  }
+
+  &-actions {
+    align-items: center;
+    display: inline-block;
+    height: 32px;
+    line-height: 32px;
+    position: absolute;
+    right: 0;
+
+    & > *:not(.expand-link) {
+      margin-right: 10px;
+    }
+    & > .expand-link {
+      padding: 0;
+      margin-right: 0;
+    }
+    & > .ant-badge {
+      .tnt-icon {
+        margin-right: @margin-xs;
+      }
+    }
+  }
+
+  .ant-form {
+    display: inline-block;
+    margin-bottom: @margin-sm;
+    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: @margin-sm;
+        }
+      }
+    }
+
+    & > div:nth-child(2) {
+      display: flex;
+    }
+
+    &.ant-form-inline .ant-form-item {
+      margin-right: 10px;
+      display: inline-block;
+    }
+
+    .ant-form-item-control {
+      // min-width: 160px;
+      line-height: unset;
+      .ant-calendar-picker-input {
+        padding: 0 @padding-sm;
+      }
+      .ant-form-item-children {
+        & > .ant-input,
+        & > .ant-input-affix-wrapper {
+          width: 160px;
+          // width: 200px;
+        }
+      }
+    }
+  }
+
+  &-drawer {
+    margin-top: @margin-xxl;
+    &.large-size {
+      margin-top: 60px;
+    }
+
+    &.ant-drawer.ant-drawer-open {
+      .ant-drawer-mask {
+        opacity: 0;
+        background: unset;
+      }
+    }
+    .ant-drawer-body {
+      .ant-form-item {
+        display: block;
+        margin-right: 0;
+        margin-bottom: @margin-md;
+        width: 100%;
+      }
+      .ant-form-item-label {
+        display: block;
+        text-align: left;
+        line-height: 22px;
+        margin-bottom: 10px;
+      }
+      .ant-form-item-control-wrapper,
+      .ant-form-item-control,
+      .ant-calendar-picker,
+      .ant-input {
+        min-width: 100%;
+        width: 100%;
+      }
+
+      & > .ant-btn {
+        display: block;
+        width: 100%;
+        margin-bottom: 10px;
+        &.ant-btn-primary {
+          margin-top: @margin-md;
+        }
+      }
+    }
+  }
+}

package/es/query-form2/useForm.js

@@ -0,0 +1,6 @@
+import { useRef } from 'react';
+import createActions from './createActions';
+export default function useForm() {
+  const form = useRef(createActions());
+  return [form.current];
+}

package/es/query-form2/useForm.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useForm.js","sourceRoot":"","sources":["../../src/query-form2/useForm.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAA;AAC9B,OAAO,aAAa,MAAM,iBAAiB,CAAA;AAE3C,MAAM,CAAC,OAAO,UAAU,OAAO;IAC7B,MAAM,IAAI,GAAG,MAAM,CAAC,aAAa,EAAE,CAAC,CAAA;IAEpC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;AACvB,CAAC","sourcesContent":["import { useRef } from 'react'\nimport createActions from './createActions'\n\nexport default function useForm() {\n  const form = useRef(createActions())\n\n  return [form.current]\n}\n"]}

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

@@ -108,9 +108,7 @@ export default class QueryForm extends React.PureComponent {
       props = __rest(_a, ["className", "actions", "extraActions", "extralActions", "qlsProps"]);
     return React.createElement(Form, Object.assign({}, props, {
       form: this.form,
-      className: classnames(clsPrefix, {
-        [className]: className
-      }),
+      className: classnames(clsPrefix, className),
       // 前期拼写错误，导致需要兼容错误的api
       extraActions: extraActions || extralActions,
       onChange: this.onChange,

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 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]: 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"]}
+{"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/select/select.less

@@ -82,6 +82,7 @@
     border-color: @bg-grey-default;
     .tntd-anticon {
       font-size: 12px;
+      vertical-align: middle;
     }
   }
 }

package/es/tag/color.less

@@ -1,43 +1,53 @@
-@preset-colors-custom: grey, blue, green, red, gold, lightblue, bluegrey, purplegrey, purple, lightpurple, lightgreen, pink, rose, orange,  magenta, volcano, yellow, cyan, lime, geekblue, tnt-pink, tnt-orange, tnt-purple;
+@preset-colors-custom: grey,  green, red, gold, lightblue, bluegrey, purplegrey, purple, lightpurple, lightgreen, pink, rose, orange,  magenta, volcano, yellow, cyan, lime, geekblue, tnt-pink, tnt-orange, tnt-purple;
 
 
 @grey-7: @text-color-secondary;
+@grey-5:  #8b919e;
 @grey-4: @border-color-base;
 @grey-1: @tag-default-bg;
 
-@rose-7:#D8395E; 
+@rose-7:#D8395E;
+@rose-5:  #EE3E67;
 @rose-4:  #FEA3B4;
-@rose-1:  #FFF1F3; 
+@rose-1:  #FFF1F3;
 
-@lightblue-7: #1AA9E6; 
+@lightblue-7: #1AA9E6;
+@lightblue-5:  #36BFFA;
 @lightblue-4: #8FE0FF;
-@lightblue-1: #F0F9FF; 
+@lightblue-1: #F0F9FF;
 
-@bluegrey-7: #486FBB; 
+@bluegrey-7: #486FBB;
+@bluegrey-5: #628FE4;
 @bluegrey-4: #A1BCEF;
-@bluegrey-1: #F4F8FF; 
+@bluegrey-1: #F4F8FF;
 
-@purplegrey-7: #4E5BA6; 
+@purplegrey-7: #4E5BA6;
+@purplegrey-5: #717BBC;
 @purplegrey-4: #AFB5D9;
-@purplegrey-1: #F8F9FC; 
+@purplegrey-1: #F8F9FC;
 
-@tnt-purple-7: #6E54D4; 
+@tnt-purple-7: #6E54D4;
+@tnt-purple-5:  #7A5AF8;
 @tnt-purple-4:  #BDB4FE;
-@tnt-purple-1:  #F4F3FF; 
+@tnt-purple-1:  #F4F3FF;
 
-@lightpurple-7: #5161D7; 
+@lightpurple-7: #5161D7;
+@lightpurple-5: #6172F3;
 @lightpurple-4:  #A4BCFD;
-@lightpurple-1:  #EEF4FF; 
+@lightpurple-1:  #EEF4FF;
 
-@lightgreen-7: #2E9C98; 
+@lightgreen-7: #2E9C98;
+@lightgreen-5:  #3AB4AF;
 @lightgreen-4:  #8CE0DD;
-@lightgreen-1:  #F1FBFB; 
+@lightgreen-1:  #F1FBFB;
 
-@tnt-pink-7: #D03E93; 
+@tnt-pink-7: #D03E93;
+@tnt-pink-5: #E844B7;
 @tnt-pink-4:  #FAA7E0;
 @tnt-pink-1:  #FDF2FA;
 
-@tnt-orange-7:#DF5F28; 
+@tnt-orange-7:#DF5F28;
+@tnt-orange-5:#F47345;
 @tnt-orange-4:  #FEB173;
-@tnt-orange-1:  #FFF6ED; 
+@tnt-orange-1:  #FFF6ED;
 

package/es/tag/tag.less

@@ -21,7 +21,8 @@
     line-height: @tag-height;
 
     .@{iconfont-css-prefix}-close {
-        // .iconfont-size-under-12px(10px);
+        .iconfont-size-under-12px(12px);
+        font-size: @font-size-sm !important;
         vertical-align: middle;
         line-height: 1;
     }
@@ -112,6 +113,29 @@
         }
     }
 
+    &.@{tag-prefix-cls}-blue {
+        color: @blue-6;
+        background: @blue-1;
+        border-color: @blue-3;
+        >.@{iconfont-css-prefix}-close {
+            color: @blue-5;
+        }
+        &.@{tag-prefix-cls}-no-border{
+            border-color:transparent;
+        }
+    }
+    &.@{tag-prefix-cls}-blue-inverse {
+        color: @text-color-inverse;
+        background: @blue-6;
+        border-color: @blue-6;
+        >.@{iconfont-css-prefix}-close {
+            color: @text-color-inverse;
+        }
+        &.@{tag-prefix-cls}-no-border{
+            border-color:transparent;
+        }
+    }
+
     // mixin to iterate over colors and create CSS class for each one
     .make-color-classes(@i: length(@preset-colors-custom)) when (@i > 0) {
         .make-color-classes(@i - 1);
@@ -119,13 +143,13 @@
         @lightColor: '@{color}-1';
         @lightBorderColor: '@{color}-4';
         @darkColor: '@{color}-7';
+        @closeColor:'@{color}-5';
         &.@{tag-prefix-cls}-@{color} {
             color: @@darkColor;
             background: @@lightColor;
             border-color: @@lightBorderColor;
             >.@{iconfont-css-prefix}-close {
-                color: @@darkColor;//fade(@@darkColor,80%);
-                opacity: .8;
+                color: @@closeColor;
             }
             &.@{tag-prefix-cls}-no-border{
                 border-color:transparent;
@@ -135,7 +159,9 @@
             color: @text-color-inverse;
             background: @@darkColor;
             border-color: @@darkColor;
-
+            >.@{iconfont-css-prefix}-close {
+                color: @text-color-inverse;
+            }
             &.@{tag-prefix-cls}-no-border{
                 border-color:transparent;
             }
@@ -154,11 +180,21 @@
         cursor: pointer;
         &-border{
             border-color: @border-color-base;
+            // 非disabled
+            &:not(.@{tag-prefix-cls}-checkable-disabled):hover {
+                border-color: @primary-3;
+            }
+        }
+
+        &:not(.@{tag-prefix-cls}-checkable-disabled):hover {
+            color: @primary-6;
+            background-color: @primary-1;
+            transition: all 0.3s @ease-in-out-circ;
         }
 
         &:active,
         &-checked {
-            color: @primary-7;
+            color: @primary-6;
             background-color: @primary-1;
             &.@{tag-prefix-cls}-checkable-border{
                 border-color: @primary-3;
@@ -167,7 +203,7 @@
 
         &-checked {
             &.@{tag-prefix-cls}-checkable-disabled:hover {
-                color:  @primary-color;
+                color:  @primary-6;
             }
         }
 

package/lib/form/form.less

@@ -2,7 +2,7 @@
 
 .tnt-form{
     .@{form-prefix-cls}-item{
-        min-height: @input-height-base;
+        // min-height: @input-height-base;
 
         .@{form-prefix-cls}-item-required::before {
             top: 2px;

package/lib/form/style/index.less

@@ -310,9 +310,9 @@ form {
 }
 
 .@{form-prefix-cls}-vertical {
-  .@{form-prefix-cls}-item {
-    padding-bottom: 8px;
-  }
+  // .@{form-prefix-cls}-item {
+  //   padding-bottom: 8px;
+  // }
   .@{form-prefix-cls}-item-control {
     line-height: @line-height-base;
   }

package/lib/modal/style/confirm.less

@@ -13,11 +13,6 @@
 
   .@{ant-prefix}-modal-body {
     padding: @padding-base;
-
-    .anticon {
-      font-size: @heading-2-size;
-      margin-right: @margin-xs;
-    }
   }
 
   &-body-wrapper {
@@ -32,12 +27,17 @@
       overflow: hidden;
       color: @heading-color;
       font-weight: 500;
-      font-size: @heading-3-size;
+      font-size: @font-size-lg;
       line-height: @heading-3-line-height;
       font-family: PingFang SC;
       margin: @margin-xxs 0;
     }
 
+    .anticon {
+      font-size: @heading-2-size;
+      margin-right: @margin-xs;
+    }
+
     .@{confirm-prefix-cls}-content {
       margin-top: @margin-xxs;
       color: @text-color-secondary;

package/lib/query-form/Field/Checkbox.js

@@ -20,7 +20,7 @@ var _default = exports["default"] = function _default(_a) {
     _onChange = _a.onChange,
     props = __rest(_a, ["value", "onChange"]);
   return _react["default"].createElement(_checkbox["default"], Object.assign({}, props, {
-    checked: value,
+    checked: !!value,
     onChange: function onChange(evt) {
       _onChange === null || _onChange === void 0 ? void 0 : _onChange(evt.target.checked);
     }

package/lib/query-form/Field/Checkbox.js.map

@@ -1 +1 @@
-{"version":3,"file":"Checkbox.js","sourceRoot":"","sources":["../../../src/query-form/Field/Checkbox.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,kDAAyB;AAEzB,8DAAqC;AAErC,kBAAe,CAAC,EAA6B,EAAE,EAAE;QAAjC,EAAE,KAAK,EAAE,QAAQ,OAAY,EAAP,KAAK,cAA3B,qBAA6B,CAAF;IAAO,OAAA,CAChD,8BAAC,kBAAQ,oBACH,KAAK,IACT,OAAO,EAAE,KAAK,EACd,QAAQ,EAAE,CAAC,GAAG,EAAE,EAAE;YAChB,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;QAChC,CAAC,IACD,CACH,CAAA;CAAA,CAAA","sourcesContent":["import React from 'react'\n\nimport Checkbox from '../../checkbox'\n\nexport default ({ value, onChange, ...props }) => (\n  <Checkbox\n    {...props}\n    checked={value}\n    onChange={(evt) => {\n      onChange?.(evt.target.checked)\n    }}\n  />\n)\n"]}
+{"version":3,"file":"Checkbox.js","sourceRoot":"","sources":["../../../src/query-form/Field/Checkbox.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,kDAAyB;AAEzB,8DAAqC;AAErC,kBAAe,CAAC,EAA6B,EAAE,EAAE;QAAjC,EAAE,KAAK,EAAE,QAAQ,OAAY,EAAP,KAAK,cAA3B,qBAA6B,CAAF;IAAO,OAAA,CAChD,8BAAC,kBAAQ,oBACH,KAAK,IACT,OAAO,EAAE,CAAC,CAAC,KAAK,EAChB,QAAQ,EAAE,CAAC,GAAG,EAAE,EAAE;YAChB,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;QAChC,CAAC,IACD,CACH,CAAA;CAAA,CAAA","sourcesContent":["import React from 'react'\n\nimport Checkbox from '../../checkbox'\n\nexport default ({ value, onChange, ...props }) => (\n  <Checkbox\n    {...props}\n    checked={!!value}\n    onChange={(evt) => {\n      onChange?.(evt.target.checked)\n    }}\n  />\n)\n"]}