@bchr/bchr-front-lib 0.4.2 → 0.4.3

package/README.md

@@ -1,3 +1,2 @@
 # BCHR-FRONT-LIB
 
-## 1. update react page component ref use mode

package/lib/base/layout/ui_tpl/grid/GridForBrowse.js

@@ -553,6 +553,10 @@ var GridForBrowse = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "buildCell",
     value: function buildCell(config, props) {
+      if (!this.gridRef.current) {
+        return /*#__PURE__*/_react["default"].createElement("td", null);
+      }
+
       var allColumns = this.gridRef.current.columns;
       var dataItem = props.dataItem,
           columnIndex = props.columnIndex;

package/lib/base/layout/ui_tpl/page/Page.js

@@ -94,7 +94,7 @@ var Page = /*#__PURE__*/function (_React$Component) {
   _createClass(Page, [{
     key: "componentDidMount",
     value: function componentDidMount() {
-      this.pageRef = this.pageRef.current;
+      this.pageRef = this.refs.pageRef;
     }
   }, {
     key: "render",
@@ -103,35 +103,35 @@ var Page = /*#__PURE__*/function (_React$Component) {
 
       if (this.props.page_type === 'start_page_view') {
         pageContainer = /*#__PURE__*/_react["default"].createElement(_StartPageView["default"], _extends({
-          ref: this.pageRef
+          ref: "pageRef"
         }, this.props));
       } else if (this.props.page_type === 'default_list_view') {
         pageContainer = /*#__PURE__*/_react["default"].createElement(_DefaultListView["default"], _extends({
-          ref: this.pageRef
+          ref: "pageRef"
         }, this.props));
       } else if (this.props.page_type === 'left_right_view') {
         pageContainer = /*#__PURE__*/_react["default"].createElement(_LeftRightView["default"], _extends({
-          ref: this.pageRef
+          ref: "pageRef"
         }, this.props));
       } else if (this.props.page_type === 'custom_list_view') {
         pageContainer = /*#__PURE__*/_react["default"].createElement(_CustomListView["default"], _extends({
-          ref: this.pageRef
+          ref: "pageRef"
         }, this.props));
       } else if (this.props.page_type === 'custom_left_right_view') {
         pageContainer = /*#__PURE__*/_react["default"].createElement(_CustomLeftRightView["default"], _extends({
-          ref: this.pageRef
+          ref: "pageRef"
         }, this.props));
       } else if (this.props.page_type === 'default_card_view') {
         pageContainer = /*#__PURE__*/_react["default"].createElement(_DefaultCardView["default"], _extends({
-          ref: this.pageRef
+          ref: "pageRef"
         }, this.props));
       } else if (this.props.page_type === 'default_fluid_card_view') {
         pageContainer = /*#__PURE__*/_react["default"].createElement(_DefaultFluidCardView["default"], _extends({
-          ref: this.pageRef
+          ref: "pageRef"
         }, this.props));
       } else if (this.props.page_type === 'affix_fluid_card_view') {
         pageContainer = /*#__PURE__*/_react["default"].createElement(_AffixFluidCardView["default"], _extends({
-          ref: this.pageRef
+          ref: "pageRef"
         }, this.props));
       }
 

package/lib/services/HttpService.js

@@ -9,8 +9,6 @@ var _jquery = _interopRequireDefault(require("jquery"));
 
 var _antd = require("antd");
 
-var _fileSaver = require("file-saver");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
@@ -475,84 +473,6 @@ var HttpService = /*#__PURE__*/function () {
       return _jquery["default"].ajax(ajaxOptions);
     }
   }, {
-    key: "downloadFileByPostJSON",
-    value: function downloadFileByPostJSON(options, paramObject, saveFileName) {
-      var rpcMethodName = "";
-      var ajaxOptions = {};
-
-      if (_jquery["default"].isPlainObject(options)) {
-        rpcMethodName = options.rpcMethodName;
-        ajaxOptions = options;
-      } else {
-        rpcMethodName = options;
-      }
-
-      if (!rpcMethodName) {
-        rpcMethodName = "";
-      }
-
-      ajaxOptions.type = "post";
-      ajaxOptions.dataType = "*";
-
-      if (_jquery["default"].isPlainObject(paramObject)) {
-        ajaxOptions.data = paramObject;
-      }
-
-      if (!ajaxOptions.data) {
-        ajaxOptions.data = {};
-      }
-
-      if (!ajaxOptions.data.euts) {
-        ajaxOptions.data.euts = new Date().getTime();
-      }
-
-      if (!ajaxOptions.url) {
-        ajaxOptions.url = this.requestContextPath + rpcMethodName;
-      }
-
-      ajaxOptions.xhrFields = {
-        responseType: "blob"
-      };
-
-      ajaxOptions.success = function (result, request, xhr) {
-        var fileName = "下载文件-" + new Date().getTime();
-
-        if (saveFileName) {
-          fileName = saveFileName;
-        } else {
-          var contentDisposition = xhr.getResponseHeader('Content-Disposition');
-
-          if (contentDisposition && contentDisposition.split) {
-            var parts = contentDisposition.split(';');
-
-            if (parts.length >= 1) {
-              var fileInfo = parts[1];
-              var fileInfoArray = fileInfo.split('=');
-
-              if (fileInfoArray.length >= 1) {
-                fileName = fileInfoArray[1];
-                fileName = decodeURIComponent(fileName);
-                fileName = fileName.replaceAll("\"", "");
-              }
-            }
-          }
-        }
-
-        var type = xhr.getResponseHeader("content-type");
-
-        if (!type) {
-          type = "application/octet-stream";
-        }
-
-        var blob = new Blob([result], {
-          type: type
-        });
-        (0, _fileSaver.saveAs)(blob, fileName);
-      };
-
-      return _jquery["default"].ajax(ajaxOptions);
-    }
-  }, {
     key: "__getJSONForMock",
     value: function __getJSONForMock(mockOptions) {
       var waitTime = mockOptions.waitTime ? mockOptions.waitTime : 600;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bchr/bchr-front-lib",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "description": "bchr front lib",
   "main": "lib/index.js",
   "scripts": {
@@ -44,7 +44,6 @@
     "@progress/kendo-react-progressbars": "^3.15.0",
     "@progress/kendo-treeview-react-wrapper": "^2019.4.1014",
     "antd": "^4.5.4",
-    "file-saver": "^2.0.5",
     "handsontable": "^7.2.2",
     "jquery": "^3.5.1",
     "moment": "^2.27.0",

package/src/base/layout/ui_tpl/grid/GridForBrowse.js

@@ -294,6 +294,10 @@ class GridForBrowse extends React.Component{
     }
 
     buildCell(config, props) {
+        if (!this.gridRef.current) {
+            return <td></td>;
+        }
+
         let allColumns = this.gridRef.current.columns;
         let {dataItem, columnIndex} = props;
         let {default_locked_fields, customCells, grid_info_record_of_data_check} = this.props;

package/src/base/layout/ui_tpl/page/Page.js

@@ -15,7 +15,7 @@ class Page extends React.Component {
     }
 
     componentDidMount() {
-        this.pageRef = this.pageRef.current;
+        this.pageRef = this.refs.pageRef
     }
 
     showLoading = (state) => {
@@ -42,21 +42,21 @@ class Page extends React.Component {
         let pageContainer = "";
 
         if (this.props.page_type === 'start_page_view') {
-            pageContainer = <StartPageView ref={this.pageRef} {...this.props}/>;
+            pageContainer = <StartPageView ref="pageRef" {...this.props}/>;
         } else if (this.props.page_type === 'default_list_view') {
-            pageContainer = <DefaultListView ref={this.pageRef} {...this.props}/>;
+            pageContainer = <DefaultListView ref="pageRef" {...this.props}/>;
         } else if (this.props.page_type === 'left_right_view')  {
-            pageContainer = <LeftRightView ref={this.pageRef} {...this.props}/>;
+            pageContainer = <LeftRightView ref="pageRef" {...this.props}/>;
         } else if (this.props.page_type === 'custom_list_view') {
-            pageContainer = <CustomListView ref={this.pageRef} {...this.props}/>;
+            pageContainer = <CustomListView ref="pageRef" {...this.props}/>;
         } else if (this.props.page_type === 'custom_left_right_view') {
-            pageContainer = <CustomLeftRightView ref={this.pageRef} {...this.props}/>;
+            pageContainer = <CustomLeftRightView ref="pageRef" {...this.props}/>;
         } else if (this.props.page_type === 'default_card_view') {
-            pageContainer = <DefaultCardView ref={this.pageRef} {...this.props}/>;
+            pageContainer = <DefaultCardView ref="pageRef" {...this.props}/>;
         } else if (this.props.page_type === 'default_fluid_card_view') {
-            pageContainer = <DefaultFluidCardView ref={this.pageRef} {...this.props}/>;
+            pageContainer = <DefaultFluidCardView ref="pageRef" {...this.props}/>;
         } else if (this.props.page_type === 'affix_fluid_card_view') {
-            pageContainer = <AffixFluidCardView ref={this.pageRef} {...this.props}/>;
+            pageContainer = <AffixFluidCardView ref="pageRef" {...this.props}/>;
         }
 
         return pageContainer

package/src/services/HttpService.js

@@ -1,6 +1,5 @@
 import $ from 'jquery';
 import { message} from 'antd';
-import {saveAs} from "file-saver";
 
 /**
  * * ajaxURL = back_service_host_name + back_service_context_path + ajaxBasePath
@@ -451,75 +450,6 @@ class HttpService {
         return $.ajax(ajaxOptions);
     }
 
-    downloadFileByPostJSON(options, paramObject, saveFileName) {
-        let rpcMethodName = "";
-        let ajaxOptions = {};
-        if ($.isPlainObject(options)) {
-            rpcMethodName = options.rpcMethodName;
-            ajaxOptions = options;
-        }
-        else {
-            rpcMethodName = options;
-        }
-
-        if (!rpcMethodName) {
-            rpcMethodName = "";
-        }
-
-        ajaxOptions.type = "post";
-        ajaxOptions.dataType = "*";
-        if ($.isPlainObject(paramObject)) {
-            ajaxOptions.data = paramObject;
-        }
-
-        if (!ajaxOptions.data){
-            ajaxOptions.data = {};
-        }
-
-        if (!ajaxOptions.data.euts) {
-            ajaxOptions.data.euts = (new Date()).getTime();
-        }
-
-        if (!ajaxOptions.url) {
-            ajaxOptions.url  = this.requestContextPath + rpcMethodName;
-        }
-
-        ajaxOptions.xhrFields = {
-            responseType: "blob"
-        }
-
-        ajaxOptions.success = function (result, request, xhr) {
-            let fileName = "下载文件-" + new Date().getTime();
-            if (saveFileName) {
-                fileName = saveFileName
-            }
-            else {
-                let contentDisposition = xhr.getResponseHeader('Content-Disposition');
-                if (contentDisposition && contentDisposition.split) {
-                    let parts = contentDisposition.split(';');
-                    if (parts.length >= 1) {
-                        let fileInfo = parts[1]
-                        let fileInfoArray = fileInfo.split('=');
-                        if (fileInfoArray.length >= 1) {
-                            fileName = fileInfoArray[1];
-                            fileName = decodeURIComponent(fileName)
-                            fileName = fileName.replaceAll("\"", "")
-                        }
-                    }
-                }
-            }
-
-            let type = xhr.getResponseHeader("content-type")
-            if (!type) {
-                type = "application/octet-stream";
-            }
-            let blob = new Blob([result], { type: type })
-            saveAs(blob, fileName)
-        }
-
-        return $.ajax(ajaxOptions);
-    }
-
     __getJSONForMock(mockOptions) {
 
         let waitTime = mockOptions.waitTime ? mockOptions.waitTime : 600;