@zgfe/modules-settings 1.2.20 → 1.2.21

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

@@ -0,0 +1,30 @@
+.set-data-dialog {
+  .ant-card-head-title {
+    // display: none;
+  }
+
+  .group-config {
+    display: flex;
+    margin-top: 26px;
+
+    .config-name {
+      margin-right: 20px;
+      color: #5f6085;
+      font-size: 14px;
+      white-space: nowrap;
+    }
+
+    .ant-card {
+      width: 100%;
+      border: none;
+
+      .ant-card-head {
+        // display: none;
+      }
+
+      .biz-user-condition {
+        background-color: #fff;
+      }
+    }
+  }
+}

package/es/requests/role.d.ts

@@ -9,6 +9,8 @@ export declare const queryRolePage: (data: {
     userIds: number[];
     menuCodeMap: {};
     settingMenuList: [];
+    authGroupList: [];
+    roleAuthStatus: number;
 }> | null>, queryRoleDataConfig: (data: {
     id: number | null;
 }) => Promise<import("@zgfe/business-lib/es/utils/type").InterfaceApiResult<unknown> | null>, queryRoleMenuTree: (data: {
@@ -22,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",
+  "version": "1.2.21",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "files": [
@@ -51,7 +51,7 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "63405c164be35af509a55cb6e5444be77867fad3",
+  "gitHead": "517512432eafe3a7cdec5cfbef4eff8d644c39d5",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }