coolcare-lite-scada-component 4.0.6 → 4.0.8

package/es/components/ModalChoosePoint/index.js

@@ -25,6 +25,7 @@ var ModalChoosePoint = function ModalChoosePoint(_ref) {
     onSubmit = _ref.onSubmit,
     onCancel = _ref.onCancel,
     companyId = _ref.companyId,
+    projectId = _ref.projectId,
     currentDeviceId = _ref.currentDeviceId;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
@@ -150,12 +151,13 @@ var ModalChoosePoint = function ModalChoosePoint(_ref) {
     title: '选择属性',
     closable: false,
     width: 300,
-    zIndex: 100,
+    zIndex: 9999,
     maskClosable: true,
     footer: null,
     onCancel: closeModal,
     visible: visible,
-    wrapClassName: 'form-modal'
+    wrapClassName: 'form-modal',
+    getContainer: false
   }, /*#__PURE__*/React.createElement(Form, {
     layout: "vertical",
     form: form,
@@ -169,6 +171,7 @@ var ModalChoosePoint = function ModalChoosePoint(_ref) {
     }
   }, /*#__PURE__*/React.createElement(Form.Item, {
     name: "deviceId",
+    className: "temperatureDeviceSelect",
     label: "\u8BBE\u5907",
     rules: [{
       required: true,
@@ -182,6 +185,9 @@ var ModalChoosePoint = function ModalChoosePoint(_ref) {
       form.setFieldsValue({
         pointIdList: []
       });
+    },
+    getPopupContainer: function getPopupContainer() {
+      return document.querySelector('.temperatureDeviceSelect') || document.body;
     }
   }, deviceList.map(function (item) {
     return /*#__PURE__*/React.createElement(Option, {
@@ -200,20 +206,24 @@ var ModalChoosePoint = function ModalChoosePoint(_ref) {
       rules: [{
         required: true,
         message: '请选择'
-      }]
+      }],
+      className: "temperaturePointSelect"
     }, /*#__PURE__*/React.createElement(Select, {
       allowClear: true,
       mode: 'multiple',
       showSearch: true,
       optionFilterProp: "label",
       placeholder: "\u8BF7\u9009\u62E9",
-      disabled: !getFieldValue('deviceId')
+      disabled: !getFieldValue('deviceId'),
+      getPopupContainer: function getPopupContainer() {
+        return document.querySelector('.temperaturePointSelect') || document.body;
+      }
     }, pointList.map(function (item) {
       return /*#__PURE__*/React.createElement(Option, {
-        value: item.pointId,
-        label: item.pointName,
-        key: item.pointId
-      }, item.pointName);
+        value: item.pointId || item.indicatorNo,
+        label: item.pointName || item.indicatorName,
+        key: item.pointId || item.indicatorNo
+      }, item.pointName || item.indicatorName);
     })));
   }), /*#__PURE__*/React.createElement(Form.Item, _extends({}, tailLayout, {
     noStyle: true,

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "coolcare-lite-scada-component",
-  "version": "4.0.6",
+  "version": "4.0.8",
   "scripts": {
     "start": " umi dev",
     "build:prod": "UMI_ENV=prod umi build",
     "build:generalfushi": "UMI_ENV=prod REACT_APP_PLATFORM=generalfushi umi build",
-    "build:yimin": "export NODE_OPTIONS=--openssl-legacy-provider && UMI_ENV=prod REACT_APP_PLATFORM=yimin umi build",
+    "build:yimin": "UMI_ENV=prod REACT_APP_PLATFORM=yimin umi build",
     "build:staging": "UMI_ENV=staging umi build",
     "build:component": "father build",
     "postinstall": "umi generate tmp",