npm - @vitrosoftware/common-ui-ts - Versions diffs - 1.1.202 → 1.1.204 - Mend

@vitrosoftware/common-ui-ts 1.1.202 → 1.1.204

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

package/dist/index.js +98 -65
package/dist/index.js.map +1 -1
package/dist/src/controls/TableView/TableViewConstants.d.ts +9 -2
package/dist/src/controls/TableView/services/TableViewService.d.ts +2 -0
package/dist/src/controls/TableView/services/impl/TableViewServiceImpl.d.ts +6 -0
package/package.json +1 -1
package/src/controls/BimViewer/js/bim-viewer.js +2 -2
package/src/controls/DxfViewer/js/dxf-viewer.js +14 -14
package/src/controls/PdfViewer/js/pdf-viewer.js +1 -1

package/dist/index.js CHANGED Viewed

@@ -21340,6 +21340,7 @@ var EVENT$1;
   EVENT["ON_GET_TYPE"] = "OnGetType";
   EVENT["ON_BUTTON_CLICK"] = "OnButtonClick";
   EVENT["ON_AFTER_COL_RESIZE"] = "OnAfterColResize";
+  EVENT["ON_EXPORT"] = "OnExport";
 })(EVENT$1 || (EVENT$1 = {}));
 var CFG_ATTRIBUTE;
 (function (CFG_ATTRIBUTE) {
@@ -21363,7 +21364,9 @@ var URL;
   URL["LAYOUT"] = "Layout";
   URL["DATA"] = "Data";
   URL["PAGE"] = "Page";
+  URL["EXPORT"] = "Export";
   URL["TREEGRID_TEXT"] = "treegrid/Text_ru-RU.xml";
+  URL["API"] = "/api";
 })(URL || (URL = {}));
 var CONTROLLER;
 (function (CONTROLLER) {
@@ -21580,6 +21583,11 @@ var GANTT_MENU_ACTION;
   GANTT_MENU_ACTION["DELETE_ALL_DEPENDENCIES"] = "DelAllGanttDep";
   GANTT_MENU_ACTION["CORRECT_RELATED_DEPENDENCIES"] = "CorrectRelatedDependencies";
 })(GANTT_MENU_ACTION || (GANTT_MENU_ACTION = {}));
