@zgfe/modules-interval 1.0.23-zhongyuan.11 → 1.0.23-zhongyuan.12

package/dist/esm/components/eventFilter/index.js

@@ -1,4 +1,7 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -13,13 +16,15 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { Tooltip, message } from 'antd';
 import React, { useContext, useEffect, useRef, useState } from 'react';
 import { BizEventSelector, IconFont, BizAttrConditionGroup, BizGlobalDataContext } from '@zgfe/business-lib';
+import { eventApi } from '@zgfe/business-lib/es/utils';
 import "./styles/index.less";
 import _ from 'lodash';
 var classPrefix = 'interval-box';
 var EventFilter = function EventFilter(props) {
   var _useContext = useContext(BizGlobalDataContext),
     eventIdMap = _useContext.eventIdMap,
-    envs = _useContext.envs;
+    envs = _useContext.envs,
+    currentApp = _useContext.currentApp;
   // 筛选条件个数
   var _useState = useState(0),
     _useState2 = _slicedToArray(_useState, 2),
@@ -142,6 +147,37 @@ var EventFilter = function EventFilter(props) {
     }
     props.onChange && props.onChange(_event);
   }, [bizAttributeSelectorValue, filter, event, relevancy]);
+  var _useState15 = useState([]),
+    _useState16 = _slicedToArray(_useState15, 2),
+    eventAttrs = _useState16[0],
+    setEventAttrs = _useState16[1];
+  useEffect(function () {
+    if (event) {
+      _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+        var eventAttrs;
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return eventApi.fetchEventAttrs(event === null || event === void 0 ? void 0 : event.id, currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId);
+            case 2:
+              _context.t0 = _context.sent;
+              if (_context.t0) {
+                _context.next = 5;
+                break;
+              }
+              _context.t0 = [];
+            case 5:
+              eventAttrs = _context.t0;
+              setEventAttrs(eventAttrs);
+            case 7:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }))();
+    }
+  }, [event.id]);
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(BizEventSelector, {
@@ -155,11 +191,12 @@ var EventFilter = function EventFilter(props) {
     },
     onChange: onChangeEvent,
     filter: function filter(event) {
+      console.log(event, 'event');
       if (!props.subject) return true;
       var propMatch = false;
-      for (var i = 0; i < event.attrList.length; i++) {
+      for (var i = 0; i < eventAttrs.length; i++) {
         var _props$subject;
-        var attr = event.attrList[i];
+        var attr = eventAttrs[i];
         if (attr.label === ((_props$subject = props.subject) === null || _props$subject === void 0 ? void 0 : _props$subject.subjectName)) {
           propMatch = true;
           break;

package/dist/esm/components/renderContent/index.js

@@ -12,19 +12,21 @@ import "./styles/index.less";
 import IntervalEventChart from "../../modules/chart";
 var classPrefix = 'render-content-interval';
 var ContentPanel = function ContentPanel(props) {
+  var _props$searchData;
   var loading = props.loading,
     eventData = props.eventData,
     searchData = props.searchData;
   var _useContext = useContext(IntervalContext),
     refreshLoading = _useContext.refreshLoading;
   // 显示内容
-  var _useState = useState(props.showList || []),
+  var _useState = useState(((_props$searchData = props.searchData) === null || _props$searchData === void 0 ? void 0 : _props$searchData.displaySetup) || []),
     _useState2 = _slicedToArray(_useState, 2),
     showList = _useState2[0],
     setShowList = _useState2[1];
   useEffect(function () {
-    setShowList(props.showList);
-  }, [eventData]);
+    var _props$searchData2;
+    setShowList(((_props$searchData2 = props.searchData) === null || _props$searchData2 === void 0 ? void 0 : _props$searchData2.displaySetup) || []);
+  }, [props === null || props === void 0 ? void 0 : props.searchData]);
 
   // 表格筛选，取前10个
   var onChangeShow = function onChangeShow(names) {

package/dist/esm/components/searchPanel/index.js

@@ -47,7 +47,7 @@ var SearchPanel = function SearchPanel(props) {
   var _useState9 = useState([]),
     _useState10 = _slicedToArray(_useState9, 2),
     displaySetupSliceList = _useState10[0],
-    setDisplaySetupSliceList = _useState10[1];
+    setDisplaySetupSliceList = _useState10[1]; // 选中的显示设置
   // 查询维度
   var _useState11 = useState({
       analysisIndex: 'number'
@@ -58,8 +58,10 @@ var SearchPanel = function SearchPanel(props) {
   // 初始化表格表头和内容
   useEffect(function () {
     if (props !== null && props !== void 0 && props.eventData) {
+      var _props$searchData;
       var arr = extractNames(props === null || props === void 0 ? void 0 : props.eventData);
       setDisplaySetupLIst(arr);
+      setDisplaySetupSliceList(props === null || props === void 0 ? void 0 : (_props$searchData = props.searchData) === null || _props$searchData === void 0 ? void 0 : _props$searchData.displaySetup);
     }
   }, [props === null || props === void 0 ? void 0 : props.eventData]);
   // 初始化
@@ -123,7 +125,7 @@ var SearchPanel = function SearchPanel(props) {
     placeholder: "\u8BF7\u9009\u62E9\u663E\u793A\u8BBE\u7F6E",
     enableSearch: true,
     options: displaySetupList,
-    value: displaySetupSliceList.length > 0 ? displaySetupSliceList : displaySetupList.slice(0, 4),
+    value: displaySetupSliceList,
     labelField: "label",
     keyField: "value"
   })), /*#__PURE__*/React.createElement(Button, {

package/dist/esm/components/searchPanel/types.d.ts

@@ -1,5 +1,5 @@
 import { DatePickerTypes } from '@zgfe/business-lib/es/datePicker/types';
-import { EventChartTypes, ResponseDataProps } from '../../types';
+import { EventChartTypes, ResponseDataProps, SearchValue } from '../../types';
 import { ReactNode } from 'react';
 /**
  * 右边的查询组件
@@ -43,6 +43,7 @@ export interface SearchPanelProps {
      * 内容改变回调
      */
     onChange?: (data: SearchPanelProps) => void;
+    searchData?: SearchValue;
 }
 export interface DisplaySetup {
     value: number;

package/dist/esm/modules/content/index.js

@@ -22,6 +22,7 @@ import { ContentPanel, SearchPanel } from "../../components";
 import TopPanel from "../topPanel";
 import { message } from 'antd';
 import { ERROR_RESPONESE_CODE } from "../../constants/code";
+import { extractNames } from "../../utils/formData";
 var CancelToken = Request.CancelToken;
 var cancel;
 var refresh = false;
@@ -161,8 +162,17 @@ var EventContent = function EventContent(props) {
       }
       var result = res.data;
       setEventData(result);
-      setFinalSearchData(_objectSpread({}, searchData));
+      var arr = extractNames(result);
+      setFinalSearchData(_objectSpread(_objectSpread({}, searchData), {}, {
+        displaySetup: arr === null || arr === void 0 ? void 0 : arr.splice(0, 4)
+      }));
+      setSearchData(_objectSpread(_objectSpread({}, searchData), {}, {
+        displaySetup: arr === null || arr === void 0 ? void 0 : arr.splice(0, 4)
+      }));
       loadingHandle();
+      if (props !== null && props !== void 0 && props.setShowList) {
+        props.setShowList(arr === null || arr === void 0 ? void 0 : arr.splice(0, 4));
+      }
     }).catch(function () {
       loadingHandle();
     });
@@ -201,6 +211,9 @@ var EventContent = function EventContent(props) {
   // 改变显示内容
   var onChangeShow = function onChangeShow(data) {
     setShowList(data);
+    if (props !== null && props !== void 0 && props.setShowList) {
+      props.setShowList(data);
+    }
   };
 
   // 平台变更
@@ -253,6 +266,7 @@ var EventContent = function EventContent(props) {
     analysisAttr: searchData === null || searchData === void 0 ? void 0 : searchData.analysisAttr,
     displaySetup: searchData === null || searchData === void 0 ? void 0 : searchData.analysisAttr,
     analysisIndex: searchData === null || searchData === void 0 ? void 0 : searchData.analysisIndex,
+    searchData: searchData,
     eventId: eventId,
     eventData: eventData,
     enableSelectChart: enableSelectChart,

package/dist/esm/modules/content/types.d.ts

@@ -14,6 +14,7 @@ export declare namespace EventContentProps {
          * 展示列表
          */
         show?: string[];
+        setShowList?: any;
         /**
          * 是否查询中
          */

package/dist/esm/modules/home/index.js

@@ -152,7 +152,8 @@ var ModuleInterval = function ModuleInterval(props) {
       onUserDrill: props.onUserDrill,
       onJumpWarning: props.onJumpWarning,
       exception: exception,
-      setException: setException
+      setException: setException,
+      setShowList: setShowList
     }
   }, /*#__PURE__*/React.createElement(EventContent, {
     defaultValue: props.defaultValue ? props.defaultValue.data : undefined,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-interval",
-  "version": "1.0.23-zhongyuan.11",
+  "version": "1.0.23-zhongyuan.12",
   "private": false,
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
@@ -42,7 +42,7 @@
     "@types/uuid": "^9.0.2",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
-    "@zgfe/business-lib": "1.2.70-hxd.1",
+    "@zgfe/business-lib": "1.2.71-hxd.31",
     "antd": "^4.22.6",
     "dumi": "^1.1.0",
     "echarts": "^5.3.2",
@@ -59,7 +59,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ac7fe4ed94413198bb0e2bb7ea068d1dd51f690d",
+  "gitHead": "2648a0abdaaf1cb3f96b8d8220389b8636dec2f0",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }