@zgfe/modules-event 0.1.7-heyh.3 → 0.1.8-alpha.0

package/es/components/searchPanel/index.js

@@ -16,7 +16,8 @@ import './styles/index.less';
 var classPrefix = 'search-panel';
 var SearchPanel = function SearchPanel(props) {
   var _useContext = useContext(EventContext),
-    includeToday = _useContext.includeToday;
+    includeToday = _useContext.includeToday,
+    searchData = _useContext.searchData;
   var _useState = useState(props.time || getInitDate(includeToday)),
     _useState2 = _slicedToArray(_useState, 2),
     time = _useState2[0],
@@ -36,30 +37,30 @@ var SearchPanel = function SearchPanel(props) {
     dimension = _useState8[0],
     setDimension = _useState8[1];
   useEffect(function () {
-    if (props.chartType && props.chartType !== chart.value) {
-      if (props.chartType.indexOf(',') !== -1) {
+    if (searchData.chartType && searchData.chartType !== chart.value) {
+      if (searchData.chartType.indexOf(',') !== -1) {
         setChart({
-          value: props.chartType.split(',')[0]
+          value: searchData.chartType.split(',')[0]
         });
       } else {
         setChart({
-          value: props.chartType
+          value: searchData.chartType
         });
       }
     }
     var _dimension = {
       analysisIndex: 'number'
     };
-    if (props.analysisIndex) {
+    if (searchData.analysisIndex) {
       _dimension = {
-        analysisIndex: props.analysisIndex
+        analysisIndex: searchData.analysisIndex
       };
     }
-    if (props.analysisAttr) {
-      _dimension['analysisAttr'] = props.analysisAttr;
+    if (searchData.analysisAttr) {
+      _dimension['analysisAttr'] = searchData.analysisAttr;
     }
     setDimension(_objectSpread({}, _dimension));
-  }, []);
+  }, [searchData]);
   useEffect(function () {
     if (!props.enableSelectChart && chart.value === 'map') {
       setChart({

package/es/components/table/index.js

@@ -34,8 +34,7 @@ var EventTable = function EventTable(props) {
     _useContext$eventGrou = _useContext.eventGroupList,
     eventGroupList = _useContext$eventGrou === void 0 ? [] : _useContext$eventGrou,
     eventEnvList = _useContext.eventEnvList,
-    userPropList = _useContext.userPropList,
-    authority = _useContext.authority;
+    userPropList = _useContext.userPropList;
   var _useContext2 = useContext(EventContext),
     onUserDrill = _useContext2.onUserDrill,
     _useContext2$defaultS = _useContext2.defaultSearch,
@@ -180,9 +179,9 @@ var EventTable = function EventTable(props) {
     className: classPrefix
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-table-header")
-  }, /*#__PURE__*/React.createElement("span", null, "\u6307\u6807\u8BE6\u60C5"), /*#__PURE__*/React.createElement("div", null, authority[100051] && /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement("span", null, "\u6307\u6807\u8BE6\u60C5"), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
     onClick: seeSql
-  }, "\u67E5\u770BSQL"), authority[100050] && /*#__PURE__*/React.createElement("div", {
+  }, "\u67E5\u770BSQL"), /*#__PURE__*/React.createElement("div", {
     onClick: download
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "xiazai1"

package/es/components/topBar/index.js

@@ -19,6 +19,7 @@ var TopBar = function TopBar(props) {
   var _useContext = useContext(EventContext),
     panelId = _useContext.panelId,
     afterEditTarget = _useContext.afterEditTarget,
+    enableAddScene = _useContext.enableAddScene,
     loading = _useContext.loading,
     onLossWarning = _useContext.onLossWarning,
     showWarning = _useContext.showWarning,
@@ -33,8 +34,7 @@ var TopBar = function TopBar(props) {
     setShowScene = _useState4[1];
   var _useContext2 = useContext(BizGlobalDataContext),
     currentApp = _useContext2.currentApp,
-    eventGroupList = _useContext2.eventGroupList,
-    authority = _useContext2.authority;
+    eventGroupList = _useContext2.eventGroupList;
   var searchData = props.searchData,
     showList = props.showList,
     platformChange = props.platformChange,
@@ -89,7 +89,6 @@ var TopBar = function TopBar(props) {
   }, !panelId && /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-panel")
   }, /*#__PURE__*/React.createElement(Button, {
-    disabled: !authority[100049],
     onClick: function onClick() {
       setShowPanel(true);
     }
@@ -108,10 +107,9 @@ var TopBar = function TopBar(props) {
     onOk: function onOk(data) {
       return _onOk('panel', data);
     }
-  })), !panelId && /*#__PURE__*/React.createElement("div", {
+  })), enableAddScene && /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-scene")
   }, /*#__PURE__*/React.createElement(Button, {
-    disabled: !authority[100048],
     onClick: function onClick() {
       setShowScene(true);
     }
@@ -134,11 +132,11 @@ var TopBar = function TopBar(props) {
   }, "\u6DFB\u52A0\u5230\u6570\u636E\u62A5\u544A")), showWarning && /*#__PURE__*/React.createElement(Button, {
     className: "".concat(classPrefix, "-earlywarning"),
     type: "primary",
-    disabled: loading || !authority[100141],
+    disabled: loading,
     onClick: function onClick() {
       return onLossWarning(warningId);
     }
-  }, "\u8BBE\u7F6E\u6D41\u5931\u9884\u8B66"), /*#__PURE__*/React.createElement("div", {
+  }, "\u8BBE\u7F6E\u9884\u8B66\u6D41\u5931"), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-platform")
   }, platformOption.map(function (item) {
     return /*#__PURE__*/React.createElement("div", {

package/es/modules/content/index.js

@@ -25,8 +25,7 @@ var cancel;
 var classPrefix = 'event-content';
 var EventContent = function EventContent(props) {
   var _useContext = useContext(BizGlobalDataContext),
-    currentApp = _useContext.currentApp,
-    authority = _useContext.authority;
+    currentApp = _useContext.currentApp;
   var _useContext2 = useContext(EventContext),
     searchData = _useContext2.searchData,
     setSearchData = _useContext2.setSearchData,
@@ -78,10 +77,6 @@ var EventContent = function EventContent(props) {
     handleSearch && handleSearch(loading);
   }, [loading]);
   var fetchRequest = function fetchRequest(flag) {
-    if (!authority[100047]) {
-      message.error('无查询权限');
-      return;
-    }
     if (JSON.stringify(searchData) === JSON.stringify(finalSearchData)) {
       return;
     }

package/es/modules/content/utils.js

@@ -13,7 +13,7 @@ export var judgeFilterValue = function judgeFilterValue(data, count) {
     }
     data.conditions.map(function (item) {
       var _item$values;
-      if (item.values && (((_item$values = item.values) === null || _item$values === void 0 ? void 0 : _item$values.length) <= 0 || item.values[0] === '')) flag = false;
+      if (item.values && (((_item$values = item.values) === null || _item$values === void 0 ? void 0 : _item$values.length) <= 0 || item.values[0] === '') && !((item === null || item === void 0 ? void 0 : item.operator) && /^is null$|^is not null$/.test(item === null || item === void 0 ? void 0 : item.operator))) flag = false;
     });
   }
   return flag;

package/es/modules/home/demo/create.js

@@ -39,7 +39,7 @@ export default (function () {
     console.log('查询参数改变了：', data);
   };
   var onLossWarning = function onLossWarning(warningId) {
-    console.log('设置流失预警', warningId);
+    console.log('设置预警流失', warningId);
   };
   return /*#__PURE__*/React.createElement(DemoWrapper, {
     needMeta: true,

package/es/modules/home/demo/scene.js

@@ -43,7 +43,8 @@ var defaultValue = {
     }
   },
   chosen_data: [],
-  source: 'EVENT'
+  source: 'EVENT',
+  enableAddScene: false
 };
 export default (function () {
   var _useState = useState(false),

package/es/modules/home/index.js

@@ -149,6 +149,7 @@ var ModuleEvent = function ModuleEvent(props) {
       panelName: title,
       includeToday: props.includeToday,
       showWarning: props.showWarning,
+      enableAddScene: props.defaultValue && props.defaultValue.enableAddScene === false ? false : true,
       afterEditTarget: props.afterEditTarget,
       onUserDrill: props.onUserDrill,
       onLossWarning: props.onLossWarning,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-event",
-  "version": "0.1.7-heyh.3",
+  "version": "0.1.8-alpha.0",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -49,7 +49,7 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "19a381129050e920c2f4996d1365e803617bdc35",
+  "gitHead": "407c01609bf6d86be468b4ff1612dafd644cd983",
   "dependencies": {
     "react-copy-to-clipboard": "^5.1.0",
     "react-highlight": "^0.15.0"