@zgfe/modules-settings 1.2.20-role.2 → 1.2.20-role.20

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

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

package/es/components/selectAppWrapper/index.js

@@ -0,0 +1,162 @@
+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); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import React, { useEffect, useState, useContext } from 'react';
+import { Spin } from 'antd';
+import { BizUserCondition, BizGlobalDataContext, ajax } from '@zgfe/business-lib';
+import convertAttributeData from './util';
+var SetDataRangeDialog = function SetDataRangeDialog(props) {
+  var currentSelectAppInfo = props.currentSelectAppInfo,
+    onChangeCondition = props.onChangeCondition,
+    currentJson = props.currentJson;
+  var _useContext = useContext(BizGlobalDataContext),
+    authority = _useContext.authority;
+  var _useState = useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    eventGroups = _useState2[0],
+    setEventGroups = _useState2[1];
+  var _useState3 = useState([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    userProps = _useState4[0],
+    setUserProps = _useState4[1];
+  var _useState5 = useState([]),
+    _useState6 = _slicedToArray(_useState5, 2),
+    envList = _useState6[0],
+    setEnvList = _useState6[1];
+  var _useState7 = useState(true),
+    _useState8 = _slicedToArray(_useState7, 2),
+    loadEvent = _useState8[0],
+    setLoadEvent = _useState8[1];
+  var _useState9 = useState(true),
+    _useState10 = _slicedToArray(_useState9, 2),
+    loadEnv = _useState10[0],
+    setLoadEnv = _useState10[1];
+  var _useState11 = useState(true),
+    _useState12 = _slicedToArray(_useState11, 2),
+    loadUsers = _useState12[0],
+    setLoadUsers = _useState12[1];
+  // const [tagsGroup, setTagsGroup] = useState<any>([]);
+  var _useState13 = useState({
+      eventGroupList: [],
+      userPropList: [],
+      eventEnvList: []
+    }),
+    _useState14 = _slicedToArray(_useState13, 2),
+    newStore = _useState14[0],
+    setStore = _useState14[1];
+  useEffect(function () {
+    // 请求下拉数据
+    initData();
+  }, [currentSelectAppInfo]);
+  var initData = function initData() {
+    loadUserProps(currentSelectAppInfo.app_id);
+    loadEvents(currentSelectAppInfo.app_id);
+    loadEnvList(currentSelectAppInfo.app_id);
+    // queryGroupTags(currentSelectAppInfo); //用户标签选项暂时隐藏
+  };
+
+  function loadUserProps(appId) {
+    setLoadUsers(true);
+    ajax('/zg/web/v2/appusergroup/getUserPropMeta', {
+      method: 'post',
+      data: {
+        appId: appId,
+        platform: 0
+      }
+    }).then(function (res) {
+      setUserProps(res.data);
+      setLoadUsers(false);
+    });
+  }
+  function loadEvents(appId) {
+    setLoadEvent(true);
+    ajax('/zg/web/v2/data/queryEventMetasOfGroup', {
+      method: 'post',
+      data: {
+        appId: appId,
+        platform: 0,
+        isAll: true
+      }
+    }).then(function (res) {
+      res.data.forEach(function (item1) {
+        item1.eventList.forEach(function (item2) {
+          item2.name = item2.event_name;
+          item2.alias = item2.event_name;
+        });
+      });
+      setEventGroups(res.data);
+      setLoadEvent(false);
+    });
+  }
+  function loadEnvList(appId) {
+    setLoadEnv(true);
+    ajax('/zg/web/v2/appusergroup/getEventEnvData', {
+      method: 'post',
+      data: {
+        appId: appId,
+        platform: 0
+      }
+    }).then(function (res) {
+      setEnvList(res.data.eventEnv);
+      setLoadEnv(false);
+    });
+  }
+  // function queryGroupTags(appInfo: AppInfoProps) {
+  //   ajax('/zg/web/v2/v4/userGroup/label/list', {
+  //     method: 'post',
+  //     data: {
+  //       appId: appInfo?.app_id,
+  //       platform: appInfo?.platform || 0,
+  //     },
+  //   }).then((res: any) => {
+  //     if (!res) return;
+  //     setTagsGroup(res.data);
+  //   });
+  // }
+  useEffect(function () {
+    if (loadEnv || loadEvent || loadUsers) return;
+    var newStore = convertAttributeData({
+      eventList: eventGroups,
+      userPropList: userProps,
+      envPropList: envList
+    });
+    setStore(newStore);
+  }, [loadEvent, loadEnv, loadUsers]);
+  return /*#__PURE__*/React.createElement("div", null, !loadEnv && !loadEvent && !loadUsers ? /*#__PURE__*/React.createElement(BizGlobalDataContext.Provider, {
+    value: {
+      eventGroupList: newStore.eventGroupList,
+      userPropList: newStore.userPropList,
+      eventEnvList: newStore.eventEnvList,
+      currentApp: _objectSpread({
+        appId: currentSelectAppInfo.app_id,
+        platform: 0
+      }, currentSelectAppInfo),
+      authority: authority
+    }
+  }, /*#__PURE__*/React.createElement(BizUserCondition, {
+    openCdpCondition: true,
+    openBusinessDataCondition: true,
+    openOrderDataCondition: true,
+    openTagCondition: false,
+    // userTagsData={tagsGroup}
+    defaultValue: currentJson,
+    onChange: onChangeCondition,
+    orConditionNum: 3,
+    andConditionNum: 8,
+    eventAttrNum: 3,
+    isRealTime: true,
+    key: currentSelectAppInfo.app_id
+  })) : /*#__PURE__*/React.createElement(Spin, {
+    tip: "\u57FA\u7840\u6570\u636E\u52A0\u8F7D\u4E2D"
+  }));
+};
+export default SetDataRangeDialog;

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

@@ -0,0 +1,344 @@
+import { SizeType } from 'antd/es/config-provider/SizeContext';
+import { ReactNode } from 'react';
+/**
+ * 属性类型
+ */
+export declare enum PropType {
+    STRING = 1,
+    NUMBER = 2,
+    DATE = 3
+}
+/**
+ * 属性类别
+ */
+export declare enum PropCategory {
+    EventProp = "eventProp",
+    UserProp = "userProp",
+    EnvProp = "envProp",
+    SessionProp = "sessionProp"
+}
+export declare enum ShowStatus {
+    show = 0,
+    hidden = 1
+}
+/**
+ * 事件数据类型
+ */
+export interface AnalysisEvent {
+    /**
+     * 事件id
+     */
+    id: number;
+    /**
+     * 事件id
+     */
+    event_id?: number;
+    /**
+     * 事件名称
+     */
+    name: string;
+    /**
+     * 事件名称
+     */
+    event_name?: string;
+    /**
+     * 事件别名
+     */
+    alias?: string;
+    /**
+     * 事件属性列表
+     */
+    attrList: Array<EventProp>;
+    /**
+     * 是否被删除
+     */
+    isDelete?: boolean;
+    /**
+     * 是否被停止采集
+     */
+    isStop?: boolean;
+    /**
+     * 是否是事件概览（true时代表，这不是一个真实事件数据）
+     */
+    isOverview?: boolean;
+    /**
+     * 事件显示状态
+     */
+    eventHidden?: ShowStatus;
+    /**
+     * 是否被收藏标记
+     */
+    marked?: boolean;
+    /**
+     * 是否是内置指标
+     */
+    isBuiltIn?: boolean;
+    /**
+     * 指标类型， 默认是event
+     */
+    type?: string;
+    /**
+     * 是否埋点分析（页面判断使用）
+     */
+    clickAnalysis?: boolean;
+    /**
+     * 所有权
+     */
+    owner?: string;
+}
+/**
+ * 事件分组
+ */
+export interface EventGroup {
+    /**
+     * 分组id
+     */
+    id: number;
+    /**
+     * 分组名称
+     */
+    name?: string;
+    /**
+     * 事件列表
+     */
+    eventList: AnalysisEvent[];
+}
+/**
+ * 通用属性信息
+ */
+export interface BasicProp {
+    /**
+     * 属性id
+     */
+    id?: number;
+    /**
+     * 属性展示名称
+     */
+    label?: string;
+    /**
+     * 属性别名
+     */
+    alias?: string;
+    /**
+     * 属性类型
+     */
+    type?: PropType;
+    /**
+     * 是否实时
+     */
+    realTime?: boolean;
+    /**
+     * 类别
+     */
+    dimensionSub?: string;
+    /**
+     * 是否展示
+     */
+    isHidden?: boolean;
+    /**
+     * 属性类别：fixed（内置属性）,custom(自定义属性)
+     */
+    category?: 'fixed' | 'custom';
+}
+/**
+ * 用户属性
+ */
+export interface UserProp extends BasicProp {
+    /**
+     * 属性标识名称（可用于做属性唯一标识）
+     */
+    name?: string;
+    /**
+     * 属性类别
+     */
+    propCategory: 'userProp';
+    /**
+     * 用户属性唯一标识，取值为：userProp-name
+     */
+    key?: string;
+    subtype?: number;
+}
+/**
+ * 触发环境属性
+ */
+export interface EnvProp extends BasicProp {
+    /**
+     * 属性类别
+     */
+    propCategory: 'envProp';
+    /**
+     * 属性标识名称（可用于做属性唯一标识）
+     */
+    name?: string;
+    /**
+     * 环境属性唯一标识,取值为：envProp-name
+     */
+    key?: string;
+}
+/**
+ * 事件属性
+ */
+export interface EventProp extends BasicProp {
+    /**
+     * 所属事件id
+     */
+    eventId?: number;
+    /**
+     * 属性类别
+     */
+    propCategory: 'eventProp';
+    /**
+     * 事件属性唯一标识，取值为：eventProp-id
+     */
+    key?: number | string;
+    /**
+     * 所属步骤下标（漏斗场景下有）
+     */
+    step?: number;
+}
+/**
+ * 属性组，包含事件属性、用户属性、事件触发环境列表
+ */
+export interface PropGroups {
+    eventGroupList?: EventGroup[];
+    userPropList?: UserProp[];
+    envPropList?: EnvProp[];
+    eventNameMap?: Record<string, AnalysisEvent>;
+    eventIdMap?: Record<number, AnalysisEvent>;
+}
+export declare namespace AttributeSelect {
+    /**
+     * 属性下拉值
+     */
+    type Value = EventProp | UserProp | EnvProp | ExtraProp | null;
+    /**
+     * 属性下拉props
+     */
+    interface Props {
+        /**
+         * @description       组件唯一id，不用主动传，组件自动生成，请忽略！！！
+         */
+        id?: string;
+        /**
+         * @description       若组件是表单选项，value就是form的initialValues，也是组件的默认选项
+         * @default           -
+         */
+        value?: Value;
+        /**
+         * @description     默认值
+         */
+        defaultValue?: Value;
+        /**
+         * @description     禁用选项列表
+         */
+        disableItemList?: (EventProp | UserProp | EnvProp | ExtraProp)[];
+        /**
+         * @description     删除按钮是否可用
+         * @default   false
+         */
+        enableDelete?: boolean;
+        /**
+         * @description     默认提示文本
+         * @default         请选择
+         */
+        placeholder?: string;
+        /**
+         * @description     是否启用事件属性，启用后，eventIdList为必传
+         * @default         false
+         */
+        enableEventProp?: boolean;
+        /**
+         * @description     是否启用用户属性
+         * @default         true
+         */
+        enableUserProp?: boolean;
+        /**
+         * @description     是否启用事件触发环境属性
+         */
+        enableEnvProp?: boolean;
+        /**
+         * @description     支持的事件列表，当enableEventProp为true时有效
+         */
+        eventIdList?: number[];
+        /**
+         * @description     支持的漏斗事件列表，当enableEventProp为true时有效，eventIdList和funnelEventIdList只能传一个，通过该属性传递的事件属性，选中时会回传所属步骤
+         */
+        funnelEventIdList?: number[][];
+        /**
+         * @description     是否显示通用属性（展示通用属性后，单独事件分组将隐藏）
+         */
+        showCommonProp?: boolean;
+        /**
+         * @description   非实时后缀图标名称（iconfont）
+         * @default       *
+         */
+        propSymbol?: ReactNode;
+        /**
+         * @description   属性下拉提示
+         * @default       带＊的属性每日凌晨更新
+         */
+        optionsHeaderTip?: string;
+        /**
+         * @description       onChange
+         */
+        onChange?: (value: Value) => void;
+        /**
+         * @description       删除事件监听
+         */
+        onDelete?: (value?: Value, e?: any) => void;
+        /**
+         * 主题
+         */
+        theme?: string;
+        /**
+         * @description       关闭后是否销毁下拉
+         * @default           false
+         */
+        destroyPopupOnHide?: boolean;
+        /**
+         * @description       文本框大小 ，40px | 32px | 24px
+         * @default           middle
+         */
+        size?: SizeType;
+        /**
+         * 状态
+         */
+        status?: string;
+        /**
+         * 自定义属性类型
+         */
+        extra?: AttributeExtra[];
+        /**
+         * 数字类型
+         */
+        isNumber?: Boolean;
+    }
+    interface AttributeExtra {
+        type: string;
+        name: string;
+        attrList: ExtraProp[];
+    }
+    interface ExtraProp extends BasicProp {
+        /**
+         * 属性类别
+         */
+        propCategory: string;
+        /**
+         * 事件属性唯一标识，取值为：propCategory-id||name
+         */
+        key?: number | string;
+        name?: string;
+        subtype?: number;
+        [key: string]: any;
+    }
+    /**
+     * 下拉选项
+     */
+    interface Option {
+        groupName: string;
+        isEvent: boolean;
+        key: string;
+        anchor: string;
+        children: Value[];
+    }
+}

package/es/components/selectAppWrapper/types.js

@@ -0,0 +1,24 @@
+/**
+ * 属性类型
+ */
+export var PropType;
+(function (PropType) {
+  PropType[PropType["STRING"] = 1] = "STRING";
+  PropType[PropType["NUMBER"] = 2] = "NUMBER";
+  PropType[PropType["DATE"] = 3] = "DATE";
+})(PropType || (PropType = {}));
+/**
+ * 属性类别
+ */
+export var PropCategory;
+(function (PropCategory) {
+  PropCategory["EventProp"] = "eventProp";
+  PropCategory["UserProp"] = "userProp";
+  PropCategory["EnvProp"] = "envProp";
+  PropCategory["SessionProp"] = "sessionProp";
+})(PropCategory || (PropCategory = {}));
+export var ShowStatus;
+(function (ShowStatus) {
+  ShowStatus[ShowStatus["show"] = 0] = "show";
+  ShowStatus[ShowStatus["hidden"] = 1] = "hidden";
+})(ShowStatus || (ShowStatus = {}));

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

@@ -0,0 +1,13 @@
+import { OldSystem } from '@zgfe/business-lib/es/utils/type';
+import { PropGroups } from './types';
+/**
+ * 老系统（vue）基础数据转化程序
+ * @param store
+ * @returns PropGropus
+ */
+export default function convertAttributeData(store: {
+    envPropList?: OldSystem.EnvProp[];
+    userPropList?: OldSystem.UserProp[];
+    eventList?: OldSystem.EventGroup[];
+}): PropGroups;
+export declare function getIcon(name: string): string;

package/es/components/selectAppWrapper/util.js

@@ -0,0 +1,158 @@
+/**
+ * 老系统（vue）基础数据转化程序
+ * @param store
+ * @returns PropGropus
+ */
+export default function convertAttributeData(store) {
+  var _store$eventList, _store$envPropList, _store$userPropList;
+  var res = {
+    envPropList: [],
+    eventGroupList: [],
+    userPropList: [],
+    eventNameMap: {},
+    eventIdMap: {}
+  };
+  (_store$eventList = store.eventList) === null || _store$eventList === void 0 ? void 0 : _store$eventList.forEach(function (group_) {
+    var _res$eventGroupList;
+    var group = {
+      id: group_.groupId,
+      name: group_.groupName,
+      eventList: []
+    };
+    var list = [];
+    var markList = [];
+    group_.eventList.forEach(function (e) {
+      if (e.is_delete) return;
+      var event = {
+        alias: e.alias_name,
+        attrList: e.event_attrs.map(function (item) {
+          return {
+            alias: item.alias_name,
+            eventId: e.event_id,
+            id: item.attr_id,
+            isHidden: item.hidden,
+            key: "eventProp-".concat(item.attr_id),
+            label: item.attr_name,
+            propCategory: 'eventProp',
+            type: item.prop_type,
+            realTime: true,
+            dimensionSub: item.dimension_sub || 'event_attr'
+          };
+        }),
+        id: e.event_id,
+        isDelete: e.is_delete,
+        isStop: e.is_stop,
+        name: e.event_name,
+        eventHidden: e.event_hidden,
+        marked: Boolean(e.mark_type),
+        clickAnalysis: e.click_analysis,
+        owner: e.owner
+      };
+      res.eventNameMap[event.name] = event;
+      res.eventIdMap[event.id] = event;
+      if (event.marked) {
+        markList.push(event);
+      } else {
+        list.push(event);
+      }
+    });
+    group.eventList = [].concat(markList, list);
+    (_res$eventGroupList = res.eventGroupList) === null || _res$eventGroupList === void 0 ? void 0 : _res$eventGroupList.push(group);
+  });
+  res.envPropList = (_store$envPropList = store.envPropList) === null || _store$envPropList === void 0 ? void 0 : _store$envPropList.map(function (prop) {
+    return {
+      id: prop.id || 0,
+      isHidden: prop.hidden,
+      alias: prop.alias_name,
+      category: prop.category,
+      key: "envProp-".concat(prop.name),
+      label: prop.text,
+      name: prop.name,
+      propCategory: 'envProp',
+      type: prop.type,
+      realTime: true,
+      dimensionSub: prop.dimension_sub || prop.name
+    };
+  });
+  res.userPropList = (_store$userPropList = store.userPropList) === null || _store$userPropList === void 0 ? void 0 : _store$userPropList.map(function (prop) {
+    return {
+      id: prop.id || 0,
+      isHidden: prop.hidden,
+      alias: prop.alias_name,
+      category: prop.category,
+      key: "userProp-".concat(prop.name),
+      label: prop.text || prop.name,
+      name: prop.name,
+      propCategory: 'userProp',
+      type: prop.type,
+      subtype: prop.subtype,
+      realTime: prop.category === 'custom',
+      dimensionSub: prop.dimension_sub || prop.name
+    };
+  });
+  return res;
+}
+export function getIcon(name) {
+  var hash = {
+    // 环境属性
+    browser_brand: 'internet',
+    browser_version: 'internet',
+    website: 'web',
+    referer_url: 'web',
+    current_url: 'web',
+    country: 'region',
+    area: 'region',
+    city: 'region',
+    os: 'platform',
+    ov: 'platform',
+    resolution_h: 'platform',
+    resolution_l: 'platform',
+    first_referer_url: 'web',
+    ip: 'web',
+    utm_source: 'utm',
+    utm_medium: 'utm',
+    utm_campaign: 'utm',
+    utm_content: 'utm',
+    utm_term: 'utm',
+    version: 'overall',
+    channel: 'overall',
+    network: 'platform',
+    mccmnc: 'platform',
+    device_brand: 'overall',
+    device_model: 'overall',
+    event_duration: 'time',
+    // 用户属性
+    first_visit_time: 'time',
+    last_visit_time: 'time',
+    visit_times: 'time',
+    duration: 'time',
+    name: 'personal',
+    app_user_id: 'personal',
+    zg_id: 'personal',
+    is_anonymous: 'type',
+    current_country: 'region',
+    current_area: 'region',
+    current_city: 'region',
+    current_app_version: 'overall',
+    current_app_channel: 'overall',
+    first_version: 'overall',
+    first_channel: 'overall',
+    current_device_brand: 'overall',
+    current_device_model: 'overall',
+    current_mccmnc: 'platform',
+    user_referer_url: 'web',
+    first_website: 'web',
+    first_utm_source: 'utm',
+    first_utm_medium: 'utm',
+    first_utm_campaign: 'utm',
+    first_utm_content: 'utm',
+    first_utm_term: 'utm',
+    current_browser_brand: 'internet',
+    current_browser_version: 'internet',
+    current_os: 'platform',
+    current_ov: 'platform',
+    current_resolution_h: 'platform',
+    current_resolution_l: 'platform'
+  };
+  return hash[name] ? 'icon-' + hash[name] : '';
+}

package/es/constants/api.d.ts

@@ -60,6 +60,9 @@ declare let apis: {
         updateCompanyUser: string;
         delCompanyUser: string;
         updateCompanyUserStatus: string;
+        queryEventEnvData: string;
+        qeuryUserPropMeta: string;
+        queryEventMetasOfGroup: string;
     };
     eventMeta: {
         queryEventMeta: string;

package/es/constants/api.js

@@ -68,9 +68,12 @@ var apis = {
     getPasswordRule: '/zg/web/v2/system/getPasswordRule',
     updateCompanyUser: '/zg/web/v2/company/setting/updateCompanyUser',
     delCompanyUser: '/zg/web/v2/company/setting/delCompanyUser',
-    updateCompanyUserStatus: '/zg/web/v2/company/setting/updateCompanyUserStatus' // 修改状态
+    updateCompanyUserStatus: '/zg/web/v2/company/setting/updateCompanyUserStatus',
+    // 基础数据
+    queryEventEnvData: '/zg/web/v2/appusergroup/getEventEnvData',
+    qeuryUserPropMeta: '/zg/web/v2/appusergroup/getUserPropMeta',
+    queryEventMetasOfGroup: '/zg/web/v2/data/queryEventMetasOfGroup'
   },
-
   eventMeta: {
     queryEventMeta: '/zg/web/v2/data/queryEventMetasOfGroup'
   },

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

@@ -113,20 +113,36 @@ var RoleList = function RoleList(props) {
     setSelectArr = _useState36[1];
   var _useState37 = useState([]),
     _useState38 = _slicedToArray(_useState37, 2),
-    appList = _useState38[0],
-    setAppList = _useState38[1];
-  var _useState39 = useState(false),
+    selectAppId = _useState38[0],
+    setSelectAppId = _useState38[1];
+  var _useState39 = useState([]),
     _useState40 = _slicedToArray(_useState39, 2),
-    isModalOpen = _useState40[0],
-    setIsModalOpen = _useState40[1];
-  var _useState41 = useState(''),
+    appList = _useState40[0],
+    setAppList = _useState40[1];
+  var _useState41 = useState(false),
     _useState42 = _slicedToArray(_useState41, 2),
-    dataRangeDialogTitle = _useState42[0],
-    setDataRangeDialogTitle = _useState42[1];
-  var _useState43 = useState(0),
+    isModalOpen = _useState42[0],
+    setIsModalOpen = _useState42[1];
+  var _useState43 = useState(''),
     _useState44 = _slicedToArray(_useState43, 2),
-    currentAppId = _useState44[0],
-    setCurrentAppId = _useState44[1];
+    dataRangeDialogTitle = _useState44[0],
+    setDataRangeDialogTitle = _useState44[1];
+  var _useState45 = useState({}),
+    _useState46 = _slicedToArray(_useState45, 2),
+    currentSelectAppInfo = _useState46[0],
+    setCurrentSelectAppInfo = _useState46[1];
+  var _useState47 = useState([]),
+    _useState48 = _slicedToArray(_useState47, 2),
+    appCondition = _useState48[0],
+    setAPPCondition = _useState48[1];
+  var _useState49 = useState(0),
+    _useState50 = _slicedToArray(_useState49, 2),
+    isRoleAuthStatus = _useState50[0],
+    setIsRoleAuthStatus = _useState50[1];
+  var _useState51 = useState([]),
+    _useState52 = _slicedToArray(_useState51, 2),
+    currentJson = _useState52[0],
+    setCurrentJson = _useState52[1];
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -163,10 +179,6 @@ var RoleList = function RoleList(props) {
         if ((menuCodeMap === null || menuCodeMap === void 0 ? void 0 : (_menuCodeMap$map2 = menuCodeMap.map2) === null || _menuCodeMap$map2 === void 0 ? void 0 : _menuCodeMap$map2.length) === 0) {
           setAppVersionFlTest('请选择城商行功能权限');
           return;
-        } else {
-          form.setFieldsValue({
-            menuCodeMap: menuCodeMap.map2
-          });
         }
         if ((menuCodeMap === null || menuCodeMap === void 0 ? void 0 : (_menuCodeMap$map3 = menuCodeMap.map3) === null || _menuCodeMap$map3 === void 0 ? void 0 : _menuCodeMap$map3.length) === 0) {
           setAppVersionFlTest('请选择证券版本功能权限');
@@ -212,10 +224,6 @@ var RoleList = function RoleList(props) {
         if ((menuCodeMap === null || menuCodeMap === void 0 ? void 0 : (_menuCodeMap$map8 = menuCodeMap.map2) === null || _menuCodeMap$map8 === void 0 ? void 0 : _menuCodeMap$map8.length) === 0) {
           setAppVersionFlTest('请选择城商行功能权限');
           return;
-        } else {
-          form.setFieldsValue({
-            menuCodeMap: menuCodeMap.map2
-          });
         }
         if ((menuCodeMap === null || menuCodeMap === void 0 ? void 0 : (_menuCodeMap$map9 = menuCodeMap.map3) === null || _menuCodeMap$map9 === void 0 ? void 0 : _menuCodeMap$map9.length) === 0) {
           setAppVersionFlTest('请选择证券版功能权限');
@@ -310,7 +318,6 @@ var RoleList = function RoleList(props) {
     }).then(function (res) {
       if (res && (res === null || res === void 0 ? void 0 : res.data) && res.code === '101000') {
         var _res$data, _res$data$list, _res$data2;
-        // const app = util.convertData(res?.data as DepartmentItem[], name);
         setLoading(false);
         var arr = res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : (_res$data$list = _res$data.list) === null || _res$data$list === void 0 ? void 0 : _res$data$list.map(function (item) {
           var _item$userSimpleInfos;
@@ -336,7 +343,7 @@ var RoleList = function RoleList(props) {
   var queryRoleDetailsList = function queryRoleDetailsList(params) {
     queryRoleDetails(params).then(function (res) {
       if (res === null || res === void 0 ? void 0 : res.data) {
-        var _res$data5, _res$data6, _res$data7;
+        var _res$data5, _res$data6, _res$data8;
         var usListArr = usList === null || usList === void 0 ? void 0 : usList.filter(function (item1) {
           var _res$data3;
           return res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.appIds.some(function (item2) {
@@ -350,7 +357,18 @@ var RoleList = function RoleList(props) {
           });
         });
         onChangeAppIds(usListArr, params === null || params === void 0 ? void 0 : params.id, res === null || res === void 0 ? void 0 : (_res$data5 = res.data) === null || _res$data5 === void 0 ? void 0 : _res$data5.menuCodeMap, res === null || res === void 0 ? void 0 : (_res$data6 = res.data) === null || _res$data6 === void 0 ? void 0 : _res$data6.settingMenuList);
-        var _menuCodeMap = res.data.menuCodeMap;
+        var _res$data7 = res.data,
+          _menuCodeMap = _res$data7.menuCodeMap,
+          authGroupList = _res$data7.authGroupList;
+        authGroupList === null || authGroupList === void 0 ? void 0 : authGroupList.forEach(function (item) {
+          item.data = JSON.stringify({
+            color: item.color || '#8db3e2',
+            name: item.name || '0',
+            groupType: item.groupType || 0,
+            json: JSON.parse(item.json)
+          });
+        });
+        if (authGroupList === null || authGroupList === void 0 ? void 0 : authGroupList.length) setAPPCondition(authGroupList);
         form.setFieldsValue(_objectSpread(_objectSpread({}, res === null || res === void 0 ? void 0 : res.data), {}, {
           appIds: usListArr === null || usListArr === void 0 ? void 0 : usListArr.map(function (item) {
             return {
@@ -366,7 +384,7 @@ var RoleList = function RoleList(props) {
             };
           })
         }));
-        setAppList((res === null || res === void 0 ? void 0 : (_res$data7 = res.data) === null || _res$data7 === void 0 ? void 0 : _res$data7.appIds) || []);
+        setAppList((res === null || res === void 0 ? void 0 : (_res$data8 = res.data) === null || _res$data8 === void 0 ? void 0 : _res$data8.appIds) || []);
         setCreatedAppPanel(true);
       }
     }).catch(function (err) {
@@ -444,6 +462,7 @@ var RoleList = function RoleList(props) {
     });
   };
   var onChangeAppIds = function onChangeAppIds(e, roleId, codeMap, settingMenuList) {
+    handleDelAppJson(e); // 删除应用的同时删除赋值的数据范围条件
     setAppVersionFl(false);
     var arr = e.map(function (item) {
       return item.appVersion;
@@ -638,6 +657,40 @@ var RoleList = function RoleList(props) {
       }
     }
   };
+  function handleDelAppJson(e) {
+    // 删除应用的同时删除赋值的数据范围条件
+    var appIdsList = e.map(function (item) {
+      return item === null || item === void 0 ? void 0 : item.id;
+    });
+    setSelectAppId(appIdsList);
+    var delAppId = filterData(selectAppId, appIdsList);
+    var newAppCondition = appCondition;
+    var indexToRemove = newAppCondition === null || newAppCondition === void 0 ? void 0 : newAppCondition.findIndex(function (item) {
+      return item.appId === delAppId[0];
+    });
+    if (indexToRemove !== -1) {
+      newAppCondition.splice(indexToRemove, 1);
+    }
+    setAPPCondition(newAppCondition);
+  }
+  function filterData(array, array2) {
+    var result = [];
+    for (var key in array) {
+      var stra = array[key];
+      var count = 0;
+      for (var j = 0; j < array2.length; j++) {
+        var strb = array2[j];
+        if (stra == strb) {
+          count++;
+        }
+      }
+      if (count === 0) {
+        //表示数组1的这个值没有重复的，放到arr3列表中
+        result.push(stra);
+      }
+    }
+    return result;
+  }
   var onSystemVersion = function onSystemVersion(e, roleId) {
     setSystemVersionId(e.id);
     queryRoleMenuTreeList(roleId, e.id);
@@ -667,7 +720,9 @@ var RoleList = function RoleList(props) {
       systemVersion: appVersionFl ? 0 : 1,
       userIds: value === null || value === void 0 ? void 0 : (_value$userIds = value.userIds) === null || _value$userIds === void 0 ? void 0 : _value$userIds.map(function (item) {
         return item === null || item === void 0 ? void 0 : item.id;
-      })
+      }),
+      roleAuthStatus: isRoleAuthStatus,
+      authInfoParams: appCondition || []
     });
     if (menuCodeMap.map2.length && menuCodeMap.map3.length && !menuCodeMap.map1.length) {
       var _params$menuCodeMap;
@@ -694,6 +749,8 @@ var RoleList = function RoleList(props) {
         settingList2: [],
         settingList3: []
       });
+      setAppList([]);
+      setAPPCondition([]);
       // 通知数据刷新
       msg = !roleId ? '创建成功' : '编辑成功';
       notification.success({
@@ -712,9 +769,20 @@ 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) {
+          return item.appId === option.app_id;
+        });
+        if (currentJson.length) {
+          var _currentJson$;
+          setCurrentJson(currentJson[0].data ? JSON.parse((_currentJson$ = currentJson[0]) === null || _currentJson$ === void 0 ? void 0 : _currentJson$.data).json : JSON.parse(currentJson[0].json));
+          setIsRoleAuthStatus(1);
+        } else {
+          setCurrentJson([]);
+          setIsRoleAuthStatus(0);
+        }
         e.stopPropagation();
       },
       className: "custom-item-right"
@@ -738,6 +806,28 @@ var RoleList = function RoleList(props) {
       className: "bsicon tishi"
     }))));
   }
+  function setConditionFn(appId, condition) {
+    var authInfoParam = {
+      appId: appId,
+      platform: 0,
+      data: JSON.stringify({
+        color: '#8db3e2',
+        name: 0,
+        groupType: 0,
+        json: condition
+      })
+    };
+    var newAppCondition = appCondition;
+    var indexToRemove = newAppCondition === null || newAppCondition === void 0 ? void 0 : newAppCondition.findIndex(function (item) {
+      return item.appId === appId;
+    });
+    if (indexToRemove !== -1) {
+      newAppCondition.splice(indexToRemove, 1, authInfoParam);
+    } else {
+      newAppCondition.push(authInfoParam);
+    }
+    setAPPCondition(newAppCondition);
+  }
   return /*#__PURE__*/React.createElement(Spin, {
     spinning: loading
   }, /*#__PURE__*/React.createElement("div", {
@@ -812,6 +902,7 @@ var RoleList = function RoleList(props) {
         settingList3: []
       });
       setSystemVersionId(1);
+      setAPPCondition([]);
     },
     footer: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Button, {
       onClick: function onClick() {
@@ -825,6 +916,7 @@ var RoleList = function RoleList(props) {
           settingList2: [],
           settingList3: []
         });
+        setAPPCondition([]);
       }
     }, "\u53D6\u6D88"), /*#__PURE__*/React.createElement(Button, {
       loading: createAppLoading,
@@ -975,7 +1067,12 @@ var RoleList = function RoleList(props) {
     isModalOpen: isModalOpen,
     setIsModalOpen: setIsModalOpen,
     dataRangeDialogTitle: dataRangeDialogTitle,
-    currentAppId: currentAppId
+    currentSelectAppInfo: currentSelectAppInfo,
+    setConditionFn: setConditionFn,
+    isRoleAuthStatus: isRoleAuthStatus,
+    setIsRoleAuthStatus: setIsRoleAuthStatus,
+    currentJson: currentJson,
+    setCurrentJson: setCurrentJson
   }), /*#__PURE__*/React.createElement("div", {
     className: "role-list-content"
   }, /*#__PURE__*/React.createElement(Table, {

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

@@ -1,9 +1,15 @@
 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;
+    isRoleAuthStatus: number;
+    setIsRoleAuthStatus: Function;
 }>;
 export default SetDataRangeDialog;

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

@@ -1,33 +1,29 @@
-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); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useState } from 'react';
-import { Radio } from 'antd';
-import { BizDialog, DemoWrapper, BizUserCondition } from '@zgfe/business-lib';
+import React from 'react';
+import { Radio, message } from 'antd';
+import { BizDialog } from '@zgfe/business-lib';
 import './index.less';
+import util from '../../../../utils/util';
+import SelectAppWrapper from '../../../../components/selectAppWrapper';
 var SetDataRangeDialog = function SetDataRangeDialog(props) {
-  // authInfoParam: {
-  //   platform: 0,
-  //   data: JSON.stringify({ color: '#8db3e2', name: 0, groupType: 0, json: condition }),
-  // },
   var isModalOpen = props.isModalOpen,
     setIsModalOpen = props.setIsModalOpen,
     dataRangeDialogTitle = props.dataRangeDialogTitle,
-    currentAppId = props.currentAppId;
-  var _useState = useState(0),
-    _useState2 = _slicedToArray(_useState, 2),
-    isRoleAuthStatus = _useState2[0],
-    setIsRoleAuthStatus = _useState2[1];
-  var _useState3 = useState([]),
-    _useState4 = _slicedToArray(_useState3, 2),
-    condition = _useState4[0],
-    setCondition = _useState4[1];
-  function onChangeCondition(condition) {
-    console.log('condition', condition);
-    setCondition(condition);
+    currentSelectAppInfo = props.currentSelectAppInfo,
+    setConditionFn = props.setConditionFn,
+    currentJson = props.currentJson,
+    setCurrentJson = props.setCurrentJson,
+    isRoleAuthStatus = props.isRoleAuthStatus,
+    setIsRoleAuthStatus = props.setIsRoleAuthStatus;
+  function onChangeCondition(data) {
+    setCurrentJson(data);
+  }
+  function onConfirm() {
+    if (!currentJson) return;
+    var res = util.validateUserCondition(currentJson);
+    if (res) return message.error(res);
+    setConditionFn(currentSelectAppInfo.app_id, currentJson);
+    setIsModalOpen(false);
+    setCurrentJson([]);
   }
   return /*#__PURE__*/React.createElement(BizDialog, {
     className: "set-data-dialog",
@@ -35,42 +31,35 @@ var SetDataRangeDialog = function SetDataRangeDialog(props) {
     open: isModalOpen,
     closable: true,
     style: {
-      minWidth: isRoleAuthStatus ? '1200px' : '520px'
+      minWidth: isRoleAuthStatus ? '80%' : '520px'
     },
     onCancel: function onCancel() {
-      return setIsModalOpen(false);
+      setIsModalOpen(false);
+      setCurrentJson([]);
+    },
+    onOk: function onOk() {
+      return onConfirm();
     }
   }, /*#__PURE__*/React.createElement(Radio.Group, {
     buttonStyle: "outline",
-    defaultValue: isRoleAuthStatus,
+    value: isRoleAuthStatus,
     onChange: function onChange(value) {
-      console.log(value.target.value);
       setIsRoleAuthStatus(value.target.value);
     }
   }, /*#__PURE__*/React.createElement(Radio, {
     value: 0
   }, "\u5168\u90E8\u6570\u636E"), /*#__PURE__*/React.createElement(Radio, {
     value: 1
-  }, "\u7B5B\u9009\u7528\u6237\uFF08", currentAppId, "\uFF09")), isRoleAuthStatus ? /*#__PURE__*/React.createElement("li", {
+  }, "\u7B5B\u9009\u7528\u6237")), isRoleAuthStatus ? /*#__PURE__*/React.createElement("li", {
     className: "group-config condition"
   }, /*#__PURE__*/React.createElement("div", {
     className: "config-name"
   }, "\u5B9A\u4E49"), /*#__PURE__*/React.createElement("div", {
     className: "config-value"
-  }), /*#__PURE__*/React.createElement(DemoWrapper, {
-    defaultApp: currentAppId
-  }, /*#__PURE__*/React.createElement(BizUserCondition, {
-    openCdpCondition: true,
-    openBusinessDataCondition: true,
-    openOrderDataCondition: true,
-    openTagCondition: true,
-    userTagsData: [],
-    defaultValue: condition,
-    onChange: onChangeCondition,
-    orConditionNum: 3,
-    andConditionNum: 8,
-    eventAttrNum: 3,
-    isRealTime: true
-  }))) : null);
+  }), /*#__PURE__*/React.createElement(SelectAppWrapper, {
+    currentSelectAppInfo: currentSelectAppInfo,
+    onChangeCondition: onChangeCondition,
+    currentJson: currentJson
+  })) : null);
 };
 export default SetDataRangeDialog;

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

@@ -1,6 +1,6 @@
 .set-data-dialog {
   .ant-card-head-title {
-    display: none;
+    // display: none;
   }
 
   .group-config {
@@ -19,7 +19,7 @@
       border: none;
 
       .ant-card-head {
-        display: none;
+        // display: none;
       }
 
       .biz-user-condition {

package/es/requests/role.d.ts

@@ -24,4 +24,10 @@ export declare const queryRolePage: (data: {
     id: number | null;
 }) => Promise<import("@zgfe/business-lib/es/utils/type").InterfaceApiResult<unknown> | null>, deleteRole: (data: {
     id: number | null;
+}) => Promise<import("@zgfe/business-lib/es/utils/type").InterfaceApiResult<unknown> | null>, queryEventEnvDataApi: (data: {
+    id: number | null;
+}) => Promise<import("@zgfe/business-lib/es/utils/type").InterfaceApiResult<unknown> | null>, qeuryUserPropMetaApi: (data: {
+    id: number | null;
+}) => Promise<import("@zgfe/business-lib/es/utils/type").InterfaceApiResult<unknown> | null>, queryEventMetasOfGroupApi: (data: {
+    id: number | null;
 }) => Promise<import("@zgfe/business-lib/es/utils/type").InterfaceApiResult<unknown> | null>;

package/es/requests/role.js

@@ -85,6 +85,31 @@ var Department = /*#__PURE__*/function () {
         data: data
       });
     }
+    // 事件
+  }, {
+    key: "queryEventEnvDataApi",
+    value: function queryEventEnvDataApi(data) {
+      return ajax(api.setting.queryEventEnvData, {
+        method: 'post',
+        data: data
+      });
+    }
+  }, {
+    key: "qeuryUserPropMetaApi",
+    value: function qeuryUserPropMetaApi(data) {
+      return ajax(api.setting.qeuryUserPropMeta, {
+        method: 'post',
+        data: data
+      });
+    }
+  }, {
+    key: "queryEventMetasOfGroupApi",
+    value: function queryEventMetasOfGroupApi(data) {
+      return ajax(api.setting.queryEventMetasOfGroup, {
+        method: 'post',
+        data: data
+      });
+    }
   }]);
   return Department;
 }();
@@ -96,5 +121,8 @@ var _Department = new Department(),
   queryCompanyUser = _Department.queryCompanyUser,
   addRole = _Department.addRole,
   updateRole = _Department.updateRole,
-  deleteRole = _Department.deleteRole;
-export { queryRolePage, queryRoleDetails, queryRoleDataConfig, queryRoleMenuTree, queryCompanyUser, addRole, updateRole, deleteRole };
+  deleteRole = _Department.deleteRole,
+  queryEventEnvDataApi = _Department.queryEventEnvDataApi,
+  qeuryUserPropMetaApi = _Department.qeuryUserPropMetaApi,
+  queryEventMetasOfGroupApi = _Department.queryEventMetasOfGroupApi;
+export { queryRolePage, queryRoleDetails, queryRoleDataConfig, queryRoleMenuTree, queryCompanyUser, addRole, updateRole, deleteRole, queryEventEnvDataApi, qeuryUserPropMetaApi, queryEventMetasOfGroupApi };

package/es/utils/util.d.ts

@@ -231,5 +231,6 @@ declare const util: {
         disabled: boolean | number;
         children: object[] | undefined;
     }[];
+    validateUserCondition(conditions: any[]): "" | "用户定义不能为空" | "事件不能为空" | "用户标签不能为空" | "明细数据不能为空" | "明细表不能为空" | "字段不能为空" | "筛选规则不能为空" | "筛选条件不能为空" | "值类型不能为空" | "用户属性不能为空" | "属性值不能为空" | "时间不能为空" | "次数不能为空" | "事件属性不能为空";
 };
 export default util;

package/es/utils/util.js

@@ -721,6 +721,110 @@ var util = {
       newItem.children = (newItem === null || newItem === void 0 ? void 0 : newItem.children) && (newItem === null || newItem === void 0 ? void 0 : newItem.children.length) > 0 ? util.menuTreeData(newItem === null || newItem === void 0 ? void 0 : newItem.children) : undefined;
       return newItem;
     });
+  },
+  validateUserCondition: function validateUserCondition(conditions) {
+    if (!conditions.length) return '用户定义不能为空';
+    var _iterator2 = _createForOfIteratorHelper(conditions),
+      _step2;
+    try {
+      for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+        var orConditions = _step2.value;
+        if (!orConditions.length) return '用户定义不能为空';
+        var _iterator3 = _createForOfIteratorHelper(orConditions),
+          _step3;
+        try {
+          for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+            var orCondition = _step3.value;
+            if (orCondition.eventId === 0) return '事件不能为空';
+            if (orCondition.eventId === undefined) {
+              if (orCondition.labels) {
+                var _orCondition$labels$v;
+                if (((_orCondition$labels$v = orCondition.labels.values) === null || _orCondition$labels$v === void 0 ? void 0 : _orCondition$labels$v.length) === 0) return '用户标签不能为空';
+              } else if (orCondition.dataset) {
+                if (!orCondition.dataset.length) return '明细数据不能为空';
+                var _iterator4 = _createForOfIteratorHelper(orCondition.dataset),
+                  _step4;
+                try {
+                  for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+                    var item = _step4.value;
+                    if (!item || !item.datasetTable) return '明细表不能为空';
+                    if (!item.fieldName) return '字段不能为空';
+                    if (!item.operator) return '筛选规则不能为空';
+                    if (!/^is null$|^is not null$/.test(item.operator) && !item.params.length) {
+                      return '筛选条件不能为空';
+                    }
+                  }
+                } catch (err) {
+                  _iterator4.e(err);
+                } finally {
+                  _iterator4.f();
+                }
+              } else if (orCondition.data_set_csh) {
+                if (!orCondition.data_set_csh.length) return '明细数据不能为空';
+                var _iterator5 = _createForOfIteratorHelper(orCondition.data_set_csh),
+                  _step5;
+                try {
+                  for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+                    var _item = _step5.value;
+                    if (!_item || !_item.datasetTable) return '明细表不能为空';
+                    if (!_item.fieldName) return '字段不能为空';
+                    if (!_item.operator) return '筛选规则不能为空';
+                    if (_item.subCondition) {
+                      if (!_item.subCondition.datasetTable) return '明细表不能为空';
+                      if (!_item.subCondition.fieldName) return '字段不能为空';
+                      if (!_item.subCondition.operator) return '筛选规则不能为空';
+                      if (!_item.subCondition.calculate) return '值类型不能为空';
+                    }
+                    if (!/^is null$|^is not null$/.test(_item.operator) && !(_item.params || _item.between && _item.between[0] && _item.between[1])) {
+                      return '筛选条件不能为空';
+                    }
+                  }
+                } catch (err) {
+                  _iterator5.e(err);
+                } finally {
+                  _iterator5.f();
+                }
+              } else if (!orCondition.attrs.length || !orCondition.attrs[0].attrName) {
+                return '用户属性不能为空';
+              } else if (!/^is null$|^is not null$/.test(orCondition.attrs[0].operator) && !orCondition.attrs[0].params.length) {
+                return '属性值不能为空';
+              }
+            } else {
+              if (orCondition.runPeriod && orCondition.runPeriod.values && (!orCondition.runPeriod.values[0] || !orCondition.runPeriod.values[1])) {
+                return '时间不能为空';
+              }
+              if (orCondition.runTimes && !orCondition.runTimes.values[0]) {
+                return '次数不能为空';
+              }
+              if (orCondition.attrs) {
+                var _iterator6 = _createForOfIteratorHelper(orCondition.attrs),
+                  _step6;
+                try {
+                  for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+                    var attr = _step6.value;
+                    if (!attr.attrId && !attr.attrName) return '事件属性不能为空';
+                    if (!attr.params.length && !/^is null$|^is not null$/.test(attr.operator)) return '属性值不能为空';
+                  }
+                } catch (err) {
+                  _iterator6.e(err);
+                } finally {
+                  _iterator6.f();
+                }
+              }
+            }
+          }
+        } catch (err) {
+          _iterator3.e(err);
+        } finally {
+          _iterator3.f();
+        }
+      }
+    } catch (err) {
+      _iterator2.e(err);
+    } finally {
+      _iterator2.f();
+    }
+    return '';
   }
 };
 export default util;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-settings",
-  "version": "1.2.20-role.2",
+  "version": "1.2.20-role.20",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "files": [
@@ -27,6 +27,7 @@
     ]
   },
   "dependencies": {
+    "@zgfe/business-lib": "^1.1.95",
     "father": "^4.1.7",
     "react": "^16.12.0 || ^17.0.0",
     "react-router-dom": "^6.8.2"
@@ -51,7 +52,7 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "76fd8d8f6c36af2c323af5f6ab8df1944c00ac05",
+  "gitHead": "695c9aa8c0c64cfe32439c114fd29912cc05d5c8",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }