@zgfe/modules-dm 1.0.18 → 1.0.20

package/es/modules/dataCollection/collectionAttributeList.js

@@ -35,12 +35,18 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
   var isOpen = props.isOpen,
       queryPlanData = props.queryPlanData,
       source = props.source,
-      eventAttrsData = props.eventAttrsData; // 加载中
+      eventAttrsData = props.eventAttrsData; // 属性列表加载中
 
   var _useState = useState(true),
       _useState2 = _slicedToArray(_useState, 2),
       loading = _useState2[0],
-      setLoading = _useState2[1];
+      setLoading = _useState2[1]; // 属性值弹窗列表加载中
+
+
+  var _useState3 = useState(false),
+      _useState4 = _slicedToArray(_useState3, 2),
+      valueLoading = _useState4[0],
+      setValueLoading = _useState4[1];
 
   var _useContext2 = useContext(DmContext),
       state = _useContext2.state; // 判断是否在方案中： 处理表格class添加异常样式 | 处理表格行异常信息展示, true异常
@@ -72,10 +78,10 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
   }; // 用户属性列表
 
 
-  var _useState3 = useState([]),
-      _useState4 = _slicedToArray(_useState3, 2),
-      userAttrData = _useState4[0],
-      setUserAttrData = _useState4[1];
+  var _useState5 = useState([]),
+      _useState6 = _slicedToArray(_useState5, 2),
+      userAttrData = _useState6[0],
+      setUserAttrData = _useState6[1];
 
   var queryUserPropMeta = function queryUserPropMeta() {
     request(apis.getUserPropMeta, {
@@ -130,10 +136,10 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
   }; // 别名foucs
 
 
-  var _useState5 = useState(''),
-      _useState6 = _slicedToArray(_useState5, 2),
-      aliasFocusData = _useState6[0],
-      setAliasFocusData = _useState6[1];
+  var _useState7 = useState(''),
+      _useState8 = _slicedToArray(_useState7, 2),
+      aliasFocusData = _useState8[0],
+      setAliasFocusData = _useState8[1];
 
   var aliasFocus = function aliasFocus(e) {
     setAliasFocusData(e.currentTarget.value);
@@ -344,30 +350,31 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     dataIndex: 'mapping_value'
   }];
 
-  var _useState7 = useState([]),
-      _useState8 = _slicedToArray(_useState7, 2),
-      attrExcelData = _useState8[0],
-      setAttrExcelData = _useState8[1];
-
-  var _useState9 = useState(false),
+  var _useState9 = useState([]),
       _useState10 = _slicedToArray(_useState9, 2),
-      attrAliasNameShow = _useState10[0],
-      setAttrAliasNameShow = _useState10[1];
+      attrExcelData = _useState10[0],
+      setAttrExcelData = _useState10[1];
 
-  var _useState11 = useState(0),
+  var _useState11 = useState(false),
       _useState12 = _slicedToArray(_useState11, 2),
-      attrId = _useState12[0],
-      setattrId = _useState12[1];
+      attrAliasNameShow = _useState12[0],
+      setAttrAliasNameShow = _useState12[1];
 
   var _useState13 = useState(0),
       _useState14 = _slicedToArray(_useState13, 2),
-      batchId = _useState14[0],
-      setBatchId = _useState14[1];
+      attrId = _useState14[0],
+      setattrId = _useState14[1];
+
+  var _useState15 = useState(0),
+      _useState16 = _slicedToArray(_useState15, 2),
+      batchId = _useState16[0],
+      setBatchId = _useState16[1];
 
   var uploadProps = {
     maxCount: 1,
     showUploadList: false,
     beforeUpload: function beforeUpload(file) {
+      setValueLoading(true);
       var formData = new FormData();
       formData.append('file', file, file.name);
       var data = new FormData();
@@ -383,6 +390,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
           message.success('上传成功');
           setBatchId(res.batch_id);
           setAttrExcelData(res.values);
+          setValueLoading(false);
         } else {
           message.error(res.msg);
         }
@@ -391,10 +399,10 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     }
   }; // 清空属性值别名excel数据
 