+var GANTT_COLUMN_LIST = ['GanttStart', 'GanttEnd', 'GanttDescendants', 'GanttAncestors', 'GanttMinStart', 'GanttMaxEnd'];
+var XML_TAG;
+(function (XML_TAG) {
+  XML_TAG["PAGE_SETTINGS"] = "B";
+})(XML_TAG || (XML_TAG = {}));
 var TableViewConstants = {
     __proto__: null,
@@ -21615,7 +21623,9 @@ var TableViewConstants = {
     get DEPENDENCY_TYPE () { return DEPENDENCY_TYPE; },
     get GANTT_OBJECT_NAME () { return GANTT_OBJECT_NAME; },
     get GANTT_UNITS () { return GANTT_UNITS; },
-    get GANTT_MENU_ACTION () { return GANTT_MENU_ACTION; }
+    get GANTT_MENU_ACTION () { return GANTT_MENU_ACTION; },
+    GANTT_COLUMN_LIST: GANTT_COLUMN_LIST,
+    get XML_TAG () { return XML_TAG; }
 };
 var w$1 = window;
@@ -21857,6 +21867,9 @@ var TableViewServiceImpl = /*#__PURE__*/function () {
   _proto["export"] = function _export() {
     this.grid.ActionExport();
   };
+  _proto.getExportUrl = function getExportUrl() {
+    return this.grid.Data.Export.Url;
+  };
   _proto.print = function print() {
     this.grid.ActionPrint();
   };
@@ -22017,6 +22030,65 @@ var TableViewServiceImpl = /*#__PURE__*/function () {
   _proto.expand = function expand(row) {
     this.grid.Expand(row);
   };
+  _proto.getRequestDataXml = function getRequestDataXml(data) {
+    var newData = data;
+    if (this.isFilterOneLevel) {
+      newData = this.setXmlPart(newData, 'FilterOneLevel="1"', XML_TAG.PAGE_SETTINGS);
+    }
+    if (this.filterContentTypeList) {
+      var filterContentTypeListJson = JSON.stringify(this.filterContentTypeList);
+      newData = this.setXmlPart(newData, "FilterContentTypeList='" + filterContentTypeListJson + "'", XML_TAG.PAGE_SETTINGS);
+    }
+    newData = this.setSearchCriterionLisXml(newData);
+    newData = this.setVisibleColumnListXml(newData);
+    return newData;
+  };
+  _proto.setXmlPart = function setXmlPart(xmlString, value, tag) {
+    var startTag = "<" + tag + " ";
+    if (xmlString.indexOf(startTag) === -1) {
+      var configStartTag = '</Grid>';
+      var insertIndex = xmlString.indexOf(configStartTag);
+      var insertString = "<" + tag + " " + value + " />";
+      if (xmlString.indexOf('<Body>') === -1) {
+        insertString = "<Body>" + insertString + "</Body>";
+      }
+      xmlString = xmlString.slice(0, insertIndex) + insertString + xmlString.slice(insertIndex);
+    } else {
+      var _configStartTag = startTag;
+      var _insertIndex = xmlString.indexOf(_configStartTag) + _configStartTag.length;
+      xmlString = xmlString.slice(0, _insertIndex) + value + CTRL.SPACE + xmlString.slice(_insertIndex);
+    }
+    return xmlString;
+  };
+  _proto.setSearchCriterionLisXml = function setSearchCriterionLisXml(data) {
+    var searchCriterionList = this.getSearchCriterionList();
+    if (searchCriterionList && searchCriterionList.length) {
+      var searchCriterionListJson = JSON.stringify(searchCriterionList);
+      var value = "SearchCriterionList='" + searchCriterionListJson + "'";
+      data = this.setXmlPart(data, value, XML_TAG.PAGE_SETTINGS);
+    }
+    return data;
+  };
+  _proto.setVisibleColumnListXml = function setVisibleColumnListXml(data) {
+    var visibleColumnNameList = this.getCols(ATTRIBUTE.VISIBLE);
+    if (visibleColumnNameList && visibleColumnNameList.length) {
+      this.addGanttVisibleColumnList(visibleColumnNameList);
+      var visibleColumnNameListJson = JSON.stringify(visibleColumnNameList);
+      var value = "VisibleColumnList='" + visibleColumnNameListJson + "'";
+      data = this.setXmlPart(data, value, XML_TAG.PAGE_SETTINGS);
+    }
+    return data;
+  };
+  _proto.addGanttVisibleColumnList = function addGanttVisibleColumnList(visibleColumnNameList) {
+    if (this.ganttCol) {
+      for (var _iterator = _createForOfIteratorHelperLoose(GANTT_COLUMN_LIST), _step; !(_step = _iterator()).done;) {
+        var col = _step.value;
+        if (this.ganttCol[col]) {
+          visibleColumnNameList.push(this.ganttCol[col]);
+        }
+      }
+    }
+  };
   _createClass(TableViewServiceImpl, [{
     key: "columnList",
     get: function get() {
@@ -22160,60 +22232,8 @@ var TreeGrid = function TreeGrid(props) {
       }
     }
   };
-  var initData = function initData(data, value, tag) {
-    if (data.indexOf("<" + tag) === -1) {
-      var configStartTag = '</Grid>';
-      var insertIndex = data.indexOf(configStartTag);
-      data = data.slice(0, insertIndex) + ("<" + tag + ">" + value + "</" + tag + ">") + data.slice(insertIndex);
-    } else {
-      var _configStartTag = "<" + tag + " ";
-      var _insertIndex = data.indexOf(_configStartTag) + _configStartTag.length;
-      data = data.slice(0, _insertIndex) + value + CTRL.SPACE + data.slice(_insertIndex);
-    }
-    return data;
-  };
   var onDataSendHandler = function onDataSendHandler(tableView, source, data) {
-    var newData = data;
-    if (tableView.isFilterOneLevel) {
-      newData = initData(newData, 'FilterOneLevel="1"', 'B');
-    }
-    if (tableView.filterContentTypeList) {
-      var filterContentTypeListJson = JSON.stringify(tableView.filterContentTypeList);
-      newData = initData(newData, "FilterContentTypeList='" + filterContentTypeListJson + "'", 'B');
-    }
-    var searchCriterionList = tableView.getSearchCriterionList();
-    if (searchCriterionList && searchCriterionList.length) {
-      var searchCriterionListJson = JSON.stringify(searchCriterionList);
-      var value = "SearchCriterionList='" + searchCriterionListJson + "'";
-      newData = initData(newData, value, 'B');
-    }
-    var visibleColumnNameList = [];
-    var columnList = tableView.columnList;
-    for (var column in columnList) {
-      if (columnList.hasOwnProperty(column)) {
-        if (columnList[column] && columnList[column].Visible) {
-          visibleColumnNameList.push(column);
-        }
-      }
-    }
-    if (visibleColumnNameList && visibleColumnNameList.length) {
-      initGanttVisibleColumnList(tableView, visibleColumnNameList);
-      var visibleColumnNameListJson = JSON.stringify(visibleColumnNameList);
-      var _value = "VisibleColumnList='" + visibleColumnNameListJson + "'";
-      newData = initData(newData, _value, 'B');
-    }
-    return newData;
-  };
-  var initGanttVisibleColumnList = function initGanttVisibleColumnList(tableView, visibleColumnNameList) {
-    if (tableView.ganttCol) {
-      var ganttColumnList = ["GanttStart", "GanttEnd", "GanttDescendants", "GanttAncestors", "GanttMinStart", "GanttMaxEnd"];
-      for (var _i = 0, _ganttColumnList = ganttColumnList; _i < _ganttColumnList.length; _i++) {
-        var col = _ganttColumnList[_i];
-        if (tableView.ganttCol[col]) {
-          visibleColumnNameList.push(tableView.ganttCol[col]);
-        }
-      }
-    }
+    return tableView.getRequestDataXml(data);
   };
   var onGridLoaded = function onGridLoaded(g, next) {
     g.IsReadOnly = props.isReadOnly;
@@ -22259,7 +22279,7 @@ var TreeGrid = function TreeGrid(props) {
       return props.createGridUrl(dataKey);
     } else {
       var controller = props.controller || CONTROLLER.REQUEST;
-      return '/api/' + controller + '/' + dataKey + '/' + props.listCode;
+      return [URL.API, controller, dataKey, props.listCode].join(CTRL.SLASH);
     }
   };
   React.useEffect(function () {
@@ -22297,7 +22317,7 @@ var TreeGrid = function TreeGrid(props) {
           Debug: props.debug || CTRL.EMPTY,
           Cache: props.cache || CACHE.DEFAULT,
           CacheVersion: props.cacheVersion
-        }, "vitro-table-view" + props.id);
+        }, 'vitro-table-view' + props.id);
       } else {
         w$2.TreeGrid({
           id: props.id,
@@ -22313,10 +22333,14 @@ var TreeGrid = function TreeGrid(props) {
           Text: {
             Url: props.textUrl || URL.TREEGRID_TEXT
           },
+          Export: {
+            Url: createGridUrl(URL.EXPORT),
+            Type: 'Settings'
+          },
           Debug: props.debug || CTRL.EMPTY,
           Cache: props.cache || CACHE.DEFAULT,
           CacheVersion: props.cacheVersion
-        }, "vitro-table-view" + props.id);
+        }, 'vitro-table-view' + props.id);
       }
     }
   }, [props.id]);
@@ -22326,9 +22350,9 @@ var TreeGrid = function TreeGrid(props) {
     };
   }, []);
   return React__default.createElement("div", {
-    className: styles$5["vitro-table-view"] + (props.className ? CTRL.SPACE + props.className : CTRL.EMPTY)
+    className: styles$5['vitro-table-view'] + (props.className ? CTRL.SPACE + props.className : CTRL.EMPTY)
   }, React__default.createElement("div", {
-    id: "vitro-table-view" + props.id
+    id: 'vitro-table-view' + props.id
   }));
 };
@@ -61066,9 +61090,14 @@ var Button$2 = React.forwardRef(function (props, ref) {
   var _useState2 = React.useState(false),
     isHover = _useState2[0],
     setIsHover = _useState2[1];
+  var innerRef = React.useRef(null);
+  React.useImperativeHandle(ref, function () {
+    return innerRef.current;
+  });
   var createRipple = function createRipple(e) {
+    var _innerRef$current;
     var button = e.currentTarget.firstElementChild;
-    if (button && !props.isDisabled) {
+    if (button && !(innerRef !== null && innerRef !== void 0 && (_innerRef$current = innerRef.current) !== null && _innerRef$current !== void 0 && _innerRef$current.disabled)) {
       var circle = window.document.createElement(HTML_ELEMENT_SPAN);
       var diameter = Math.max(button.clientWidth, button.clientHeight);
       var radius = diameter / 2;
@@ -61084,8 +61113,8 @@ var Button$2 = React.forwardRef(function (props, ref) {
     }
   };
   var onClick = function onClick(e) {
-    var _ref$current;
-    if (!props.isDisabled && !(ref !== null && ref !== void 0 && (_ref$current = ref.current) !== null && _ref$current !== void 0 && _ref$current.disabled)) {
+    var _innerRef$current2;
+    if (!(innerRef !== null && innerRef !== void 0 && (_innerRef$current2 = innerRef.current) !== null && _innerRef$current2 !== void 0 && _innerRef$current2.disabled)) {
       if (props.onClick) {
         setPending(true);
         var promise = props.onClick(e);
@@ -61106,15 +61135,19 @@ var Button$2 = React.forwardRef(function (props, ref) {
       }
     }
   };
+  React.useEffect(function () {
+    if (innerRef.current) {
+      innerRef.current.disabled = pending || (props.isDisabled ? true : false);
+    }
+  }, [pending, props.isDisabled]);
   return React__default.createElement("button", {
-    ref: ref,
+    ref: innerRef,
     onMouseEnter: function onMouseEnter() {
       return setIsHover(true);
     },
     onMouseLeave: function onMouseLeave() {
       return setIsHover(false);
     },
-    disabled: pending || props.isDisabled,
     type: TYPE_BUTTON,
     className: styles$h['vitro-button'] + (props.className ? CTRL.SPACE + props.className : CTRL.EMPTY),
     title: CTRL.EMPTY,
@@ -63131,7 +63164,7 @@ var Viewer = function Viewer(props) {
 };
 var name = "@vitrosoftware/common-ui-ts";
-var version$1 = "1.1.202";
+var version$1 = "1.1.204";
 var description = "vitro software common ui ts";
 var author = "";
 var license = "MIT";