@arim-aisdc/public-components 2.3.68 → 2.3.69

package/dist/components/TableMax/components/ColumnFilterV2/Filter.js

@@ -20,6 +20,7 @@ import MultipleSelect from "./MultipleSelect";
 import NumberRange from "./NumberRange";
 import SingleSelect from "./SingleSelect";
 import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 var Filter = function Filter(_ref) {
   var getDynamicFilterOptionsFn = _ref.getDynamicFilterOptionsFn,
     column = _ref.column,
@@ -295,9 +296,9 @@ var Filter = function Filter(_ref) {
           })
         });
       case FilterType.AutoComplete:
-        return /*#__PURE__*/_jsx("div", {
+        return /*#__PURE__*/_jsxs("div", {
           className: "single-com-wrapper",
-          children: /*#__PURE__*/_jsx(AutoComplete, {
+          children: [/*#__PURE__*/_jsx(AutoComplete, {
             options: options,
             placeholder: "",
             filterOption: !!getFilterOptionsFn ? false : function (inputValue, option) {
@@ -314,12 +315,28 @@ var Filter = function Filter(_ref) {
             },
             allowClear: true,
             value: columnFilterValue
-          })
+          }), /*#__PURE__*/_jsxs("div", {
+            className: "quickly-input",
+            children: [/*#__PURE__*/_jsx("p", {
+              className: "quickly-input-title",
+              children: "\u5FEB\u6377\u8F93\u5165"
+            }), /*#__PURE__*/_jsx("p", {
+              onClick: function onClick() {
+                handleChangeFilterValueWithDebounce('NULL');
+              },
+              children: "\u7A7A\u503C(NULL)"
+            }), /*#__PURE__*/_jsx("p", {
+              onClick: function onClick() {
+                handleChangeFilterValueWithDebounce('NOT NULL');
+              },
+              children: "\u975E\u7A7A\u503C(NOT NULL)"
+            })]
+          })]
         });
       case FilterType.Input:
-        return /*#__PURE__*/_jsx("div", {
+        return /*#__PURE__*/_jsxs("div", {
           className: "single-com-wrapper",
-          children: /*#__PURE__*/_jsx(Input, {
+          children: [/*#__PURE__*/_jsx(Input, {
             onChange: function onChange(e) {
               return handleChangeFilterValueWithDebounce(e.target.value);
             },
@@ -329,7 +346,23 @@ var Filter = function Filter(_ref) {
             allowClear: true,
             value: columnFilterValue,
             placeholder: t('global.placeholder.input')
-          })
+          }), /*#__PURE__*/_jsxs("div", {
+            className: "quickly-input",
+            children: [/*#__PURE__*/_jsx("p", {
+              className: "quickly-input-title",
+              children: "\u5FEB\u6377\u8F93\u5165"
+            }), /*#__PURE__*/_jsx("p", {
+              onClick: function onClick() {
+                handleChangeFilterValueWithDebounce('NULL');
+              },
+              children: "\u7A7A\u503C(NULL)"
+            }), /*#__PURE__*/_jsx("p", {
+              onClick: function onClick() {
+                handleChangeFilterValueWithDebounce('NOT NULL');
+              },
+              children: "\u975E\u7A7A\u503C(NOT NULL)"
+            })]
+          })]
         });
       case FilterType.SingleSelect:
         return /*#__PURE__*/_jsx(SingleSelect, {

package/dist/components/TableMax/components/ColumnFilterV2/MultipleSelect/index.js

@@ -158,7 +158,7 @@ var MultipleSelect = function MultipleSelect(_ref) {
               setInnerValue([]);
             }
           },
-          children: "NULL"
+          children: "\u7A7A\u503C(NULL)"
         }), /*#__PURE__*/_jsx("br", {}), /*#__PURE__*/_jsx(Checkbox, {
           indeterminate: indeterminate,
           onChange: onCheckAllChange,

package/dist/components/TableMax/components/ColumnFilterV2/SingleSelect/index.js

@@ -107,11 +107,11 @@ var SingleSelect = function SingleSelect(_ref) {
   // 最终的可选值
   var finalOptions = useMemo(function () {
     var nullValueOptions = [{
-      label: 'NULL',
+      label: '空值(NULL)',
       value: 'NULL',
       children: []
     }, {
-      label: 'NOT NULL',
+      label: '非空值(NOT NULL)',
       value: 'NOT NULL',
       children: []
     }].concat(options);

package/dist/components/TableMax/components/ColumnFilterV2/index.less

@@ -37,3 +37,10 @@
   line-height: 32px;
   height: 32px;
 }
+
+.quickly-input {
+  font-size: 12px;
+  .quickly-input-title {
+    color: @global-desc-text-disabled-color;
+  }
+}

package/dist/components/TableMax/components/ColumnSort/customSortFns.d.ts

@@ -1,13 +1,13 @@
 import { TableMaxColumnType } from "../../type";
-export declare const numberSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
-export declare const stringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
-export declare const numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
-export declare const timeSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
+export declare const numberSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
+export declare const stringSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
+export declare const numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
+export declare const timeSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
 declare const customSortFns: {
-    numberSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
-    stringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
-    timeSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
-    numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
+    numberSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
+    stringSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
+    timeSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
+    numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
 };
 export default customSortFns;
 export type SortFnType = keyof typeof customSortFns | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arim-aisdc/public-components",
-  "version": "2.3.68",
+  "version": "2.3.69",
   "description": "前端组件库",
   "license": "MIT",
   "main": "dist/index.js",