-  var _useState15 = useState(false),
-      _useState16 = _slicedToArray(_useState15, 2),
-      clearFlag = _useState16[0],
-      setClearFlag = _useState16[1];
+  var _useState17 = useState(false),
+      _useState18 = _slicedToArray(_useState17, 2),
+      clearFlag = _useState18[0],
+      setClearFlag = _useState18[1];
 
   var clearData = function clearData() {
     setAttrExcelData([]);
@@ -403,6 +411,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
 
 
   var attrAliasNameEdit = function attrAliasNameEdit() {
+    setValueLoading(true);
     request(apis.addPropDict, {
       method: 'post',
       params: {
@@ -416,13 +425,14 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     }).then(function (res) {
       if (res) {
         message.success('操作成功');
-        setAttrAliasNameShow(false);
+        closeHandle();
       }
     }).catch(function (err) {});
   }; // 获取已设置的属性值别名列表
 
 
   var getAttrAliasList = function getAttrAliasList() {
+    setValueLoading(true);
     request(apis.queryPropDict, {
       method: 'post',
       params: {
@@ -433,6 +443,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     }).then(function (res) {
       if (res) {
         setAttrExcelData(res.values);
+        setValueLoading(false);
       }
     });
   };
@@ -442,6 +453,15 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
       getAttrAliasList();
     }
   }, [attrId]);
+
+  var closeHandle = function closeHandle() {
+    setattrId(0);
+    setAttrAliasNameShow(false);
+    setClearFlag(false);
+    setValueLoading(false);
+    setAttrExcelData([]);
+  };
+
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/React.createElement(Table, {
@@ -462,9 +482,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     getContainer: false,
     visible: attrAliasNameShow,
     onOk: attrAliasNameEdit,
-    onCancel: function onCancel() {
-      return setAttrAliasNameShow(false);
-    }
+    onCancel: closeHandle
   }, /*#__PURE__*/React.createElement("div", {
     className: "button-box"
   }, /*#__PURE__*/React.createElement(Upload, _objectSpread({}, uploadProps), /*#__PURE__*/React.createElement(Button, {
@@ -489,6 +507,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     scroll: {
       y: 200
     },
+    loading: valueLoading,
     columns: attrColumns,
     rowKey: "mapping_value",
     dataSource: attrExcelData,

package/es/modules/dataCollection/demo/index.js

@@ -1,6 +1,9 @@
 import React from 'react';
 import { DataCollection } from '@zgfe/modules-dm';
-import DemoWrapper from '../../../components/demo';
+import { DemoWrapper } from '@zgfe/business-lib'; // import DemoWrapper from '../../../components/demo';
+
 export default (function () {
-  return /*#__PURE__*/React.createElement(DemoWrapper, null, /*#__PURE__*/React.createElement(DataCollection, null));
+  return /*#__PURE__*/React.createElement(DemoWrapper, {
+    defaultApp: 234
+  }, /*#__PURE__*/React.createElement(DataCollection, null));
 });

package/es/modules/dataCollection/tablePlus.js

@@ -424,6 +424,7 @@ var TablePlus = function TablePlus(props) {
         return /*#__PURE__*/React.createElement(Input, {
           className: "alias_name",
           placeholder: "\u7F16\u8F91\u522B\u540D",
+          disabled: isDemo,
           defaultValue: record.alias_name,
           onFocus: aliasFocus,
           onBlur: function onBlur(e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.18",
+  "version": "1.0.20",
   "license": "ISC",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
@@ -49,7 +49,7 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "2bf40526d03de54ee12beaaa3c2afe465b912494",
+  "gitHead": "f7b7c9b40d6b22a96bbfe700e4708b748cbaaa09",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }