@zgfe/business-lib 1.2.57 → 1.2.66-hxd.2

package/README.md

@@ -1,12 +1,12 @@
-## 规范
-
-### 样式命名规范
-
-biz-组件名或缩写-具体样式比如 layout 组件的左侧栏命名: biz-layout-left
-
-## 注意事项
-
-### 样式命名
-
-1. 命名上注意语义化，尽量减少语义不明的命名，比如 left、main、center 之类的
-2. className 的命名，统一采用 class-name，不要用驼峰命名
+## 规范
+
+### 样式命名规范
+
+biz-组件名或缩写-具体样式比如 layout 组件的左侧栏命名: biz-layout-left
+
+## 注意事项
+
+### 样式命名
+
+1. 命名上注意语义化，尽量减少语义不明的命名，比如 left、main、center 之类的
+2. className 的命名，统一采用 class-name，不要用驼峰命名

package/config.js

@@ -1,41 +1,41 @@
-const fs = require('fs');
-const path = require('path');
-
-/**
- * 对关键配置信息进行本地化存储，避免多人项目配置代码冲突
- * @param defaultConfig
- * @returns
- */
-function getConfig(defaultConfig, basePath) {
-  const configPath = path.resolve(basePath, '.config.json');
-  let resConfig = defaultConfig;
-  try {
-    if (fs.existsSync(configPath)) {
-      const config = fs.readFileSync(configPath, 'utf-8');
-      if (!config || config === '{}') {
-        throw new Error('配置文件为空');
-      }
-      const configObj = JSON.parse(config);
-      // 如果读取的配置文件，数据结构与默认配置不一致，则更新配置文件，更新规则：以默认配置为准，保留用户自定义配置
-      const isSame = Object.keys(defaultConfig).every((key) => {
-        return configObj.hasOwnProperty(key);
-      });
-      if (!isSame) {
-        resConfig = Object.assign({}, defaultConfig, configObj);
-        throw new Error('配置文件数据结构不一致');
-      }
-      resConfig = configObj;
-    } else {
-      throw new Error('配置文件不存在');
-    }
-  } catch (e) {
-    console.log(e.message);
-    fs.writeFileSync(configPath, JSON.stringify(resConfig, null, 2));
-  }
-  console.log('配置详情', resConfig);
-  return resConfig;
-}
-
-module.exports = {
-  getConfig,
-};
+const fs = require('fs');
+const path = require('path');
+
+/**
+ * 对关键配置信息进行本地化存储，避免多人项目配置代码冲突
+ * @param defaultConfig
+ * @returns
+ */
+function getConfig(defaultConfig, basePath) {
+  const configPath = path.resolve(basePath, '.config.json');
+  let resConfig = defaultConfig;
+  try {
+    if (fs.existsSync(configPath)) {
+      const config = fs.readFileSync(configPath, 'utf-8');
+      if (!config || config === '{}') {
+        throw new Error('配置文件为空');
+      }
+      const configObj = JSON.parse(config);
+      // 如果读取的配置文件，数据结构与默认配置不一致，则更新配置文件，更新规则：以默认配置为准，保留用户自定义配置
+      const isSame = Object.keys(defaultConfig).every((key) => {
+        return configObj.hasOwnProperty(key);
+      });
+      if (!isSame) {
+        resConfig = Object.assign({}, defaultConfig, configObj);
+        throw new Error('配置文件数据结构不一致');
+      }
+      resConfig = configObj;
+    } else {
+      throw new Error('配置文件不存在');
+    }
+  } catch (e) {
+    console.log(e.message);
+    fs.writeFileSync(configPath, JSON.stringify(resConfig, null, 2));
+  }
+  console.log('配置详情', resConfig);
+  return resConfig;
+}
+
+module.exports = {
+  getConfig,
+};

package/es/AUMFormulaTarget/components/formula/index.less

@@ -1,82 +1,86 @@
-@import '../../../assets/styles/inner.less';
-
-.aum-formula-container {
-  display: flex;
-  flex-wrap: wrap;
-  align-items: center;
-  line-height: 48px;
-  &-target {
-    display: flex;
-    &:hover {
-      .formula-container-option:not(.active) {
-        display: flex;
-        color: #b9ceff;
-        &.disabled {
-          color: #ccd0d4;
-        }
-      }
-    }
-    &-handle {
-      min-width: 88px;
-      // min-width: 184px;
-      &.focus {
-        .biz-select-handle-input {
-          border-color: @primary-color;
-        }
-      }
-      &-icon {
-        margin-left: 4px;
-        color: @text-color-middle;
-      }
-      &-name {
-        margin-left: 4px;
-      }
-    }
-  }
-
-  &-format {
-    display: flex;
-    align-items: center;
-    margin-left: 16px;
-    & > span {
-      margin-right: 12px;
-    }
-    & > span:hover {
-      color: @error-color;
-    }
-
-    .biz-select-handle {
-      min-width: 136px;
-    }
-  }
-  &-add {
-    margin-left: 16px;
-    color: @primary-color;
-    font-size: 18px !important;
-    cursor: pointer;
-  }
-  &-option {
-    display: flex;
-    align-items: center;
-    color: transparent;
-    cursor: pointer;
-    &.active {
-      display: flex;
-      color: #354354;
-    }
-    &.disabled {
-      cursor: not-allowed;
-    }
-
-    &:first-child {
-      margin-right: 4px;
-    }
-    &:last-child {
-      margin-left: 4px;
-    }
-  }
-
-  &-symbol {
-    margin: 0 12px;
-  }
-}
+@import '../../../assets/styles/inner.less';
+
+.aum-formula-container {
+  display: flex;
+  flex-wrap: wrap;
+  // align-items: center;
+  line-height: 48px;
+  .formula-symbol {
+    margin-top: 16px;
+  }
+  &-target {
+    display: flex;
+    &:hover {
+      .formula-container-option:not(.active) {
+        display: flex;
+        color: #b9ceff;
+        &.disabled {
+          color: #ccd0d4;
+        }
+      }
+    }
+    &-handle {
+      min-width: 88px;
+      // min-width: 184px;
+      &.focus {
+        .biz-select-handle-input {
+          border-color: @primary-color;
+        }
+      }
+      &-icon {
+        margin-left: 4px;
+        color: @text-color-middle;
+      }
+      &-name {
+        margin-left: 4px;
+      }
+    }
+  }
+
+  &-format {
+    display: flex;
+    align-items: center;
+    height: 48px;
+    margin-left: 16px;
+    & > span {
+      margin-right: 12px;
+    }
+    & > span:hover {
+      color: @error-color;
+    }
+
+    .biz-select-handle {
+      min-width: 136px;
+    }
+  }
+  &-add {
+    margin-left: 16px;
+    color: @primary-color;
+    font-size: 18px !important;
+    cursor: pointer;
+  }
+  &-option {
+    display: flex;
+    align-items: center;
+    color: transparent;
+    cursor: pointer;
+    &.active {
+      display: flex;
+      color: #354354;
+    }
+    &.disabled {
+      cursor: not-allowed;
+    }
+
+    &:first-child {
+      margin-right: 4px;
+    }
+    &:last-child {
+      margin-left: 4px;
+    }
+  }
+
+  &-symbol {
+    margin: 0 12px;
+  }
+}

package/es/AUMFormulaTarget/components/formulaItem/index.js

@@ -18,6 +18,8 @@ import FormulaPanel from '../panel';
 import _ from 'lodash';
 import { BizValidatorContext } from '../../../context';
 import { FormulaTypes } from '../panel/types';
