@zgfe/modules-dm 1.0.57-zhongyuan.23 → 1.0.57-zhongyuan.25

package/es/modules/clearRule/addRule.js

@@ -175,7 +175,7 @@ var AddRule = function AddRule(_ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     optionsRule = _useState6[0],
     setOptionsRule = _useState6[1];
-  var options = [{
+  var initOptions = [{
     label: '属性类型',
     value: 1
   }, {
@@ -190,14 +190,15 @@ var AddRule = function AddRule(_ref) {
   }, {
     label: '非空',
     value: 5
-  }, {
-    label: '字典校验',
-    value: 6
   }];
-  var _useState7 = useState([]),
+  var _useState7 = useState(initOptions),
     _useState8 = _slicedToArray(_useState7, 2),
-    currentRule = _useState8[0],
-    setCurrentRule = _useState8[1];
+    options = _useState8[0],
+    setOptions = _useState8[1];
+  var _useState9 = useState([]),
+    _useState10 = _slicedToArray(_useState9, 2),
+    currentRule = _useState10[0],
+    setCurrentRule = _useState10[1];
   var onChangeType = function onChangeType(value) {
     setCurrentRule(value);
     // 再次点击清空数据
@@ -218,10 +219,10 @@ var AddRule = function AddRule(_ref) {
     setOptionsRule(newarr);
   };
   // 校验对象的类型 eventProp：事件校验    user：用户校验
-  var _useState9 = useState(currentRuleDetail ? (currentRuleDetail === null || currentRuleDetail === void 0 ? void 0 : currentRuleDetail.objectType) == 1 ? 'eventProp' : 'user' : 'eventProp'),
-    _useState10 = _slicedToArray(_useState9, 2),
-    selectType = _useState10[0],
-    setSelectType = _useState10[1];
+  var _useState11 = useState(currentRuleDetail ? (currentRuleDetail === null || currentRuleDetail === void 0 ? void 0 : currentRuleDetail.objectType) == 1 ? 'eventProp' : 'user' : 'eventProp'),
+    _useState12 = _slicedToArray(_useState11, 2),
+    selectType = _useState12[0],
+    setSelectType = _useState12[1];
   var onSelectType = function onSelectType(event) {
     setSelectType(function (pre) {
       return event.target.value;
@@ -248,7 +249,7 @@ var AddRule = function AddRule(_ref) {
     }]);
     setBizAttributeSelectorValue(undefined); // 清空属性
   };
-  var _useState11 = useState(currentRuleDetail ? currentRuleDetail.objectType == 1 ? {
+  var _useState13 = useState(currentRuleDetail ? currentRuleDetail.objectType == 1 ? {
       id: (currentRuleDetail === null || currentRuleDetail === void 0 ? void 0 : currentRuleDetail.event) || -100
     } : {
       id: -100,
@@ -257,24 +258,25 @@ var AddRule = function AddRule(_ref) {
       id: -100,
       name: '事件概览'
     }),
-    _useState12 = _slicedToArray(_useState11, 2),
-    event = _useState12[0],
-    setEvent = _useState12[1];
+    _useState14 = _slicedToArray(_useState13, 2),
+    event = _useState14[0],
+    setEvent = _useState14[1];
   var onChangeEvent = function onChangeEvent(val) {
     // 删除细分属性  重新选择细分
     setBizAttributeSelectorValue(undefined);
     setEvent(val === null || val === void 0 ? void 0 : val.event);
   };
   // 细分属性初始值
-  var _useState13 = useState(currentRuleDetail ? JSON.parse(currentRuleDetail === null || currentRuleDetail === void 0 ? void 0 : currentRuleDetail.extraMes) : undefined),
-    _useState14 = _slicedToArray(_useState13, 2),
-    bizAttributeSelectorValue = _useState14[0],
-    setBizAttributeSelectorValue = _useState14[1];
+  var _useState15 = useState(currentRuleDetail ? JSON.parse(currentRuleDetail === null || currentRuleDetail === void 0 ? void 0 : currentRuleDetail.extraMes) : undefined),
+    _useState16 = _slicedToArray(_useState15, 2),
+    bizAttributeSelectorValue = _useState16[0],
+    setBizAttributeSelectorValue = _useState16[1];
   // 细分属性
   var onChangeAttr = function onChangeAttr(attr) {
     if (attr === undefined) {
       // 删除细分属性
       setBizAttributeSelectorValue(undefined);
+      setOptions([].concat(initOptions));
     } else {
       var _value = attr.propCategory === 'eventProp' ? attr.id : attr.name;
       setBizAttributeSelectorValue(_objectSpread(_objectSpread({}, attr), {}, {
@@ -290,6 +292,10 @@ var AddRule = function AddRule(_ref) {
         });
         setOptionsRule(newArr);
       }
+      setOptions(attr.type != '3' ? [].concat(initOptions, [{
+        label: '字典校验',
+        value: 6
+      }]) : [].concat(initOptions));
     }
   };
   useEffect(function () {
@@ -321,6 +327,10 @@ var AddRule = function AddRule(_ref) {
           }
         });
       });
+      setOptions(newArr[0].content != '3' ? [].concat(initOptions, [{
+        label: '字典校验',
+        value: 6
+      }]) : [].concat(initOptions));
       var currentTypeArr = currentRuleDetail.verifyDetailVo.map(function (o) {
         return o.ruleType;
       });
@@ -467,10 +477,10 @@ var TypeComponent = function TypeComponent(_ref2) {
   var _useContext2 = useContext(BizGlobalDataContext),
     currentApp = _useContext2.currentApp;
   // 枚举
-  var _useState15 = useState([]),
-    _useState16 = _slicedToArray(_useState15, 2),
-    enumValue = _useState16[0],
-    setEnumValue = _useState16[1];
+  var _useState17 = useState([]),
+    _useState18 = _slicedToArray(_useState17, 2),
+    enumValue = _useState18[0],
+    setEnumValue = _useState18[1];
   var handleEnumChange = function handleEnumChange(value) {
     setEnumValue(value);
     optionsValue.filter(function (r) {
@@ -478,27 +488,27 @@ var TypeComponent = function TypeComponent(_ref2) {
     })[0].content = value;
   };
   // 区间
-  var _useState17 = useState(1),
-    _useState18 = _slicedToArray(_useState17, 2),
-    minNum = _useState18[0],
-    setMinNum = _useState18[1];
   var _useState19 = useState(1),
     _useState20 = _slicedToArray(_useState19, 2),
-    maxNum = _useState20[0],
-    setMaxNum = _useState20[1];
-  var _useState21 = useState(false),
+    minNum = _useState20[0],
+    setMinNum = _useState20[1];
+  var _useState21 = useState(1),
     _useState22 = _slicedToArray(_useState21, 2),
-    includedMinState = _useState22[0],
-    setIncludedMinState = _useState22[1];
+    maxNum = _useState22[0],
+    setMaxNum = _useState22[1];
   var _useState23 = useState(false),
     _useState24 = _slicedToArray(_useState23, 2),
-    includedMaxState = _useState24[0],
-    setIncludedMaxState = _useState24[1];
-  //字典
-  var _useState25 = useState([]),
+    includedMinState = _useState24[0],
+    setIncludedMinState = _useState24[1];
+  var _useState25 = useState(false),
     _useState26 = _slicedToArray(_useState25, 2),
-    dictList = _useState26[0],
-    setDictList = _useState26[1];
+    includedMaxState = _useState26[0],
+    setIncludedMaxState = _useState26[1];
+  //字典
+  var _useState27 = useState([]),
+    _useState28 = _slicedToArray(_useState27, 2),
+    dictList = _useState28[0],
+    setDictList = _useState28[1];
   var getDictList = function getDictList() {
     request(apis.dict.dictList, {
       method: 'post',
@@ -645,9 +655,9 @@ var TypeComponent = function TypeComponent(_ref2) {
       //  defaultValue={Number(optionsValue.filter((r) => r.ruleType == type)[0].content)}
       , {
         //  defaultValue={Number(optionsValue.filter((r) => r.ruleType == type)[0].content)}
-        value: Number(optionsValue.filter(function (r) {
+        value: optionsValue.filter(function (r) {
           return r.ruleType == type;
-        })[0].content),
+        })[0].content,
         placeholder: "\u9009\u62E9\u5B57\u5178\u89C4\u5219",
         options: dictList,
         onChange: function onChange(value) {

package/es/modules/dataManage/components/tablePlus.js

@@ -97,49 +97,20 @@ var TablePlus = function TablePlus(props) {
     _useState10 = _slicedToArray(_useState9, 2),
     triggeringInput = _useState10[0],
     setTriggeringInput = _useState10[1];
-  var _useState11 = useState(-1),
-    _useState12 = _slicedToArray(_useState11, 2),
-    triggeringId = _useState12[0],
-    setTriggeringId = _useState12[1];
-  // 修改触发时机
-  var triggeringEdit = function triggeringEdit() {
-    if (triggeringInput.length > 128) {
-      message.error('名称不可超过128字符');
-      return;
-    }
-    request(apis.updateEventInfo, {
-      method: 'post',
-      data: {
-        appId: getAppID(currentApp),
-        triggeringOccasion: triggeringInput,
-        eventId: triggeringId
-      }
-    }).then(function (res) {
-      if ((res === null || res === void 0 ? void 0 : res.data) === 0) {
-        message.error(res.msg);
-      } else {
-        message.success('修改成功');
-        props.Refresh();
-        state.updateEventMetas && state.updateEventMetas(); // 更新store
-      }
-    }).finally(function () {
-      setTriggeringShow(false);
-    });
-  };
   // 控制修改分组名弹框 显示隐藏
-  var _useState13 = useState(false),
-    _useState14 = _slicedToArray(_useState13, 2),
-    eventNameShow = _useState14[0],
-    setEventNameShow = _useState14[1];
+  var _useState11 = useState(false),
+    _useState12 = _slicedToArray(_useState11, 2),
+    eventNameShow = _useState12[0],
+    setEventNameShow = _useState12[1];
   // 修改分组名数据
-  var _useState15 = useState(''),
+  var _useState13 = useState(''),
+    _useState14 = _slicedToArray(_useState13, 2),
+    eventNameInput = _useState14[0],
+    setEventNameInput = _useState14[1];
+  var _useState15 = useState({}),
     _useState16 = _slicedToArray(_useState15, 2),
-    eventNameInput = _useState16[0],
-    setEventNameInput = _useState16[1];
-  var _useState17 = useState({}),
-    _useState18 = _slicedToArray(_useState17, 2),
-    eventNameData = _useState18[0],
-    setEventNameData = _useState18[1];
+    eventNameData = _useState16[0],
+    setEventNameData = _useState16[1];
   // 修改分组名
   var eventNameEdit = function eventNameEdit() {
     if (!eventNameInput || eventNameInput.trim() === '') {
@@ -346,15 +317,15 @@ var TablePlus = function TablePlus(props) {
     }
   };
   // 手否筛选收藏
-  var _useState19 = useState(false),
-    _useState20 = _slicedToArray(_useState19, 2),
-    markActive = _useState20[0],
-    setMarkActive = _useState20[1];
+  var _useState17 = useState(false),
+    _useState18 = _slicedToArray(_useState17, 2),
+    markActive = _useState18[0],
+    setMarkActive = _useState18[1];
   // 分组操作-勾选数据
-  var _useState21 = useState({}),
-    _useState22 = _slicedToArray(_useState21, 2),
-    groupCheckedData = _useState22[0],
-    setGroupCheckedData = _useState22[1];
+  var _useState19 = useState({}),
+    _useState20 = _slicedToArray(_useState19, 2),
+    groupCheckedData = _useState20[0],
+    setGroupCheckedData = _useState20[1];
   useEffect(function () {
     if ((props === null || props === void 0 ? void 0 : props.selectEventList) && props.tableHandleData) {
       var dealGroupCheckedData = {};
@@ -447,14 +418,14 @@ var TablePlus = function TablePlus(props) {
     return props.groupData.length < 2 && type == 'copy' ? null : element;
   };
   // 点击测试
-  var _useState23 = useState(),
+  var _useState21 = useState(),
+    _useState22 = _slicedToArray(_useState21, 2),
+    currentEvent = _useState22[0],
+    setCurrentEvent = _useState22[1];
+  var _useState23 = useState(false),
     _useState24 = _slicedToArray(_useState23, 2),
-    currentEvent = _useState24[0],
-    setCurrentEvent = _useState24[1];
-  var _useState25 = useState(false),
-    _useState26 = _slicedToArray(_useState25, 2),
-    isTextModal = _useState26[0],
-    setIsTextModal = _useState26[1];
+    isTextModal = _useState24[0],
+    setIsTextModal = _useState24[1];
   var eventTextHandle = function eventTextHandle(currentObj) {
     setIsTextModal(true);
     setCurrentEvent(currentObj);
@@ -465,10 +436,10 @@ var TablePlus = function TablePlus(props) {
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
-  var _useState27 = useState(false),
-    _useState28 = _slicedToArray(_useState27, 2),
-    bugState = _useState28[0],
-    setBugState = _useState28[1];
+  var _useState25 = useState(false),
+    _useState26 = _slicedToArray(_useState25, 2),
+    bugState = _useState26[0],
+    setBugState = _useState26[1];
   var submitText = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var values;
@@ -519,11 +490,11 @@ var TablePlus = function TablePlus(props) {
     };
   }();
   // 埋点平台
-  var _useState29 = useState(),
-    _useState30 = _slicedToArray(_useState29, 2),
-    currentRow = _useState30[0],
-    setCurrentRow = _useState30[1];
-  var _useState31 = useState([{
+  var _useState27 = useState(),
+    _useState28 = _slicedToArray(_useState27, 2),
+    currentRow = _useState28[0],
+    setCurrentRow = _useState28[1];
+  var _useState29 = useState([{
       label: 'JS',
       value: '206'
     }, {
@@ -536,16 +507,16 @@ var TablePlus = function TablePlus(props) {
       label: '其他',
       value: '99'
     }]),
-    _useState32 = _slicedToArray(_useState31, 1),
-    maidianList = _useState32[0];
-  var _useState33 = useState(false),
+    _useState30 = _slicedToArray(_useState29, 1),
+    maidianList = _useState30[0];
+  var _useState31 = useState(false),
+    _useState32 = _slicedToArray(_useState31, 2),
+    isMaidianModal = _useState32[0],
+    setIsMaidianModal = _useState32[1];
+  var _useState33 = useState([]),
     _useState34 = _slicedToArray(_useState33, 2),
-    isMaidianModal = _useState34[0],
-    setIsMaidianModal = _useState34[1];
-  var _useState35 = useState([]),
-    _useState36 = _slicedToArray(_useState35, 2),
-    currentMaidian = _useState36[0],
-    setCurrentMaidian = _useState36[1];
+    currentMaidian = _useState34[0],
+    setCurrentMaidian = _useState34[1];
   var submitMaidian = function submitMaidian() {
     request(apis.updateMaidian, {
       method: 'post',
@@ -568,14 +539,14 @@ var TablePlus = function TablePlus(props) {
     });
   };
   // 备注的
-  var _useState37 = useState(false),
+  var _useState35 = useState(false),
+    _useState36 = _slicedToArray(_useState35, 2),
+    isRemarkModal = _useState36[0],
+    setIsRemarkModal = _useState36[1];
+  var _useState37 = useState(''),
     _useState38 = _slicedToArray(_useState37, 2),
-    isRemarkModal = _useState38[0],
-    setIsRemarkModal = _useState38[1];
-  var _useState39 = useState(''),
-    _useState40 = _slicedToArray(_useState39, 2),
-    currentRemark = _useState40[0],
-    setCurrentRemark = _useState40[1];
+    currentRemark = _useState38[0],
+    setCurrentRemark = _useState38[1];
   var submitRemark = function submitRemark() {
     request(apis.updateRemark, {
       method: 'post',
@@ -598,30 +569,30 @@ var TablePlus = function TablePlus(props) {
     });
   };
   //标签列表数据 2:业务标签 3:触发标签
-  var _useState41 = useState(),
+  var _useState39 = useState(),
+    _useState40 = _slicedToArray(_useState39, 2),
+    eventData = _useState40[0],
+    setEventData = _useState40[1];
+  var _useState41 = useState([]),
     _useState42 = _slicedToArray(_useState41, 2),
-    eventData = _useState42[0],
-    setEventData = _useState42[1];
-  var _useState43 = useState([]),
+    bizTag = _useState42[0],
+    setBizTag = _useState42[1];
+  var _useState43 = useState(),
     _useState44 = _slicedToArray(_useState43, 2),
-    bizTag = _useState44[0],
-    setBizTag = _useState44[1];
-  var _useState45 = useState(),
+    bizTagId = _useState44[0],
+    setBizTagId = _useState44[1];
+  var _useState45 = useState(false),
     _useState46 = _slicedToArray(_useState45, 2),
-    bizTagId = _useState46[0],
-    setBizTagId = _useState46[1];
-  var _useState47 = useState(false),
+    bizTagShow = _useState46[0],
+    setBizTagShow = _useState46[1];
+  var _useState47 = useState([]),
     _useState48 = _slicedToArray(_useState47, 2),
-    bizTagShow = _useState48[0],
-    setBizTagShow = _useState48[1];
-  var _useState49 = useState([]),
+    triTag = _useState48[0],
+    setTriTag = _useState48[1];
+  var _useState49 = useState(),
     _useState50 = _slicedToArray(_useState49, 2),
-    triTag = _useState50[0],
-    setTriTag = _useState50[1];
-  var _useState51 = useState(),
-    _useState52 = _slicedToArray(_useState51, 2),
-    triTagId = _useState52[0],
-    setTriTagId = _useState52[1];
+    triTagId = _useState50[0],
+    setTriTagId = _useState50[1];
   var getTagList = function getTagList(type) {
     request(apis.dict.eventTag, {
       method: 'post',
@@ -865,23 +836,13 @@ var TablePlus = function TablePlus(props) {
           getTagList(3);
           setTriTagId(record.triggerLabelId);
           setTriggeringInput(record.triggeringOccasion);
-          setTriggeringId(record.event_id);
+          setEventData(record);
           setTriggeringShow(true);
         },
         type: "zhongmingming"
       }));
     }
-  },
-  // {
-  //   title: '首次上报时间',
-  //   dataIndex: 'insert_time',
-  //   key: 'insert_time',
-  //   width: 187,
-  //   render: (text) => {
-  //     return <div className="insert_time">{text}</div>;
-  //   },
-  // },
-  {
+  }, {
     title: '埋点平台',
     dataIndex: 'platformStr',
     key: 'platformStr',
@@ -1179,19 +1140,19 @@ var TablePlus = function TablePlus(props) {
     }
   }];
   //看板引用次数
+  var _useState51 = useState(false),
+    _useState52 = _slicedToArray(_useState51, 2),
+    panelShow = _useState52[0],
+    setPanelShow = _useState52[1];
+  //下线功能
   var _useState53 = useState(false),
     _useState54 = _slicedToArray(_useState53, 2),
-    panelShow = _useState54[0],
-    setPanelShow = _useState54[1];
-  //下线功能
-  var _useState55 = useState(false),
+    offlineShow = _useState54[0],
+    setOfflineShow = _useState54[1];
+  var _useState55 = useState(''),
     _useState56 = _slicedToArray(_useState55, 2),
-    offlineShow = _useState56[0],
-    setOfflineShow = _useState56[1];
-  var _useState57 = useState(''),
-    _useState58 = _slicedToArray(_useState57, 2),
-    offlineText = _useState58[0],
-    setOfflineText = _useState58[1];
+    offlineText = _useState56[0],
+    setOfflineText = _useState56[1];
   //功能下线
   var offlineEvent = function offlineEvent() {
     request(apis.offlineEvent, {
@@ -1216,10 +1177,10 @@ var TablePlus = function TablePlus(props) {
       });
     });
   };
-  var _useState59 = useState(''),
-    _useState60 = _slicedToArray(_useState59, 2),
-    scrollY = _useState60[0],
-    setScrollY = _useState60[1];
+  var _useState57 = useState(''),
+    _useState58 = _slicedToArray(_useState57, 2),
+    scrollY = _useState58[0],
+    setScrollY = _useState58[1];
   //页面加载完成后才能获取到对应的元素及其位置
   useEffect(function () {
     var _Y = getTableScroll(102, 'dataManageTablePlus');
@@ -1347,6 +1308,7 @@ var TablePlus = function TablePlus(props) {
     },
     onCancel: function onCancel() {
       setBizTagShow(false);
+      setEventData(undefined);
     },
     width: 520,
     destroyOnClose: true
@@ -1442,9 +1404,9 @@ var TablePlus = function TablePlus(props) {
     },
     onCancel: function onCancel() {
       setTriggeringInput('');
-      setTriggeringId(-1);
       setTriggeringShow(false);
       setTriTagId(undefined);
+      setEventData(undefined);
     },
     width: 520,
     destroyOnClose: true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.57-zhongyuan.23",
+  "version": "1.0.57-zhongyuan.25",
   "license": "ISC",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
@@ -57,7 +57,7 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "f72daf80cae39ac93d76a809fcf24d4ac6a7e2fb",
+  "gitHead": "57bc943a6369d57afdb953bf41032a3951842614",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }