@azrico/reactgrid 1.1.15 → 1.1.17

package/dist/src/views/DataGrid.d.ts

@@ -36,13 +36,13 @@ type customColumnData = {
 };
 type GridOptions = Partial<TypeDataGridProps>;
 export type AzGridProps = {
-    columns?: columnOrString[];
     dataSource?: any[] | ((args: any) => any[] | Promise<any[] | any>);
     licenseKey?: string;
     gridOptions?: GridOptions;
+    columns?: columnOrString[];
     columnExtensions?: Array<{
         name: string;
-    } & Partial<ColumnDefinition>>;
+    } & Partial<LooseColumnDefinition>>;
     editableColumns?: string[];
     leftColumns?: string[];
     rightColumns?: string[];

package/dist/src/views/DataGrid.js

@@ -13,6 +13,8 @@ require("../themes/grid.css");
 var _controls = require("@azrico/controls");
 var _react = _interopRequireDefault(require("react"));
 var _helpers = require("../func/helpers");
+var _BoolEditor = _interopRequireDefault(require("@inovua/reactdatagrid-community/BoolEditor"));
+var _NumericEditor = _interopRequireDefault(require("@inovua/reactdatagrid-community/NumericEditor"));
 var _reactdatagridEnterprise = _interopRequireDefault(require("@inovua/reactdatagrid-enterprise"));
 var _SelectEditor = _interopRequireDefault(require("@inovua/reactdatagrid-community/SelectEditor"));
 var _clsx = _interopRequireDefault(require("clsx"));
@@ -49,7 +51,8 @@ const forcedOptions = {
 };
 const defaultColumnOptions = {
   draggable: false,
-  lockable: false
+  lockable: false,
+  editable: false
 };
 const dynamic_option_names = ['selected', 'loading', 'limit', 'skip'];
 /* -------------------------------------------------------------------------- */
@@ -294,10 +297,7 @@ function ApplyColumnData(props) {
       const r = get_col_name(editableColumns[index]);
       const mcol = final_columns.find(s => get_col_name(s) === r);
       if (mcol) {
-        // mcol.editor = editorWrapper;
-        // mcol.editorOptions = {
-        //     editOnClick: true,
-        // };
+        mcol.editable = true;
       }
     }
   }
@@ -310,16 +310,18 @@ function ApplyColumnData(props) {
           //@ts-ignore
           col.editor = _SelectEditor.default;
           break;
-        //case 'number':
-        //case 'numberic':
-        //	col.editor = NumericEditor;
-        //	break;
-        //case 'truefalse':
-        //case 'bool':
-        //	col.editor = BoolEditor;
-        //	break;
+        case 'number':
+        case 'numberic':
+          //@ts-ignore
+          col.editor = _NumericEditor.default;
+          break;
+        case 'truefalse':
+        case 'bool':
+          //@ts-ignore
+          col.editor = _BoolEditor.default;
+          break;
       }
-
+      if (col.editable != false) col.editable = true;
       delete col.type;
     }
     //@ts-ignore

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@azrico/reactgrid",
-	"version": "1.1.15",
+	"version": "1.1.17",
 	"main": "dist/index.js",
 	"description": "React Datagrid",
 	"author": "Azrideus <MehrdadTavangar@gmail.com>",

package/src/views/DataGrid.tsx

@@ -65,14 +65,15 @@ type customColumnData = {
 type GridOptions = Partial<TypeDataGridProps>;
 /* -------------------------------------------------------------------------- */
 export type AzGridProps = {
-	columns?: columnOrString[];
 	dataSource?: any[] | ((args: any) => any[] | Promise<any[] | any>);
 
 	licenseKey?: string;
 
 	gridOptions?: GridOptions;
 
-	columnExtensions?: Array<{ name: string } & Partial<ColumnDefinition>>;
+	columns?: columnOrString[];
+	columnExtensions?: Array<{ name: string } & Partial<LooseColumnDefinition>>;
+
 	editableColumns?: string[];
 	leftColumns?: string[];
 	rightColumns?: string[];
@@ -143,6 +144,7 @@ const forcedOptions: GridOptions = {
 const defaultColumnOptions: ColumnDefinition = {
 	draggable: false,
 	lockable: false,
+	editable: false,
 };
 const dynamic_option_names = ['selected', 'loading', 'limit', 'skip'];
 /* -------------------------------------------------------------------------- */
@@ -427,16 +429,12 @@ function ApplyColumnData(props: any): ColumnDefinition[] {
 			const r = get_col_name(editableColumns[index]);
 			const mcol = final_columns.find((s) => get_col_name(s) === r);
 			if (mcol) {
-				// mcol.editor = editorWrapper;
-				// mcol.editorOptions = {
-				//     editOnClick: true,
-				// };
+				mcol.editable = true;
 			}
 		}
 	}
 	for (let index = 0; index < final_columns.length; index++) {
 		const col = final_columns[index];
-
 		if (col.type) {
 			switch (col.type) {
 				case 'combo':
@@ -444,15 +442,18 @@ function ApplyColumnData(props: any): ColumnDefinition[] {
 					//@ts-ignore
 					col.editor = SelectEditor;
 					break;
-				//case 'number':
-				//case 'numberic':
-				//	col.editor = NumericEditor;
-				//	break;
-				//case 'truefalse':
-				//case 'bool':
-				//	col.editor = BoolEditor;
-				//	break;
+				case 'number':
+				case 'numberic':
+					//@ts-ignore
+					col.editor = NumericEditor;
+					break;
+				case 'truefalse':
+				case 'bool':
+					//@ts-ignore
+					col.editor = BoolEditor;
+					break;
 			}
+			if (col.editable != false) col.editable = true;
 			delete col.type;
 		}
 		//@ts-ignore