@nokecy/qc-ui 1.0.4 → 1.0.6

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/index.less

@@ -1,15 +1,15 @@
-.grid-spin {
-    height: 100%;
-
-    .ant-spin-container {
-        height: 100%;
-    }
-}
-
-.ag-icon-filter:before {
-    -webkit-mask-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/PjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+PHN2ZyB0PSIxNzIzNjg0NDAwMDY0IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjI0MjgiIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB3aWR0aD0iMjAwIiBoZWlnaHQ9IjIwMCI+PHBhdGggZD0iTTMyNS43MTQyODYgODg0LjU3MTQyOWMwIDIwLjIyODU3MSAxNi4yMjg1NzEgMzYuNTcxNDI5IDM2LjM0Mjg1NyAzNi41NzE0MjhoMjk5Ljg4NTcxNGMyMC4xMTQyODYgMCAzNi4zNDI4NTctMTYuMzQyODU3IDM2LjM0Mjg1Ny0zNi41NzE0MjhWNjYwLjU3MTQyOUgzMjUuNzE0Mjg2djIyNHogbTYwNi45NzE0MjgtNzgxLjcxNDI4Nkg5MS4zMTQyODZjLTI4IDAtNDUuNDg1NzE0IDMwLjUxNDI4Ni0zMS40Mjg1NzIgNTQuODU3MTQzbDI1Mi45MTQyODYgNDI5LjcxNDI4NWgzOTguNjI4NTcxbDI1Mi45MTQyODYtNDI5LjcxNDI4NWMxMy44Mjg1NzEtMjQuMzQyODU3LTMuNjU3MTQzLTU0Ljg1NzE0My0zMS42NTcxNDMtNTQuODU3MTQzeiIgcC1pZD0iMjQyOSIgZmlsbD0iIzhhOGE4YSI+PC9wYXRoPjwvc3ZnPg==) !important;
-    
-    mask-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/PjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+PHN2ZyB0PSIxNzIzNjg0NDAwMDY0IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjI0MjgiIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB3aWR0aD0iMjAwIiBoZWlnaHQ9IjIwMCI+PHBhdGggZD0iTTMyNS43MTQyODYgODg0LjU3MTQyOWMwIDIwLjIyODU3MSAxNi4yMjg1NzEgMzYuNTcxNDI5IDM2LjM0Mjg1NyAzNi41NzE0MjhoMjk5Ljg4NTcxNGMyMC4xMTQyODYgMCAzNi4zNDI4NTctMTYuMzQyODU3IDM2LjM0Mjg1Ny0zNi41NzE0MjhWNjYwLjU3MTQyOUgzMjUuNzE0Mjg2djIyNHogbTYwNi45NzE0MjgtNzgxLjcxNDI4Nkg5MS4zMTQyODZjLTI4IDAtNDUuNDg1NzE0IDMwLjUxNDI4Ni0zMS40Mjg1NzIgNTQuODU3MTQzbDI1Mi45MTQyODYgNDI5LjcxNDI4NWgzOTguNjI4NTcxbDI1Mi45MTQyODYtNDI5LjcxNDI4NWMxMy44Mjg1NzEtMjQuMzQyODU3LTMuNjU3MTQzLTU0Ljg1NzE0My0zMS42NTcxNDMtNTQuODU3MTQzeiIgcC1pZD0iMjQyOSIgZmlsbD0iIzhhOGE4YSI+PC9wYXRoPjwvc3ZnPg==) !important;
-
-    color: #8a8a8a;
+.grid-spin {
+    height: 100%;
+
+    .ant-spin-container {
+        height: 100%;
+    }
+}
+
+.ag-icon-filter:before {
+    -webkit-mask-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/PjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+PHN2ZyB0PSIxNzIzNjg0NDAwMDY0IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjI0MjgiIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB3aWR0aD0iMjAwIiBoZWlnaHQ9IjIwMCI+PHBhdGggZD0iTTMyNS43MTQyODYgODg0LjU3MTQyOWMwIDIwLjIyODU3MSAxNi4yMjg1NzEgMzYuNTcxNDI5IDM2LjM0Mjg1NyAzNi41NzE0MjhoMjk5Ljg4NTcxNGMyMC4xMTQyODYgMCAzNi4zNDI4NTctMTYuMzQyODU3IDM2LjM0Mjg1Ny0zNi41NzE0MjhWNjYwLjU3MTQyOUgzMjUuNzE0Mjg2djIyNHogbTYwNi45NzE0MjgtNzgxLjcxNDI4Nkg5MS4zMTQyODZjLTI4IDAtNDUuNDg1NzE0IDMwLjUxNDI4Ni0zMS40Mjg1NzIgNTQuODU3MTQzbDI1Mi45MTQyODYgNDI5LjcxNDI4NWgzOTguNjI4NTcxbDI1Mi45MTQyODYtNDI5LjcxNDI4NWMxMy44Mjg1NzEtMjQuMzQyODU3LTMuNjU3MTQzLTU0Ljg1NzE0My0zMS42NTcxNDMtNTQuODU3MTQzeiIgcC1pZD0iMjQyOSIgZmlsbD0iIzhhOGE4YSI+PC9wYXRoPjwvc3ZnPg==) !important;
+    
+    mask-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/PjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+PHN2ZyB0PSIxNzIzNjg0NDAwMDY0IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjI0MjgiIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB3aWR0aD0iMjAwIiBoZWlnaHQ9IjIwMCI+PHBhdGggZD0iTTMyNS43MTQyODYgODg0LjU3MTQyOWMwIDIwLjIyODU3MSAxNi4yMjg1NzEgMzYuNTcxNDI5IDM2LjM0Mjg1NyAzNi41NzE0MjhoMjk5Ljg4NTcxNGMyMC4xMTQyODYgMCAzNi4zNDI4NTctMTYuMzQyODU3IDM2LjM0Mjg1Ny0zNi41NzE0MjhWNjYwLjU3MTQyOUgzMjUuNzE0Mjg2djIyNHogbTYwNi45NzE0MjgtNzgxLjcxNDI4Nkg5MS4zMTQyODZjLTI4IDAtNDUuNDg1NzE0IDMwLjUxNDI4Ni0zMS40Mjg1NzIgNTQuODU3MTQzbDI1Mi45MTQyODYgNDI5LjcxNDI4NWgzOTguNjI4NTcxbDI1Mi45MTQyODYtNDI5LjcxNDI4NWMxMy44Mjg1NzEtMjQuMzQyODU3LTMuNjU3MTQzLTU0Ljg1NzE0My0zMS42NTcxNDMtNTQuODU3MTQzeiIgcC1pZD0iMjQyOSIgZmlsbD0iIzhhOGE4YSI+PC9wYXRoPjwvc3ZnPg==) !important;
+
+    color: #8a8a8a;
 }

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

@@ -29,6 +29,10 @@ interface GridProps extends AgGridReactProps {
     gridRef?: React.Ref<GridRef | undefined>;
 }
 interface AgGridColumnPropsClone extends ColDef {
+    /**
+     * 是否精确查询
+     */
+    exactQuery?: boolean;
     hideInTable?: boolean;
     hideInSearch?: boolean;
     queryField?: string;
@@ -41,4 +45,4 @@ interface AgGridColumnPropsClone extends ColDef {
     }[];
 }
 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.less

@@ -1,48 +1,48 @@
-
-@pro-table-search-prefix-cls: ~'ag-grid-table-search';
-
-@pro-table-form-prefix-cls: ~'ag-grid-table-form';
-
-.@{pro-table-search-prefix-cls} {
-    margin-bottom: 8px;
-    padding: 8px;
-    // padding-bottom: 0;
-    background-color: #fff;
-
-    &.@{pro-table-form-prefix-cls} {
-        margin: 0;
-        padding: 0 16px;
-        overflow: unset;
-    }
-
-    &-light {
-        margin-bottom: 0;
-        padding: 16px 0;
-    }
-
-    &-form-option {
-        .ant-form-item {
-            margin: 0;
-        }
-
-        .ant-form-item-label {
-            opacity: 0;
-        }
-
-        .ant-form-item-control-input {
-            justify-content: flex-start;
-        }
-    }
-}
-
-@media (max-width: 575px) {
-    .@{pro-table-search-prefix-cls} {
-        height: auto !important;
-        padding-bottom: 24px;
-
-        .ant-form-item-label {
-            min-width: 80px;
-            text-align: left;
-        }
-    }
-}
+
+@pro-table-search-prefix-cls: ~'ag-grid-table-search';
+
+@pro-table-form-prefix-cls: ~'ag-grid-table-form';
+
+.@{pro-table-search-prefix-cls} {
+    margin-bottom: 8px;
+    padding: 8px;
+    // padding-bottom: 0;
+    background-color: #fff;
+
+    &.@{pro-table-form-prefix-cls} {
+        margin: 0;
+        padding: 0 16px;
+        overflow: unset;
+    }
+
+    &-light {
+        margin-bottom: 0;
+        padding: 16px 0;
+    }
+
+    &-form-option {
+        .ant-form-item {
+            margin: 0;
+        }
+
+        .ant-form-item-label {
+            opacity: 0;
+        }
+
+        .ant-form-item-control-input {
+            justify-content: flex-start;
+        }
+    }
+}
+
+@media (max-width: 575px) {
+    .@{pro-table-search-prefix-cls} {
+        height: auto !important;
+        padding-bottom: 24px;
+
+        .ant-form-item-label {
+            min-width: 80px;
+            text-align: left;
+        }
+    }
+}

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