+import request from '../../../utils/ajax';
+import Apis from '../../../constants/apis';
 var FormulaItem = function FormulaItem(props) {
   var _useState = useState(props.value),
     _useState2 = _slicedToArray(_useState, 2),
@@ -48,6 +50,10 @@ var FormulaItem = function FormulaItem(props) {
     setOpen = _useState12[1];
   var panelRef = useRef(null);
   var handleRef = useRef(null);
+  var _useState13 = useState(),
+    _useState14 = _slicedToArray(_useState13, 2),
+    eventRemovedList = _useState14[0],
+    setEventRemovedList = _useState14[1];
   useEffect(function () {
     window.addEventListener('click', handleClick);
     return function () {
@@ -56,21 +62,27 @@ var FormulaItem = function FormulaItem(props) {
   }, [open, formulaValue]);
   useEffect(function () {
     var condition = formulaValue === null || formulaValue === void 0 ? void 0 : formulaValue.condition;
-    setLabel((condition === null || condition === void 0 ? void 0 : condition.eventName) || (condition === null || condition === void 0 ? void 0 : condition.datasetName) || '');
-    if (condition) {
-      if ((condition === null || condition === void 0 ? void 0 : condition.type) === FormulaTypes.EVENT) {
-        setDimension(getDimension(currentApp, condition.analysisDimension, condition.eventId, eventGroupList));
-        setHaveFilter(judgeHaveFilter(condition.filters));
-      } else {
-        setHaveFilter(!!(condition.filters || []).length);
-        setDimension(condition.fieldName || '');
-      }
-    } else {
+    if (formulaValue && formulaValue.condition && (eventRemovedList === null || eventRemovedList === void 0 ? void 0 : eventRemovedList.includes(formulaValue.condition.eventId))) {
+      setLabel('');
       setDimension('');
       setHaveFilter(false);
+    } else {
+      setLabel((condition === null || condition === void 0 ? void 0 : condition.eventName) || (condition === null || condition === void 0 ? void 0 : condition.datasetName) || '');
+      if (condition) {
+        if ((condition === null || condition === void 0 ? void 0 : condition.type) === FormulaTypes.EVENT) {
+          setDimension(getDimension(currentApp, condition.analysisDimension, condition.eventId, eventGroupList));
+          setHaveFilter(judgeHaveFilter(condition.filters));
+        } else {
+          setHaveFilter(!!(condition.filters || []).length);
+          setDimension(condition.fieldName || '');
+        }
+      } else {
+        setDimension('');
+        setHaveFilter(false);
+      }
     }
     props.onChange && props.onChange(formulaValue);
-  }, [formulaValue]);
+  }, [formulaValue, eventRemovedList]);
   var handleClick = function handleClick(e) {
     var _handleRef$current, _panelRef$current;
     var handleClicked = (_handleRef$current = handleRef.current) === null || _handleRef$current === void 0 ? void 0 : _handleRef$current.contains(e.target);
@@ -120,6 +132,23 @@ var FormulaItem = function FormulaItem(props) {
       });
     }, 0);
   };
+  function getEventRemoved() {
+    request(Apis.queryEventRemoved, {
+      method: 'post',
+      data: {
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
+      }
+    }).then(function (res) {
+      if ((res === null || res === void 0 ? void 0 : res.code) === '100000') {
+        setEventRemovedList(res === null || res === void 0 ? void 0 : res.data);
+      }
+    }).catch(function (err) {
+      console.error(err);
+    });
+  }
+  useEffect(function () {
+    getEventRemoved();
+  }, []);
   return /*#__PURE__*/React.createElement(BizValidatorContext.Provider, {
     value: {
       isValidate: isValidate,
@@ -128,7 +157,11 @@ var FormulaItem = function FormulaItem(props) {
       }
     }
   }, /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-target")
+    className: "".concat(classPrefix, "-target"),
+    style: {
+      flexDirection: 'column',
+      marginTop: 8
+    }
   }, /*#__PURE__*/React.createElement(Dropdown, {
     dropdownRender: function dropdownRender() {
       return /*#__PURE__*/React.createElement(FormulaPanel, {
@@ -164,6 +197,12 @@ var FormulaItem = function FormulaItem(props) {
     type: "a-shaixuan2"
   }) : null, /*#__PURE__*/React.createElement("span", {
     className: "".concat(classPrefix, "-target-handle-name")
-  }, dimension))))));
+  }, dimension)))), formulaValue && formulaValue.condition && (eventRemovedList === null || eventRemovedList === void 0 ? void 0 : eventRemovedList.includes(formulaValue.condition.eventId)) && /*#__PURE__*/React.createElement("div", {
+    style: {
+      color: '#FB5547',
+      height: 20,
+      lineHeight: '20px'
+    }
+  }, "\u4E8B\u4EF6\u5DF2\u88AB\u5220\u9664\uFF0C\u8BF7\u91CD\u65B0\u9009\u62E9")));
 };
 export default FormulaItem;