@nokecy/qc-ui 1.0.3 → 1.0.5

package/dist/cjs/ag-grid-plus/ag-gridPlus.js

@@ -190,7 +190,7 @@ function AgGridPlus(props) {
   }, [dataSource]);
   var onRequest = function onRequest(queryFilter) {
     setLoading(true);
-    var filter = (0, _utils.convertFilterModel)(queryFilter);
+    var filter = (0, _utils.convertFilterModel)(queryFilter, allColDefs);
     var params = _objectSpread(_objectSpread({
       filter: filter
     }, gridParams), {}, {
@@ -211,7 +211,6 @@ function AgGridPlus(props) {
       setLoading(false);
     });
   };
-  var actionDom = toolBarRender && toolBarRender(apiRef.current, (0, _utils.convertFilterModel)(queryFilter), queryFilter);
   var sortChanged = function sortChanged(columnApi) {
     var sortedColumn = columnApi.getColumnState().find(function (col) {
       return Boolean(col.sort);
@@ -409,6 +408,7 @@ function AgGridPlus(props) {
   var rowDataMemo = (0, _react.useMemo)(function () {
     return props.treeData ? (0, _utils.flatten)((0, _utils.toTree)(rowData, treeKeyName !== null && treeKeyName !== void 0 ? treeKeyName : "id", treeParentName !== null && treeParentName !== void 0 ? treeParentName : "parentId"), treeKeyName !== null && treeKeyName !== void 0 ? treeKeyName : "id") : rowData;
   }, [rowData, props.treeData]);
+  var actionDom = toolBarRender && toolBarRender(apiRef.current, (0, _utils.convertFilterModel)(queryFilter, allColDefs), queryFilter);
   return /*#__PURE__*/_react.default.createElement(_antd.Spin, {
     spinning: loading,
     wrapperClassName: "grid-spin"

package/dist/cjs/ag-grid-plus/interface.d.ts

@@ -16,6 +16,7 @@ interface GridProps extends AgGridReactProps {
     treeParentName?: string;
     search?: boolean;
     headerTitle?: React.ReactNode;
+    columnDefs?: (AgGridColumnPropsClone | ColGroupDef<any>)[] | null;
     toolBarRender?: (gridApi?: GridApi, filter?: string, queryFilter?: any) => React.ReactNode[];
     /**
      * 用于标识grid唯一标识，用于保存列方案
@@ -28,12 +29,20 @@ interface GridProps extends AgGridReactProps {
     gridRef?: React.Ref<GridRef | undefined>;
 }
 interface AgGridColumnPropsClone extends ColDef {
+    /**
+     * 是否模糊查询
+     */
+    exactQuery?: boolean;
     hideInTable?: boolean;
     hideInSearch?: boolean;
     queryField?: string;
     searchComponent?: ReactNode | JSX.Element | ((props: any) => JSX.Element);
     searchComponentProps?: any;
     searchSort?: number;
+    enum?: {
+        value: any;
+        label: any;
+    }[];
 }
 declare function AgGridColumn(props: AgGridColumnPropsClone | ColGroupDef): React.JSX.Element;
-export { GridProps, AgGridColumn, GridRef };
+export { GridProps, AgGridColumn, GridRef, AgGridColumnPropsClone };

package/dist/cjs/ag-grid-plus/queryForm/index.js

@@ -99,6 +99,9 @@ var FormRender = function FormRender(props) {
           component = "BoolSelect";
           break;
       }
+      if (colDef.enum) {
+        component = "Select";
+      }
       return component ? component : "Input";
     }
   };
@@ -141,6 +144,7 @@ var FormRender = function FormRender(props) {
           title: headerName,
           required: (colDef === null || colDef === void 0 || (_colDef$searchCompone = colDef.searchComponentProps) === null || _colDef$searchCompone === void 0 ? void 0 : _colDef$searchCompone.required) || false,
           default: colDef === null || colDef === void 0 || (_colDef$searchCompone2 = colDef.searchComponentProps) === null || _colDef$searchCompone2 === void 0 ? void 0 : _colDef$searchCompone2.default,
+          enum: colDef === null || colDef === void 0 ? void 0 : colDef.enum,
           "x-component": component,
           "x-component-props": _objectSpread({
             placeholder: "\u8BF7\u8F93\u5165".concat(headerName),

package/dist/cjs/ag-grid-plus/utils.d.ts

@@ -1,5 +1,6 @@
 import { ValueFormatterParams } from 'ag-grid-community';
-declare const convertFilterModel: (filterModel: any) => string;
+import { AgGridColumnPropsClone } from './interface';
+declare const convertFilterModel: (filterModel: any, colDefs: AgGridColumnPropsClone[]) => string;
 declare const convertSortModel: (sortModel: any[]) => string;
 declare const dateValueFormatter: (params: ValueFormatterParams) => string;
 declare const dateTimeValueFormatter: (params: ValueFormatterParams) => string;

package/dist/cjs/ag-grid-plus/utils.js

@@ -22,9 +22,9 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 var esc = function esc(v) {
   return v.replace(/([(),|,\\]|\/i)/g, '\\$1');
 };
-var getFilter = function getFilter(objectKey, value) {
+var getFilter = function getFilter(objectKey, value, colDef) {
   if (typeof value === 'string') {
-    return value && value != "" ? "".concat(objectKey, " =* ").concat(esc(value)) : "";
+    return value && value != "" ? "".concat(objectKey, " ").concat(colDef !== null && colDef !== void 0 && colDef.exactQuery ? '=*' : "^", " ").concat(esc(value)) : "";
   }
   if (typeof value === 'number') {
     return "".concat(objectKey, " = ").concat(value);
@@ -36,12 +36,12 @@ var getFilter = function getFilter(objectKey, value) {
     return "".concat(objectKey, " >= ").concat((0, _dayjs.default)(value[0]).format("YYYY-MM-DD"), " ,") + "".concat(objectKey, " <= ").concat((0, _dayjs.default)(value[1]).add(1, 'days').format("YYYY-MM-DD"));
   }
   var items = [];
-  getObjectFilter(value, objectKey, items);
+  getObjectFilter(value, objectKey, items, colDef);
   return items.filter(function (x) {
     return !!x;
   }).join(",");
 };
-var getObjectFilter = function getObjectFilter(obj, objKey, items) {
+var getObjectFilter = function getObjectFilter(obj, objKey, items, colDef) {
   Object.keys(obj).map(function (key) {
     var value = obj[key];
     var objectKey = "".concat(objKey, ".").concat(key);
@@ -49,7 +49,7 @@ var getObjectFilter = function getObjectFilter(obj, objKey, items) {
       items.push("".concat(objectKey, " = ").concat(value));
     }
     if (typeof value === 'string') {
-      value && value != "" && items.push("".concat(objectKey, " =* ").concat(esc(value)));
+      value && value != "" && items.push("".concat(objectKey, " ").concat(colDef !== null && colDef !== void 0 && colDef.exactQuery ? '=*' : "^", " ").concat(esc(value)));
     }
     if (typeof value === 'boolean') {
       items.push("".concat(objectKey, " = ").concat(value));
@@ -60,12 +60,15 @@ var getObjectFilter = function getObjectFilter(obj, objKey, items) {
     if (value instanceof Object) items.push(getObjectFilter(value, "".concat(objKey, ".").concat(key), items));
   });
 };
-var convertFilterModel = exports.convertFilterModel = function convertFilterModel(filterModel) {
+var convertFilterModel = exports.convertFilterModel = function convertFilterModel(filterModel, colDefs) {
   var items = [];
   Object.keys(filterModel).map(function (key) {
     var value = filterModel[key];
+    var colDef = colDefs.find(function (colDef) {
+      return colDef.field == key;
+    });
     if (value !== undefined && value !== null && value !== "") {
-      var filter = getFilter(key, value);
+      var filter = getFilter(key, value, colDef);
       if (filter && filter != "") {
         items.push(filter);
       }

package/dist/esm/ag-grid-plus/ag-gridPlus.js

@@ -181,7 +181,7 @@ function AgGridPlus(props) {
   }, [dataSource]);
   var onRequest = function onRequest(queryFilter) {
     setLoading(true);
-    var filter = convertFilterModel(queryFilter);
+    var filter = convertFilterModel(queryFilter, allColDefs);
     var params = _objectSpread(_objectSpread({
       filter: filter
     }, gridParams), {}, {
@@ -202,7 +202,6 @@ function AgGridPlus(props) {
       setLoading(false);
     });
   };
-  var actionDom = toolBarRender && toolBarRender(apiRef.current, convertFilterModel(queryFilter), queryFilter);
   var sortChanged = function sortChanged(columnApi) {
     var sortedColumn = columnApi.getColumnState().find(function (col) {
       return Boolean(col.sort);
@@ -400,6 +399,7 @@ function AgGridPlus(props) {
   var rowDataMemo = useMemo(function () {
     return props.treeData ? flatten(toTree(rowData, treeKeyName !== null && treeKeyName !== void 0 ? treeKeyName : "id", treeParentName !== null && treeParentName !== void 0 ? treeParentName : "parentId"), treeKeyName !== null && treeKeyName !== void 0 ? treeKeyName : "id") : rowData;
   }, [rowData, props.treeData]);
+  var actionDom = toolBarRender && toolBarRender(apiRef.current, convertFilterModel(queryFilter, allColDefs), queryFilter);
   return /*#__PURE__*/React.createElement(Spin, {
     spinning: loading,
     wrapperClassName: "grid-spin"

package/dist/esm/ag-grid-plus/interface.d.ts

@@ -16,6 +16,7 @@ interface GridProps extends AgGridReactProps {
     treeParentName?: string;
     search?: boolean;
     headerTitle?: React.ReactNode;
+    columnDefs?: (AgGridColumnPropsClone | ColGroupDef<any>)[] | null;
     toolBarRender?: (gridApi?: GridApi, filter?: string, queryFilter?: any) => React.ReactNode[];
     /**
      * 用于标识grid唯一标识，用于保存列方案
@@ -28,12 +29,20 @@ interface GridProps extends AgGridReactProps {
     gridRef?: React.Ref<GridRef | undefined>;
 }
 interface AgGridColumnPropsClone extends ColDef {
+    /**
+     * 是否模糊查询
+     */
+    exactQuery?: boolean;
     hideInTable?: boolean;
     hideInSearch?: boolean;
     queryField?: string;
     searchComponent?: ReactNode | JSX.Element | ((props: any) => JSX.Element);
     searchComponentProps?: any;
     searchSort?: number;
+    enum?: {
+        value: any;
+        label: any;
+    }[];
 }
 declare function AgGridColumn(props: AgGridColumnPropsClone | ColGroupDef): React.JSX.Element;
-export { GridProps, AgGridColumn, GridRef };
+export { GridProps, AgGridColumn, GridRef, AgGridColumnPropsClone };

package/dist/esm/ag-grid-plus/queryForm/index.js

@@ -91,6 +91,9 @@ var FormRender = function FormRender(props) {
           component = "BoolSelect";
           break;
       }
+      if (colDef.enum) {
+        component = "Select";
+      }
       return component ? component : "Input";
     }
   };
@@ -133,6 +136,7 @@ var FormRender = function FormRender(props) {
           title: headerName,
           required: (colDef === null || colDef === void 0 || (_colDef$searchCompone = colDef.searchComponentProps) === null || _colDef$searchCompone === void 0 ? void 0 : _colDef$searchCompone.required) || false,
           default: colDef === null || colDef === void 0 || (_colDef$searchCompone2 = colDef.searchComponentProps) === null || _colDef$searchCompone2 === void 0 ? void 0 : _colDef$searchCompone2.default,
+          enum: colDef === null || colDef === void 0 ? void 0 : colDef.enum,
           "x-component": component,
           "x-component-props": _objectSpread({
             placeholder: "\u8BF7\u8F93\u5165".concat(headerName),

package/dist/esm/ag-grid-plus/utils.d.ts

@@ -1,5 +1,6 @@
 import { ValueFormatterParams } from 'ag-grid-community';
-declare const convertFilterModel: (filterModel: any) => string;
+import { AgGridColumnPropsClone } from './interface';
+declare const convertFilterModel: (filterModel: any, colDefs: AgGridColumnPropsClone[]) => string;
 declare const convertSortModel: (sortModel: any[]) => string;
 declare const dateValueFormatter: (params: ValueFormatterParams) => string;
 declare const dateTimeValueFormatter: (params: ValueFormatterParams) => string;

package/dist/esm/ag-grid-plus/utils.js

@@ -15,9 +15,9 @@ import dayjs from 'dayjs';
 var esc = function esc(v) {
   return v.replace(/([(),|,\\]|\/i)/g, '\\$1');
 };
-var getFilter = function getFilter(objectKey, value) {
+var getFilter = function getFilter(objectKey, value, colDef) {
   if (typeof value === 'string') {
-    return value && value != "" ? "".concat(objectKey, " =* ").concat(esc(value)) : "";
+    return value && value != "" ? "".concat(objectKey, " ").concat(colDef !== null && colDef !== void 0 && colDef.exactQuery ? '=*' : "^", " ").concat(esc(value)) : "";
   }
   if (typeof value === 'number') {
     return "".concat(objectKey, " = ").concat(value);
@@ -29,12 +29,12 @@ var getFilter = function getFilter(objectKey, value) {
     return "".concat(objectKey, " >= ").concat(dayjs(value[0]).format("YYYY-MM-DD"), " ,") + "".concat(objectKey, " <= ").concat(dayjs(value[1]).add(1, 'days').format("YYYY-MM-DD"));
   }
   var items = [];
-  getObjectFilter(value, objectKey, items);
+  getObjectFilter(value, objectKey, items, colDef);
   return items.filter(function (x) {
     return !!x;
   }).join(",");
 };
-var getObjectFilter = function getObjectFilter(obj, objKey, items) {
+var getObjectFilter = function getObjectFilter(obj, objKey, items, colDef) {
   Object.keys(obj).map(function (key) {
     var value = obj[key];
     var objectKey = "".concat(objKey, ".").concat(key);
@@ -42,7 +42,7 @@ var getObjectFilter = function getObjectFilter(obj, objKey, items) {
       items.push("".concat(objectKey, " = ").concat(value));
     }
     if (typeof value === 'string') {
-      value && value != "" && items.push("".concat(objectKey, " =* ").concat(esc(value)));
+      value && value != "" && items.push("".concat(objectKey, " ").concat(colDef !== null && colDef !== void 0 && colDef.exactQuery ? '=*' : "^", " ").concat(esc(value)));
     }
     if (typeof value === 'boolean') {
       items.push("".concat(objectKey, " = ").concat(value));
@@ -53,12 +53,15 @@ var getObjectFilter = function getObjectFilter(obj, objKey, items) {
     if (value instanceof Object) items.push(getObjectFilter(value, "".concat(objKey, ".").concat(key), items));
   });
 };
-var convertFilterModel = function convertFilterModel(filterModel) {
+var convertFilterModel = function convertFilterModel(filterModel, colDefs) {
   var items = [];
   Object.keys(filterModel).map(function (key) {
     var value = filterModel[key];
+    var colDef = colDefs.find(function (colDef) {
+      return colDef.field == key;
+    });
     if (value !== undefined && value !== null && value !== "") {
-      var filter = getFilter(key, value);
+      var filter = getFilter(key, value, colDef);
       if (filter && filter != "") {
         items.push(filter);
       }