@@ -10,10 +10,10 @@ import { ConfigProvider, Tooltip } from 'antd';
 import classNames from 'classnames';
 import React, { useContext, useMemo } from 'react';
 import { useStyle } from "./style";
-/**
- * 获取配置区域 DOM Item
- *
- * @param setting 配置项
+/**
+ * 获取配置区域 DOM Item
+ *
+ * @param setting 配置项
  */
 function getSettingItem(setting) {
   if ( /*#__PURE__*/React.isValidElement(setting)) {

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);
       }

package/dist/esm/dashboard/dashboard/components/toolbar/style/index.less

@@ -1,49 +1,49 @@
-.react-dashboard-toolbar {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  // width: 100%;
-  padding: 0 10px;
-  padding-bottom: 10px;
-  // background: var(--component-background);
-
-  &:after {
-    display: block;
-    clear: both;
-    content: '';
-  }
-
-  &-left {
-    float: left;
-
-    button {
-      margin-right: 10px;
-    }
-  }
-
-  &-right {
-    float: right;
-
-    button {
-      margin-left: 10px;
-    }
-  }
-
-  &-space {
-    flex: auto;
-    height: 1px;
-    margin: 0 !important;
-    padding: 0 !important;
-    border: 0 !important;
-    -webkit-box-flex: 1;
-  }
-
-  &-fixed {
-    position: fixed;
-    right: 0;
-    bottom: 0;
-    z-index: 9;
-    border-top: 1px solid rgba(128, 128, 128, 0.1);
-    box-shadow: 0 -1px 2px rgba(128, 128, 128, 0.03);
-  }
-}
+.react-dashboard-toolbar {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  // width: 100%;
+  padding: 0 10px;
+  padding-bottom: 10px;
+  // background: var(--component-background);
+
+  &:after {
+    display: block;
+    clear: both;
+    content: '';
+  }
+
+  &-left {
+    float: left;
+
+    button {
+      margin-right: 10px;
+    }
+  }
+
+  &-right {
+    float: right;
+
+    button {
+      margin-left: 10px;
+    }
+  }
+
+  &-space {
+    flex: auto;
+    height: 1px;
+    margin: 0 !important;
+    padding: 0 !important;
+    border: 0 !important;
+    -webkit-box-flex: 1;
+  }
+
+  &-fixed {
+    position: fixed;
+    right: 0;
+    bottom: 0;
+    z-index: 9;
+    border-top: 1px solid rgba(128, 128, 128, 0.1);
+    box-shadow: 0 -1px 2px rgba(128, 128, 128, 0.03);
+  }
+}