ods-component-lib 1.17.65 → 1.17.67

package/dist/index.js

@@ -12,13 +12,13 @@ var PhoneInput = _interopDefault(require('react-phone-input-2'));
 var message = _interopDefault(require('antd/es/message'));
 var Parser = _interopDefault(require('html-react-parser'));
 var dataGrid = require('devextreme-react/data-grid');
+var form = require('devextreme-react/form');
 var pdf_exporter = require('devextreme/pdf_exporter');
 var excel_exporter = require('devextreme/excel_exporter');
 var jsPDF = _interopDefault(require('jspdf'));
 var exceljs = require('exceljs');
 var fileSaverEs = require('file-saver-es');
 var moment = _interopDefault(require('moment'));
-var form = require('devextreme-react/form');
 var devextremeReact = require('devextreme-react');
 var AspNetData = require('devextreme-aspnet-data-nojquery');
 var treeView = require('devextreme-react/tree-view');
@@ -1273,15 +1273,7 @@ function grid(props, dataGridRef) {
     onRowInserted: props.onRowInserted,
     onRowUpdated: props.onRowUpdated,
     onRowRemoved: props.onRowRemoved,
-    onEditingStart: props.onEditingStart,
-    onInitNewRow: props.onInitNewRow,
-    onRowInserting: props.onRowInserting,
-    onRowUpdating: props.onRowUpdating,
-    onRowRemoving: props.onRowRemoving,
     onSaving: props.onSaving,
-    onSaved: props.onSaved,
-    onEditCanceling: props.onEditCanceling,
-    onEditCanceled: props.onEditCanceled,
     allowColumnReordering: true,
     showRowLines: true,
     showBorders: true,
@@ -1289,6 +1281,7 @@ function grid(props, dataGridRef) {
     focusedRowEnabled: false,
     wordWrapEnabled: false,
     noDataText: "No Data",
+    onEditCanceling: props.onEditCanceling,
     onExporting: onExporting,
     height: window.innerHeight - 164,
     repaintChangesOnly: true,
@@ -1336,12 +1329,30 @@ function grid(props, dataGridRef) {
   })), props.selectEnable && React__default.createElement(dataGrid.Selection, {
     mode: "multiple",
     deferred: true
-  }), props.inlineEdit === true && React__default.createElement(dataGrid.Editing, {
+  }), props.editEnable === true && React__default.createElement(dataGrid.Editing, {
     mode: props.edit.mode,
     allowUpdating: props.edit.allowUpdating,
     allowDeleting: props.edit.allowDeleting,
-    allowAdding: props.edit.allowAdding
-  }), React__default.createElement(dataGrid.Scrolling, {
+    allowAdding: props.edit.allowAdding,
+    useIcons: true
+  }, props.edit.mode === "popup" && React__default.createElement(dataGrid.Popup, {
+    title: props.popupTitle,
+    showTitle: true,
+    width: 700,
+    height: 300,
+    showCloseButton: false
+  }), React__default.createElement(dataGrid.Form, null, props.formItems.map(function (formItem) {
+    return React__default.createElement(form.Item, {
+      itemType: formItem.itemType,
+      colCount: formItem.colCount,
+      colSpan: formItem.colSpan
+    }, formItem.items.map(function (subItem) {
+      return React__default.createElement(form.Item, {
+        key: subItem.dataField,
+        dataField: subItem.dataField
+      });
+    }));
+  }))), React__default.createElement(dataGrid.Scrolling, {
     mode: props.scroll.mode,
     showScrollbar: props.scroll.showScrollbar,
     scrollByContent: props.scroll.scrollByContent,
@@ -1369,25 +1380,41 @@ function grid(props, dataGridRef) {
         value: false
       }]
     }));
-  }), props.inlinedit === false && React__default.createElement(dataGrid.Column, {
-    dataField: "Actions",
-    caption: "Actions",
-    type: "buttons",
-    width: 110,
-    showInColumnChooser: false
-  }, props.edit.allowUpdating && React__default.createElement(dataGrid.Button, {
-    hint: "Edit",
-    visible: true,
-    disabled: false,
-    icon: "edit",
-    onClick: props.editButtonClick
-  }), props.edit.allowDeleting && React__default.createElement(dataGrid.Button, {
-    hint: "Delete",
-    visible: true,
-    disabled: false,
-    icon: "trash",
-    onClick: props.deleteButtonClick
-  })), React__default.createElement(dataGrid.Toolbar, null, props.pageTitle && React__default.createElement(dataGrid.Item, {
+  }), function () {
+    if (props.customPopup !== undefined) {
+      return React__default.createElement(dataGrid.Column, {
+        dataField: "Actions",
+        caption: "Actions",
+        type: "buttons",
+        width: 110,
+        showInColumnChooser: false
+      }, props.edit.allowUpdating && React__default.createElement(dataGrid.Button, {
+        hint: "Edit",
+        visible: true,
+        disabled: false,
+        icon: "edit",
+        onClick: props.editButtonClick
+      }), props.edit.allowDeleting && React__default.createElement(dataGrid.Button, {
+        hint: "Delete",
+        visible: true,
+        disabled: false,
+        icon: "trash",
+        onClick: props.deleteButtonClick
+      }));
+    } else {
+      return React__default.createElement(dataGrid.Column, {
+        dataField: "Actions",
+        caption: "Actions",
+        type: "buttons",
+        width: 110,
+        showInColumnChooser: false
+      }, React__default.createElement(React__default.Fragment, null, props.edit.allowUpdating && React__default.createElement(dataGrid.Button, {
+        name: "edit"
+      }), props.edit.allowDeleting && React__default.createElement(dataGrid.Button, {
+        name: "delete"
+      })));
+    }
+  }(), React__default.createElement(dataGrid.Toolbar, null, props.pageTitle && React__default.createElement(dataGrid.Item, {
     location: "before"
   }, React__default.createElement(antd.Typography.Title, {
     level: 5,
@@ -1398,7 +1425,7 @@ function grid(props, dataGridRef) {
       gap: "4px",
       alignSelf: "stretch"
     }
-  }, props.pageTitle)), props.inlinedit === false && React__default.createElement(dataGrid.Item, {
+  }, props.pageTitle)), React__default.createElement(dataGrid.Item, {
     location: "before"
   }, React__default.createElement(OdsButton, {
     type: "primary",