@zgfe/modules-settings 1.2.20-role.13 → 1.2.20-role.14

package/es/components/selectAppWrapper/index.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
+import { AppInfoProps } from '@zgfe/business-lib/es/context';
 declare const SetDataRangeDialog: React.FC<{
-    currentAppId: number;
+    currentSelectAppInfo: AppInfoProps;
     onChangeCondition: (data: any[]) => void;
     currentJson: any[];
 }>;

package/es/components/selectAppWrapper/index.js

@@ -1,3 +1,9 @@
+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 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; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -9,7 +15,7 @@ import { Spin } from 'antd';
 import { BizUserCondition, BizGlobalDataContext, ajax } from '@zgfe/business-lib';
 import convertAttributeData from './util';
 var SetDataRangeDialog = function SetDataRangeDialog(props) {
-  var currentAppId = props.currentAppId,
+  var currentSelectAppInfo = props.currentSelectAppInfo,
     onChangeCondition = props.onChangeCondition,
     currentJson = props.currentJson;
   var _useContext = useContext(BizGlobalDataContext),
@@ -49,11 +55,11 @@ var SetDataRangeDialog = function SetDataRangeDialog(props) {
   useEffect(function () {
     // 请求下拉数据
     initData();
-  }, [currentAppId]);
+  }, [currentSelectAppInfo]);
   var initData = function initData() {
-    loadUserProps(currentAppId);
-    loadEvents(currentAppId);
-    loadEnvList(currentAppId);
+    loadUserProps(currentSelectAppInfo.app_id);
+    loadEvents(currentSelectAppInfo.app_id);
+    loadEnvList(currentSelectAppInfo.app_id);
   };
   function loadUserProps(appId) {
     setLoadUsers(true);
@@ -115,10 +121,10 @@ var SetDataRangeDialog = function SetDataRangeDialog(props) {
       eventGroupList: newStore.eventGroupList,
       userPropList: newStore.userPropList,
       eventEnvList: newStore.eventEnvList,
-      currentApp: {
-        appId: currentAppId,
+      currentApp: _objectSpread({
+        appId: currentSelectAppInfo.app_id,
         platform: 0
-      },
+      }, currentSelectAppInfo),
       authority: authority
     }
   }, /*#__PURE__*/React.createElement(BizUserCondition, {
@@ -126,14 +132,13 @@ var SetDataRangeDialog = function SetDataRangeDialog(props) {
     openBusinessDataCondition: true,
     openOrderDataCondition: true,
     openTagCondition: true,
-    userTagsData: [],
     defaultValue: currentJson,
     onChange: onChangeCondition,
     orConditionNum: 3,
     andConditionNum: 8,
     eventAttrNum: 3,
     isRealTime: true,
-    key: currentAppId
+    key: currentSelectAppInfo.app_id
   })) : /*#__PURE__*/React.createElement(Spin, {
     tip: "\u57FA\u7840\u6570\u636E\u52A0\u8F7D\u4E2D"
   }));

package/es/modules/companySetting/role/index.js

@@ -127,10 +127,10 @@ var RoleList = function RoleList(props) {
     _useState44 = _slicedToArray(_useState43, 2),
     dataRangeDialogTitle = _useState44[0],
     setDataRangeDialogTitle = _useState44[1];
-  var _useState45 = useState(0),
+  var _useState45 = useState({}),
     _useState46 = _slicedToArray(_useState45, 2),
-    currentAppId = _useState46[0],
-    setCurrentAppId = _useState46[1];
+    currentSelectAppInfo = _useState46[0],
+    setCurrentSelectAppInfo = _useState46[1];
   var _useState47 = useState([]),
     _useState48 = _slicedToArray(_useState47, 2),
     appCondition = _useState48[0],
@@ -775,7 +775,7 @@ var RoleList = function RoleList(props) {
       className: "custom-item"
     }, node, !appList.includes(option.app_id) ? null : /*#__PURE__*/React.createElement("div", {
       onClick: function onClick(e) {
-        setCurrentAppId(option.app_id);
+        setCurrentSelectAppInfo(option);
         setDataRangeDialogTitle(node);
         setIsModalOpen(true);
         var currentJson = appCondition.filter(function (item) {
@@ -1071,7 +1071,7 @@ var RoleList = function RoleList(props) {
     isModalOpen: isModalOpen,
     setIsModalOpen: setIsModalOpen,
     dataRangeDialogTitle: dataRangeDialogTitle,
-    currentAppId: currentAppId,
+    currentSelectAppInfo: currentSelectAppInfo,
     setConditionFn: setConditionFn,
     isRoleAuthStatus: isRoleAuthStatus,
     setIsRoleAuthStatus: setIsRoleAuthStatus,

package/es/modules/companySetting/role/setDataRangeDialog/index.d.ts

@@ -1,10 +1,11 @@
 import React, { ReactNode } from 'react';
 import './index.less';
+import { AppInfoProps } from '@zgfe/business-lib/es/context';
 declare const SetDataRangeDialog: React.FC<{
     isModalOpen: boolean;
     setIsModalOpen: Function;
     dataRangeDialogTitle: ReactNode;
-    currentAppId: number;
+    currentSelectAppInfo: AppInfoProps;
     setConditionFn: Function;
     currentJson: any[];
     setCurrentJson: Function;

package/es/modules/companySetting/role/setDataRangeDialog/index.js

@@ -8,7 +8,7 @@ var SetDataRangeDialog = function SetDataRangeDialog(props) {
   var isModalOpen = props.isModalOpen,
     setIsModalOpen = props.setIsModalOpen,
     dataRangeDialogTitle = props.dataRangeDialogTitle,
-    currentAppId = props.currentAppId,
+    currentSelectAppInfo = props.currentSelectAppInfo,
     setConditionFn = props.setConditionFn,
     currentJson = props.currentJson,
     setCurrentJson = props.setCurrentJson,
@@ -21,7 +21,7 @@ var SetDataRangeDialog = function SetDataRangeDialog(props) {
     if (!currentJson) return;
     var res = util.validateUserCondition(currentJson);
     if (res) return message.error(res);
-    setConditionFn(currentAppId, currentJson);
+    setConditionFn(currentSelectAppInfo.app_id, currentJson);
     setIsModalOpen(false);
   }
   return /*#__PURE__*/React.createElement(BizDialog, {
@@ -55,7 +55,7 @@ var SetDataRangeDialog = function SetDataRangeDialog(props) {
   }, "\u5B9A\u4E49"), /*#__PURE__*/React.createElement("div", {
     className: "config-value"
   }), /*#__PURE__*/React.createElement(SelectAppWrapper, {
-    currentAppId: currentAppId,
+    currentSelectAppInfo: currentSelectAppInfo,
     onChangeCondition: onChangeCondition,
     currentJson: currentJson
   })) : null);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-settings",
-  "version": "1.2.20-role.13",
+  "version": "1.2.20-role.14",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "files": [
@@ -51,7 +51,7 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "3349b7d3976ef53eb5d022b50b084f6e4589a764",
+  "gitHead": "904367c808e0f31a5dac6ad348d197fa9f1312c8",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }