@etsoo/react 1.6.84 → 1.6.85

package/lib/components/GridLoader.d.ts

@@ -19,6 +19,12 @@ export type GridData = FormData | DataTypes.StringRecord;
  * @returns Json data
  */
 export declare function GridDataGet<F extends DataTypes.BasicTemplate>(props: GridLoadDataProps, template?: F): GridJsonData & DataTypes.BasicTemplateType<F>;
+/**
+ * Grid data get with format
+ * @param data Data
+ * @returns Json data
+ */
+export declare function GridDataGetData<F extends DataTypes.BasicTemplate>(data?: GridData, template?: F): DataTypes.BasicTemplateType<F>;
 /**
  * Grid Json data
  */

package/lib/components/GridLoader.js

@@ -17,12 +17,20 @@ export const GridSizeGet = (size, input) => {
 export function GridDataGet(props, template) {
     // Destruct
     const { data, ...rest } = props;
+    // DomUtils.dataAs(data, template);
+    return { ...GridDataGetData(data, template), ...rest };
+}
+/**
+ * Grid data get with format
+ * @param data Data
+ * @returns Json data
+ */
+export function GridDataGetData(data, template) {
     // Clear form empty value
     if (data instanceof FormData) {
         DomUtils.clearFormData(data);
     }
     // Conditions
     const conditions = data == null ? {} : DomUtils.dataAs(data, template !== null && template !== void 0 ? template : {}, true); // Set keepSource to true to hold form data, even they are invisible from the conditions
-    // DomUtils.dataAs(data, template);
-    return { ...conditions, ...rest };
+    return conditions;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.6.84",
+    "version": "1.6.85",
     "description": "TypeScript ReactJs UI Independent Framework",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",

package/src/components/GridLoader.ts

@@ -32,6 +32,19 @@ export function GridDataGet<F extends DataTypes.BasicTemplate>(
     // Destruct
     const { data, ...rest } = props;
 
+    // DomUtils.dataAs(data, template);
+    return { ...GridDataGetData(data, template), ...rest };
+}
+
+/**
+ * Grid data get with format
+ * @param data Data
+ * @returns Json data
+ */
+export function GridDataGetData<F extends DataTypes.BasicTemplate>(
+    data?: GridData,
+    template?: F
+): DataTypes.BasicTemplateType<F> {
     // Clear form empty value
     if (data instanceof FormData) {
         DomUtils.clearFormData(data);
@@ -41,8 +54,7 @@ export function GridDataGet<F extends DataTypes.BasicTemplate>(
     const conditions: DataTypes.BasicTemplateType<F> =
         data == null ? {} : DomUtils.dataAs(data, template ?? {}, true); // Set keepSource to true to hold form data, even they are invisible from the conditions
 
-    // DomUtils.dataAs(data, template);
-    return { ...conditions, ...rest };
+    return conditions;
 }
 
 /**