@zgfe/modules-settings 2.1.0-zhongyuan.2 → 2.1.0-zhongyuan.21

package/es/modules/createDemand_bf/demo/index.js

@@ -6,7 +6,6 @@ import { DemoWrapper } from '@zgfe/business-lib';
 // import { Button } from 'antd';
 // const classPrefix = 'system-setting-approval-process-create-content';
 export default (function () {
-  console.log('window.innerWidth', window.innerWidth);
   return /*#__PURE__*/React.createElement(DemoWrapper, {
     defaultApp: 99825
   }, /*#__PURE__*/React.createElement(CreateDemand, null));

package/es/modules/createDemand_bf/index.js

@@ -295,7 +295,6 @@ var CreateDemand = function CreateDemand(props) {
     });
   };
   var viewEventProp = function viewEventProp(record) {
-    console.log('viewEventProp', record);
     setEventAttrListShow(true);
     setEventProp(record.event_attrs);
   };

package/es/modules/dealDemand/demo/index.js

@@ -46,7 +46,6 @@ export default (function () {
   };
   var initFun = function initFun(callbackFun, data) {
     createDemandCallbackFun = callbackFun;
-    console.log('initFun', data);
     setSelectObj(data || []);
     setIsShowSelectList(true);
   };

package/es/modules/dealDemand/index.js

@@ -209,7 +209,6 @@ var CreateDemand = function CreateDemand(props) {
     });
   };
   var gotoPage = function gotoPage(type, data) {
-    console.log('data', data);
     switch (type) {
       case 'event':
         window.open('/webapp/app/' + (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId) + '/plat/0/analytics/dataCollectManage?key=' + data, '_blank');
@@ -389,7 +388,6 @@ var CreateDemand = function CreateDemand(props) {
       }],
       onClick: function onClick(_ref) {
         var key = _ref.key;
-        console.log('key', key);
         switch (key) {
           case '0':
             submitDemand(3);

package/es/modules/demandManage/styles/index.less

@@ -1,155 +1,155 @@
-// @import '~@zgfe/business-lib/es/assets/styles/inner.less';
-.system-setting-demand {
-  padding: 24px;
-  background-color: #fff;
-
-  &-title {
-    padding: 16px 0;
-    color: #021429;
-    font-weight: 500;
-    font-size: 20px;
-  }
-
-  &-panel {
-    display: flex;
-    flex-direction: row;
-    gap: 16px;
-    &-all {
-      display: flex;
-      flex-direction: row;
-      gap: 16px;
-      align-items: center;
-      width: 256px;
-      padding: 24px;
-      color: var(--io-N8-, #354354);
-      font-weight: 400;
-      font-size: 16px;
-      background: var(--io-n-02, #fafafb);
-      border-radius: 8px;
-      &-img {
-        width: 64px;
-        height: 64px;
-        background: url('./../images/title-bg.png') no-repeat;
-        background-size: contain;
-      }
-      &-num {
-        color: var(--io-N-, #021429);
-        font-weight: 700;
-        font-size: 32px;
-        line-height: 40px; /* 125% */
-        cursor: pointer;
-      }
-    }
-    &-status {
-      display: flex;
-      flex: 1;
-      flex-direction: row;
-      color: var(--io-N8-, #354354);
-      font-weight: 400;
-      font-size: 16px;
-      font-family: 'PingFang SC';
-      font-style: normal;
-      line-height: normal;
-      background: var(--io-n-02, #fafafb);
-      border-radius: 8px;
-      &-item {
-        display: flex;
-        flex: 1;
-        // align-items: center;
-        flex-direction: column;
-        padding: 24px;
-        &-txt {
-          display: flex;
-          flex-direction: row;
-          gap: 4px;
-          align-items: center;
-          cursor: pointer;
-        }
-        &-icon {
-          display: block;
-          width: 8px;
-          height: 8px;
-          border-radius: 4px;
-          content: '';
-        }
-        &-num {
-          margin-top: 4px;
-          margin-left: 12px;
-          color: var(--io-N-, #021429);
-          font-weight: 700;
-          font-size: 32px;
-          font-family: Arial;
-          font-style: normal;
-          line-height: 40px; /* 125% */
-          cursor: pointer;
-        }
-      }
-    }
-  }
-  &-filter {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    padding: 16px 0;
-    &-left {
-      display: flex;
-      flex: 1;
-      flex-direction: row;
-      gap: 16px;
-      align-items: center;
-    }
-    &-right {
-      display: flex;
-      flex-direction: row;
-      gap: 16px;
-      align-items: center;
-      .button:not(.disabled):not(.ant-btn-primary) {
-        color: #1454e5;
-        border: 1px solid #1454e5;
-      }
-    }
-  }
-
-  &-table {
-    &-status {
-      display: flex;
-      align-items: center;
-      padding: 1px 8px;
-      font-weight: 400;
-      font-size: 14px;
-      line-height: 22px; /* 157.143% */
-      border-radius: 2px;
-    }
-  }
-}
-.system-setting-demand-pop {
-  display: flex;
-  flex-direction: column;
-  gap: 8px;
-  width: 136px;
-  &-header {
-    display: flex;
-    flex-direction: row;
-    align-items: flex-start;
-    justify-content: space-between;
-    color: var(--io-N-, #021429);
-    font-weight: 400;
-    font-size: 16px;
-    line-height: 24px; /* 150% */
-    .qingchu {
-      color: #9aa1a9;
-      cursor: pointer;
-    }
-  }
-  &-footer {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    justify-content: space-between;
-    .ant-btn-primary {
-      height: 24px;
-      padding-top: 0;
-      padding-bottom: 0;
-    }
-  }
-}
+// @import '~@zgfe/business-lib/es/assets/styles/inner.less';
+.system-setting-demand {
+  padding: 24px;
+  background-color: #fff;
+
+  &-title {
+    padding: 16px 0;
+    color: #021429;
+    font-weight: 500;
+    font-size: 20px;
+  }
+
+  &-panel {
+    display: flex;
+    flex-direction: row;
+    gap: 16px;
+    &-all {
+      display: flex;
+      flex-direction: row;
+      gap: 16px;
+      align-items: center;
+      width: 256px;
+      padding: 24px;
+      color: var(--io-N8-, #354354);
+      font-weight: 400;
+      font-size: 16px;
+      background: var(--io-n-02, #fafafb);
+      border-radius: 8px;
+      &-img {
+        width: 64px;
+        height: 64px;
+        background: url('./../images/title-bg.png') no-repeat;
+        background-size: contain;
+      }
+      &-num {
+        color: var(--io-N-, #021429);
+        font-weight: 700;
+        font-size: 32px;
+        line-height: 40px; /* 125% */
+        cursor: pointer;
+      }
+    }
+    &-status {
+      display: flex;
+      flex: 1;
+      flex-direction: row;
+      color: var(--io-N8-, #354354);
+      font-weight: 400;
+      font-size: 16px;
+      font-family: 'PingFang SC';
+      font-style: normal;
+      line-height: normal;
+      background: var(--io-n-02, #fafafb);
+      border-radius: 8px;
+      &-item {
+        display: flex;
+        flex: 1;
+        // align-items: center;
+        flex-direction: column;
+        padding: 24px;
+        &-txt {
+          display: flex;
+          flex-direction: row;
+          gap: 4px;
+          align-items: center;
+          cursor: pointer;
+        }
+        &-icon {
+          display: block;
+          width: 8px;
+          height: 8px;
+          border-radius: 4px;
+          content: '';
+        }
+        &-num {
+          margin-top: 4px;
+          margin-left: 12px;
+          color: var(--io-N-, #021429);
+          font-weight: 700;
+          font-size: 32px;
+          font-family: Arial;
+          font-style: normal;
+          line-height: 40px; /* 125% */
+          cursor: pointer;
+        }
+      }
+    }
+  }
+  &-filter {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    padding: 16px 0;
+    &-left {
+      display: flex;
+      flex: 1;
+      flex-direction: row;
+      gap: 16px;
+      align-items: center;
+    }
+    &-right {
+      display: flex;
+      flex-direction: row;
+      gap: 16px;
+      align-items: center;
+      .button:not(.disabled):not(.ant-btn-primary) {
+        color: #1454e5;
+        border: 1px solid #1454e5;
+      }
+    }
+  }
+
+  &-table {
+    &-status {
+      display: flex;
+      align-items: center;
+      padding: 1px 8px;
+      font-weight: 400;
+      font-size: 14px;
+      line-height: 22px; /* 157.143% */
+      border-radius: 2px;
+    }
+  }
+}
+.system-setting-demand-pop {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  width: 136px;
+  &-header {
+    display: flex;
+    flex-direction: row;
+    align-items: flex-start;
+    justify-content: space-between;
+    color: var(--io-N-, #021429);
+    font-weight: 400;
+    font-size: 16px;
+    line-height: 24px; /* 150% */
+    .qingchu {
+      color: #9aa1a9;
+      cursor: pointer;
+    }
+  }
+  &-footer {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: space-between;
+    .ant-btn-primary {
+      height: 24px;
+      padding-top: 0;
+      padding-bottom: 0;
+    }
+  }
+}

package/es/modules/pointMap/createMetaDrawer.js

@@ -23,6 +23,8 @@ import React, { useContext, useEffect, useState } from 'react';
 import _ from 'lodash';
 import BizEditText from './editTxt';
 import './styles/index.less';
+import request from '../../utils/ajax';
+import apis from '../../constants/api';
 var CreateMeta = function CreateMeta(props) {
   var classPrefix = 'setting-create-meta-drawer';
   var _useContext = useContext(BizGlobalDataContext),
@@ -74,8 +76,10 @@ var CreateMeta = function CreateMeta(props) {
     form.setFieldsValue({
       aliasName: data.aliasName,
       eventName: data.eventName,
-      triggeringOccasion: data.triggeringOccasion
+      businessLabelId: data.businessLabelId
     });
+    setTriTagInput(data.triggeringOccasion);
+    setTriTagId(data.triggerLabelId);
     setInputText(data.eventName);
     if (data.eventAttrList) {
       setEventAttrList(_toConsumableArray(data.eventAttrList));
@@ -111,7 +115,7 @@ var CreateMeta = function CreateMeta(props) {
             });
             return _context.abrupt("return");
           case 11:
-            //吧参数传递给主页面
+            //把参数传递给主页面
             if (props.onSubmit) {
               if (props.data) {
                 props.onSubmit(_objectSpread(_objectSpread({}, props.data), {}, {
@@ -121,33 +125,19 @@ var CreateMeta = function CreateMeta(props) {
                 props.onSubmit({
                   eventName: values.eventName,
                   aliasName: values.aliasName,
-                  triggeringOccasion: values.triggeringOccasion,
-                  del: 1,
-                  eventAttrList: eventAttrList
+                  triggeringOccasion: triTagInput,
+                  eventAttrList: eventAttrList,
+                  businessLabelId: values.businessLabelId,
+                  triggerLabelId: triTagId,
+                  businessLabel: bizTag.filter(function (res) {
+                    return res.id == values.businessLabelId;
+                  })[0],
+                  triggerLabel: triTag.filter(function (res) {
+                    return res.id == values.businessLabelId;
+                  })[0]
                 }, 'create');
               }
             }
-            // request<any>(apis.createEvent, {
-            //   method: 'POST',
-            //   data: {
-            //     app_id: currentApp?.appId,
-            //     eventName: values.eventName,
-            //     aliasName: values.aliasName,
-            //     triggeringOccasion: values.triggeringOccasion,
-            //     eventAttrList,
-            //   },
-            // }).then((res) => {
-            //   if (res?.code === '100000') {
-            //     notification.success({
-            //       message: '保存成功',
-            //     });
-            //     props.onSubmit && props.onSubmit();
-            //   } else {
-            //     notification.error({
-            //       message: '保存失败',
-            //     });
-            //   }
-            // });
             _context.next = 17;
             break;
           case 14:
@@ -433,6 +423,8 @@ var CreateMeta = function CreateMeta(props) {
   useEffect(function () {
     var _Y = getTableScroll(545, 'dataManageCreateMetaTable');
     setScrollY(_Y);
+    getTagList(2);
+    getTagList(3);
   }, []);
   var onClose = function onClose() {
     if (isChange) {
@@ -461,11 +453,58 @@ var CreateMeta = function CreateMeta(props) {
       })));
     }
   };
-  // 自定义验证规则
-  var _useState17 = useState(''),
+  //标签列表数据 2:业务标签 3:触发标签
+  var _useState17 = useState([]),
     _useState18 = _slicedToArray(_useState17, 2),
-    inputText = _useState18[0],
-    setInputText = _useState18[1];
+    bizTag = _useState18[0],
+    setBizTag = _useState18[1];
+  var _useState19 = useState(),
+    _useState20 = _slicedToArray(_useState19, 2),
+    triTagInput = _useState20[0],
+    setTriTagInput = _useState20[1];
+  var _useState21 = useState([]),
+    _useState22 = _slicedToArray(_useState21, 2),
+    triTag = _useState22[0],
+    setTriTag = _useState22[1];
+  var _useState23 = useState(),
+    _useState24 = _slicedToArray(_useState23, 2),
+    triTagId = _useState24[0],
+    setTriTagId = _useState24[1];
+  var getTagList = function getTagList(type) {
+    request(apis.dict.getTagList, {
+      method: 'post',
+      data: {
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+        labelType: type
+      }
+    }).then(function (res) {
+      if (res && res.code == '100000') {
+        switch (type) {
+          case 2:
+            setBizTag(res.data.map(function (res) {
+              return {
+                label: res.labelName,
+                value: res.id
+              };
+            }));
+            break;
+          case 3:
+            setTriTag(res.data.map(function (res) {
+              return {
+                label: res.labelName,
+                value: res.id
+              };
+            }));
+            break;
+        }
+      }
+    });
+  };
+  // 自定义验证规则
+  var _useState25 = useState(''),
+    _useState26 = _slicedToArray(_useState25, 2),
+    inputText = _useState26[0],
+    setInputText = _useState26[1];
   // true 验证通过
   var validateContainsUnderscore = function validateContainsUnderscore(value) {
     if (!isChange) {
@@ -502,7 +541,7 @@ var CreateMeta = function CreateMeta(props) {
     initialValues: {
       eventName: '',
       aliasName: '',
-      triggeringOccasion: '',
+      businessLabelId: undefined,
       maidianID: []
     }
   }, homeType == 'create' && (/*#__PURE__*/React.createElement(Form.Item, {
@@ -567,14 +606,10 @@ var CreateMeta = function CreateMeta(props) {
     },
     disabled: homeType == 'update' || homeType == 'get',
     placeholder: "\u8BF7\u8F93\u5165\u89E6\u53D1\u6807\u7B7E",
-    options: [{
-      label: '业务标签1',
-      value: '111'
-    }, {
-      label: '业务标签2',
-      value: 'tagJson'
-    }],
-    onChange: function onChange() {
+    defaultValue: triTagId,
+    options: triTag,
+    onChange: function onChange(value) {
+      setTriTagId(value);
       setIsChange(true);
     }
   }), "\u6216", /*#__PURE__*/React.createElement(Input, {
@@ -585,25 +620,21 @@ var CreateMeta = function CreateMeta(props) {
       marginLeft: '10px'
     },
     placeholder: "\u8BF7\u8F93\u5165\u89E6\u53D1\u65F6\u673A\uFF0C\u4F8B\u5982\uFF1A\u7528\u6237\u70B9\u51FB\u786E\u8BA4\u6309\u94AE",
+    defaultValue: triTagInput,
     showCount: true,
     maxLength: 128,
     onChange: function onChange(e) {
+      setTriTagInput(e.target.value);
       setIsChange(true);
     }
   })), /*#__PURE__*/React.createElement(Form.Item, {
-    name: "triggeringOccasion1",
+    name: "businessLabelId",
     label: "\u4E1A\u52A1\u6807\u7B7E"
   }, /*#__PURE__*/React.createElement(Select, {
     allowClear: true,
     disabled: homeType == 'update' || homeType == 'get',
     placeholder: "\u8BF7\u8F93\u5165\u4E1A\u52A1\u6807\u7B7E",
-    options: [{
-      label: '业务标签1',
-      value: '111'
-    }, {
-      label: '业务标签2',
-      value: 'tagJson'
-    }],
+    options: bizTag,
     onChange: function onChange() {
       setIsChange(true);
     }

package/es/modules/pointMap/pageInfo.js

@@ -168,7 +168,6 @@ var PageInfo = function PageInfo(props) {
     recordShow = _useState52[0],
     setRecordShow = _useState52[1];
   useEffect(function () {
-    // console.log('props.pageData', props.pageData);
     if (!props.pageData) {
       setIsEmpty(true);
     } else {
@@ -176,7 +175,6 @@ var PageInfo = function PageInfo(props) {
     }
   }, [props.pageData, props.refreshKey]);
   useEffect(function () {
-    // console.log('props.pageData', props.pageData);
     props.onChangePageStatus && props.onChangePageStatus(isEdit);
   }, [isEdit]);
   var getPageConfig = function getPageConfig() {
@@ -217,7 +215,10 @@ var PageInfo = function PageInfo(props) {
               index: index,
               approvalStatus: item.approvalStatus,
               operationType: item.operationType,
-              isOnline: item.isOnline || 0
+              isOnline: item.isOnline || 0,
+              businessLabel: item.businessLabel,
+              triggerLabel: item.triggerLabel,
+              labels: item.labels
             };
           }) : []);
           //计算出当前上线和下线总合数量
@@ -518,18 +519,18 @@ var PageInfo = function PageInfo(props) {
         className: "".concat(classPrefix, "-content-popoverTag-item")
       }, /*#__PURE__*/React.createElement("span", {
         className: "".concat(classPrefix, "-content-popoverTag-label")
-      }, "\u4E1A\u52A1\u6807\u7B7E:"), /*#__PURE__*/React.createElement(Tag, {
+      }, "\u4E1A\u52A1\u6807\u7B7E:"), record.businessLabel && /*#__PURE__*/React.createElement(Tag, {
         color: "blue"
-      }, "\u4E1A\u52A1\u6807\u7B7E1")), /*#__PURE__*/React.createElement("div", {
+      }, record.businessLabel.labelName)), /*#__PURE__*/React.createElement("div", {
         className: "".concat(classPrefix, "-content-popoverTag-item")
       }, /*#__PURE__*/React.createElement("span", {
         className: "".concat(classPrefix, "-content-popoverTag-label")
-      }, "\u89E6\u53D1\u6807\u7B7E:"), /*#__PURE__*/React.createElement(Tag, {
+      }, "\u89E6\u53D1\u6807\u7B7E:"), record.triggerLabel && /*#__PURE__*/React.createElement(Tag, {
         color: "orange"
-      }, "\u89E6\u53D1\u6807\u7B7E")));
+      }, record.triggerLabel.labelName)));
       return /*#__PURE__*/React.createElement(Popover, {
         content: content,
-        title: eventName || ''
+        title: sliceName(record) || ''
       }, /*#__PURE__*/React.createElement("a", {
         onClick: function onClick() {
           if (!isSelect) {
@@ -552,7 +553,7 @@ var PageInfo = function PageInfo(props) {
             setMetaDataIndex(index);
           }
         }
-      }, eventName ? eventName : '选择元事件', !eventName && /*#__PURE__*/React.createElement(IconFont, {
+      }, eventName ? sliceName(record) : '选择元事件', !eventName && /*#__PURE__*/React.createElement(IconFont, {
         type: "zhuanfa",
         style: {
           marginLeft: 8
@@ -883,20 +884,16 @@ var PageInfo = function PageInfo(props) {
   //设置新添加的元事件
   var onEventSet = function onEventSet(data, type) {
     if (type == 'create') {
-      setEventAttrList([{
-        eventName: data.eventName,
-        triggeringOccasion: data.triggeringOccasion,
-        aliasName: data.aliasName,
+      setEventAttrList([_objectSpread(_objectSpread({}, data), {}, {
         describe: '',
         pointSelect: undefined,
         imgPath: '',
         index: eventAttrList.length,
         key: new Date() * 1,
-        eventAttrList: data.eventAttrList,
         pageName: pageName,
         pageId: id,
         pageImgUrl: imgPath
-      }].concat(_toConsumableArray(eventAttrList)));
+      })].concat(_toConsumableArray(eventAttrList)));
       setShowIndex(eventAttrList.length);
       setTimeout(function () {
         setShowIndex(void 0);
@@ -914,6 +911,21 @@ var PageInfo = function PageInfo(props) {
     setRecordShow(true);
     setEventData(row);
   };
+  //拼接名称
+  var sliceName = function sliceName(record) {
+    var _record$businessLabel, _record$triggerLabel;
+    var point = props.pageData && props.pageData.labels && props.pageData.labels.filter(function (res) {
+      return res.labelType == 1;
+    }).map(function (res) {
+      return res.labelName || res.label;
+    }).join('_') || '';
+    var biz = (record === null || record === void 0 ? void 0 : record.businessLabel) && ((_record$businessLabel = record.businessLabel) === null || _record$businessLabel === void 0 ? void 0 : _record$businessLabel.labelName) || '';
+    var trig = (record === null || record === void 0 ? void 0 : record.triggerLabel) && ((_record$triggerLabel = record.triggerLabel) === null || _record$triggerLabel === void 0 ? void 0 : _record$triggerLabel.labelName) || '' || '';
+    var arr = [biz, point, trig, record.eventName].filter(function (res) {
+      return res;
+    }).join('-');
+    return arr;
+  };
   return /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix)
   }, /*#__PURE__*/React.createElement("div", {
@@ -1173,6 +1185,7 @@ var PageInfo = function PageInfo(props) {
     isEdit: true,
     onSubmit: function onSubmit(event, type) {
       setCreateMetaShow(false);
+      // console.log(event, '事件内容');
       onEventSet(event, type);
     },
     // selectTreeName={props.selectTreeName}

package/es/modules/pointMap/styles/index.less

@@ -154,4 +154,12 @@
       cursor: pointer;
     }
   }
+  .ant-form-item-control-input-content {
+    display: flex;
+    align-items: center;
+  }
+  .ant-select-disabled.ant-select:not(.ant-select-customize-input) .ant-select-selector {
+    color: #021429;
+    background-color: #f2f3f4;
+  }
 }