@zgfe/modules-dm 1.0.57-zhongyuan.36 → 1.0.57-zhongyuan.38

package/es/constants/api.d.ts

@@ -89,6 +89,7 @@ declare let apis: {
         downloadTemple: string;
         allOpenStatus: string;
         checkStatus: string;
+        checkExists: string;
     };
     clearRule: {
         getList: string;

package/es/constants/api.js

@@ -152,7 +152,8 @@ var apis = {
     exportFile: '/zg/web/v2/verify/report/export',
     downloadTemple: '/zg/web/v2/verify/downloadMould',
     allOpenStatus: '/zg/web/v2/verify/statusMain',
-    checkStatus: '/zg/web/v2/verify/statusBefore'
+    checkStatus: '/zg/web/v2/verify/statusBefore',
+    checkExists: '/zg/web/v2/verify/checkExists'
   },
   clearRule: {
     getList: '/zg/web/v2/rinseShiftRule/queryRinseShiftRuleList',

package/es/modules/clearRule/addRule.js

@@ -237,6 +237,23 @@ var AddRule = function AddRule(_ref) {
       setBizAttributeSelectorValue(undefined);
       setOptions([].concat(initOptions));
     } else {
+      // 先查询是否有属性规则一开启的
+      request(apis.rule.checkExists, {
+        method: 'post',
+        data: {
+          appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+          event: event.id,
+          attr: attr === null || attr === void 0 ? void 0 : attr.id
+        }
+      }).then(function (res) {
+        if (!res) return;
+        if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
+          // 判断属性是否已经存在
+          var exists = res.data; // 假设后端返回的数据结构中有一个字段表示是否存在
+          !exists && message.error('该属性的规则已存在，请重新选择属性！');
+          return;
+        }
+      });
       var _value = attr.propCategory === 'eventProp' ? attr.id : attr.name;
       setBizAttributeSelectorValue(_objectSpread(_objectSpread({}, attr), {}, {
         value: _value
@@ -351,9 +368,7 @@ var AddRule = function AddRule(_ref) {
     value: selectType
   }, /*#__PURE__*/React.createElement(Radio, {
     value: 'eventProp'
-  }, "\u4E8B\u4EF6\u5C5E\u6027\u6821\u9A8C"), /*#__PURE__*/React.createElement(Radio, {
-    value: 'user'
-  }, "\u89D2\u8272\u5C5E\u6027\u6821\u9A8C")), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("div", {
+  }, "\u4E8B\u4EF6\u5C5E\u6027\u6821\u9A8C")), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("div", {
     className: "selectVent"
   }, selectType == 'eventProp' && (/*#__PURE__*/React.createElement(BizEventSelector, {
     showAllEvent: true,
@@ -368,9 +383,9 @@ var AddRule = function AddRule(_ref) {
     onChange: onChangeEvent,
     placeholder: "\u8BF7\u9009\u62E9\u4E8B\u4EF6"
   })), /*#__PURE__*/React.createElement(BizAttributeSelector, {
-    enableEventProp: true,
-    enableUserProp: selectType == 'user',
-    enableEnvProp: true,
+    enableEventProp: selectType == 'eventProp',
+    enableUserProp: false,
+    enableEnvProp: false,
     eventIdList: [event === null || event === void 0 ? void 0 : event.id],
     value: bizAttributeSelectorValue,
     enableDelete: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.57-zhongyuan.36",
+  "version": "1.0.57-zhongyuan.38",
   "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": "1da02426fe2a2811b2a33f91b8b727af0c7deb32",
+  "gitHead": "905d25ce59c27bb99555fbd6f7ec1e1754df5ea1",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }