@nokecy/qc-ui 0.0.7 → 0.0.8

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

@@ -33,7 +33,7 @@ var _icons = require("@ant-design/icons");
 
 var _utils = require("./utils");
 
-var _excluded = ["style", "params", "request", "dataSource", "headerTitle", "toolBarRender", "search", "onGridReady", "children"];
+var _excluded = ["style", "params", "request", "dataSource", "headerTitle", "toolBarRender", "search", "onGridReady", "gridKey", "gridColumnState", "children"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -78,6 +78,8 @@ function AgGridPlus(props) {
       toolBarRender = props.toolBarRender,
       search = props.search,
       onReady = props.onGridReady,
+      gridKey = props.gridKey,
+      gridColumnState = props.gridColumnState,
       children = props.children,
       rest = _objectWithoutProperties(props, _excluded);
 
@@ -128,12 +130,23 @@ function AgGridPlus(props) {
   var defaultColDef = {
     resizable: true,
     sortable: true
-  };
+  }; //请求数据
+
   (0, _react.useEffect)(function () {
     if (ready && request) {
       onRequest(queryFilter);
     }
-  }, [ready, JSON.stringify(gridParams), JSON.stringify(sortColumn), pagination.pageSize, pagination.current]);
+  }, [ready, JSON.stringify(gridParams), JSON.stringify(sortColumn), pagination.pageSize, pagination.current]); // 加载列方案
+
+  (0, _react.useEffect)(function () {
+    // let columnStates = columnsRef.current!.getColumnState();
+    if (gridColumnState && columnsRef.current) {
+      columnsRef.current.applyColumnState({
+        state: gridColumnState,
+        applyOrder: true
+      });
+    }
+  }, [gridColumnState, columnsRef.current]);
   var onGridReady = (0, _react.useCallback)(function (params) {
     apiRef.current = params.api;
     columnsRef.current = params.columnApi;

package/dist/cjs/ag-grid-plus/global.scss

@@ -11,8 +11,8 @@
         --ag-font-family: ('microsoft yahei', 'Helvetica', 'Arial'),
 
         --ag-borders: solid 0px,
-        --ag-borders-row: dashed 1px,
-        --ag-row-border-color: rgb(150, 150, 200),
+        --ag-borders-row: solid 1px,
+        --ag-row-border-color:#f0f0f5,
         --ag-grid-size: 4px,
 
         --ag-header-background-color: #fafafa,

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

@@ -12,6 +12,14 @@ interface GridProps extends AgGridReactProps {
     headerTitle?: React.ReactNode;
     toolBarRender?: (gridApi?: GridApi, filter?: string, queryFilter?: any) => React.ReactNode[];
     columnDefs?: any;
+    /**
+     * 用于标识grid唯一标识，用于保存列方案
+     */
+    gridKey?: string;
+    /**
+     * 列方案
+    */
+    gridColumnState?: any[];
 }
 interface AgGridColumnPropsClone extends AgGridColumnProps {
     hideInTable?: boolean;

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

@@ -22,17 +22,39 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
 var getFilter = function getFilter(objectKey, value) {
-  var type = "=*";
+  if (typeof value === 'string') {
+    return "".concat(objectKey, " =* ").concat(value);
+  }
 
   if (typeof value === 'number') {
-    type = "=";
+    return "".concat(objectKey, " = ").concat(value);
+  }
+
+  if (value instanceof Array) {
+    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"));
+  }
+
+  return getObjectFilter(value, objectKey);
+};
+
+var getObjectFilter = function getObjectFilter(obj, objKey) {
+  var key = Object.keys(obj)[0];
+  var value = obj[key];
+  var objectKey = "".concat(objKey, ".").concat(key);
+
+  if (typeof value === 'number') {
+    return "".concat(objectKey, " = ").concat(value);
+  }
+
+  if (typeof value === 'string') {
+    return "".concat(objectKey, " =* ").concat(value);
   }
 
   if (value instanceof Array) {
     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"));
   }
 
-  return "".concat(objectKey).concat(type).concat(value);
+  return getObjectFilter(value, "".concat(objKey, ".").concat(key));
 };
 
 var convertFilterModel = function convertFilterModel(filterModel) {

package/dist/cjs/extensible-grid/interface.d.ts

@@ -1,10 +1,14 @@
 import { GridProps } from '../ag-grid-plus/interface';
 interface ExtensibleColumnProps {
+    /** 字段名称 */
     field: string;
+    /** 字段类型 */
     type?: string;
+    /** 显示列名称 */
     headerName: string;
 }
 interface ExtensibleGridProps extends GridProps {
+    /** 动态扩展的列列表 */
     extensibleColumns: ExtensibleColumnProps[];
 }
 export { ExtensibleGridProps };

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

@@ -1,4 +1,4 @@
-var _excluded = ["style", "params", "request", "dataSource", "headerTitle", "toolBarRender", "search", "onGridReady", "children"];
+var _excluded = ["style", "params", "request", "dataSource", "headerTitle", "toolBarRender", "search", "onGridReady", "gridKey", "gridColumnState", "children"];
 
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
@@ -51,6 +51,8 @@ function AgGridPlus(props) {
       toolBarRender = props.toolBarRender,
       search = props.search,
       onReady = props.onGridReady,
+      gridKey = props.gridKey,
+      gridColumnState = props.gridColumnState,
       children = props.children,
       rest = _objectWithoutProperties(props, _excluded);
 
@@ -101,12 +103,23 @@ function AgGridPlus(props) {
   var defaultColDef = {
     resizable: true,
     sortable: true
-  };
+  }; //请求数据
+
   useEffect(function () {
     if (ready && request) {
       onRequest(queryFilter);
     }
-  }, [ready, JSON.stringify(gridParams), JSON.stringify(sortColumn), pagination.pageSize, pagination.current]);
+  }, [ready, JSON.stringify(gridParams), JSON.stringify(sortColumn), pagination.pageSize, pagination.current]); // 加载列方案
+
+  useEffect(function () {
+    // let columnStates = columnsRef.current!.getColumnState();
+    if (gridColumnState && columnsRef.current) {
+      columnsRef.current.applyColumnState({
+        state: gridColumnState,
+        applyOrder: true
+      });
+    }
+  }, [gridColumnState, columnsRef.current]);
   var onGridReady = useCallback(function (params) {
     apiRef.current = params.api;
     columnsRef.current = params.columnApi;

package/dist/esm/ag-grid-plus/global.scss

@@ -11,8 +11,8 @@
         --ag-font-family: ('microsoft yahei', 'Helvetica', 'Arial'),
 
         --ag-borders: solid 0px,
-        --ag-borders-row: dashed 1px,
-        --ag-row-border-color: rgb(150, 150, 200),
+        --ag-borders-row: solid 1px,
+        --ag-row-border-color:#f0f0f5,
         --ag-grid-size: 4px,
 
         --ag-header-background-color: #fafafa,

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

@@ -12,6 +12,14 @@ interface GridProps extends AgGridReactProps {
     headerTitle?: React.ReactNode;
     toolBarRender?: (gridApi?: GridApi, filter?: string, queryFilter?: any) => React.ReactNode[];
     columnDefs?: any;
+    /**
+     * 用于标识grid唯一标识，用于保存列方案
+     */
+    gridKey?: string;
+    /**
+     * 列方案
+    */
+    gridColumnState?: any[];
 }
 interface AgGridColumnPropsClone extends AgGridColumnProps {
     hideInTable?: boolean;

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

@@ -13,17 +13,39 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 import dayjs from 'dayjs';
 
 var getFilter = function getFilter(objectKey, value) {
-  var type = "=*";
+  if (typeof value === 'string') {
+    return "".concat(objectKey, " =* ").concat(value);
+  }
 
   if (typeof value === 'number') {
-    type = "=";
+    return "".concat(objectKey, " = ").concat(value);
+  }
+
+  if (value instanceof Array) {
+    return "".concat(objectKey, " >= ").concat(dayjs(value[0]).format("YYYY-MM-DD"), " ,") + "".concat(objectKey, " <= ").concat(dayjs(value[1]).add(1, 'days').format("YYYY-MM-DD"));
+  }
+
+  return getObjectFilter(value, objectKey);
+};
+
+var getObjectFilter = function getObjectFilter(obj, objKey) {
+  var key = Object.keys(obj)[0];
+  var value = obj[key];
+  var objectKey = "".concat(objKey, ".").concat(key);
+
+  if (typeof value === 'number') {
+    return "".concat(objectKey, " = ").concat(value);
+  }
+
+  if (typeof value === 'string') {
+    return "".concat(objectKey, " =* ").concat(value);
   }
 
   if (value instanceof Array) {
     return "".concat(objectKey, " >= ").concat(dayjs(value[0]).format("YYYY-MM-DD"), " ,") + "".concat(objectKey, " <= ").concat(dayjs(value[1]).add(1, 'days').format("YYYY-MM-DD"));
   }
 
-  return "".concat(objectKey).concat(type).concat(value);
+  return getObjectFilter(value, "".concat(objKey, ".").concat(key));
 };
 
 var convertFilterModel = function convertFilterModel(filterModel) {

package/dist/esm/extensible-grid/interface.d.ts

@@ -1,10 +1,14 @@
 import { GridProps } from '../ag-grid-plus/interface';
 interface ExtensibleColumnProps {
+    /** 字段名称 */
     field: string;
+    /** 字段类型 */
     type?: string;
+    /** 显示列名称 */
     headerName: string;
 }
 interface ExtensibleGridProps extends GridProps {
+    /** 动态扩展的列列表 */
     extensibleColumns: ExtensibleColumnProps[];
 }
 export { ExtensibleGridProps };