@bit-sun/business-component 3.1.5 → 3.1.6

package/src/components/Solution/RuleComponent/services.ts

@@ -1,13 +1,13 @@
-import request from '@/utils/request';
-
-// 查询规则对象属性thresholdList
-export async function getRegularThresholdRange(params: any) {
-  return request({
-    url:  `/basic/regularThresholdRange/getVals/${params.queryIdentify}`,
-    method: 'POST',
-    data: {
-      ...params,
-      queryIdentify: undefined,
-    },
-});
-}
+import request from '@/utils/request';
+
+// 查询规则对象属性thresholdList
+export async function getRegularThresholdRange(params: any) {
+  return request({
+    url:  `/basic/regularThresholdRange/getVals/${params.queryIdentify}`,
+    method: 'POST',
+    data: {
+      ...params,
+      queryIdentify: undefined,
+    },
+});
+}

package/src/components/Solution/RuleComponent/util.js

@@ -1,143 +1,143 @@
-import _ from 'lodash';
-
-//规则对象(属性code)及对应枚举值查询参数 查询URL关系映射
-export const queryIdentityInfo = [
-  {
-    // identity: 'MO005.member.memberLevelCode', //订单明细-会员-会员等级
-    identity: 'memberLevelCode', //会员等级
-    queryParam: [
-      {
-        mapKey: 'memberCardCode',
-        isRequired: true,
-        queryKey: 'qp-entityCode-eq',
-      },
-    ],
-  },
-  {
-    // identity: 'MO005.member.memberLevelCode', //订单明细-会员-会员等级
-    identity: 'member_level_code', //会员等级
-    queryParam: [
-      {
-        mapKey: 'memberCardCode',
-        isRequired: true,
-        queryKey: 'qp-entityCode-eq',
-      },
-    ],
-  },
-  {
-    identity: 'maintain_store_code', //维护店铺
-    requestUrl: '/crowdCondition/store', //定义需特殊请求枚举值(枚举的请求规则直接和后端开发约定不在规则对象里配置)的请求url
-    queryParam: [
-      {
-        mapKey: 'memberCardCode',
-        isRequired: true,
-        queryKey: 'memberCardCode',
-      },
-      {
-        mapKey: 'maintain_area_code',
-        isRequired: false,
-        queryKey: 'areaCodes',
-      },
-    ],
-  },
-  {
-    identity: 'maintain_area_code', //维护区域
-    requestUrl: '/crowdCondition/area/',
-    queryParam: [
-      {
-        mapKey: 'memberCardCode',
-        isRequired: true,
-        queryKey: 'memberCardCode',
-      },
-    ],
-  },
-];
-
-export const setParams = (queryIdentify, thresholdQuery) => {
-  let querParams = {};
-  let queryCodeList = queryIdentityInfo[queryIdentify] || [];
-  let mapList = queryIdentityInfo.find((item) => item.identity == queryIdentify)
-    ? queryIdentityInfo.find((item) => item.identity == queryIdentify)
-        .queryParam
-    : [];
-  mapList.length &&
-    mapList.forEach((item) => {
-      if (thresholdQuery[item.mapKey]) {
-        if (Array.isArray(thresholdQuery[item.mapKey])) {
-          let validItems = thresholdQuery[item.mapKey].filter((item) => item);
-          if (validItems.length) {
-            querParams[item.queryKey] = validItems.join(',');
-          }
-        } else {
-          querParams[item.queryKey] = thresholdQuery[item.mapKey];
-        }
-      }
-    });
-  return querParams;
-};
-
-//定义规则条件中会影响其他条件项的条件属性code
-export const relateItems = [
-  {
-    propertyCode: 'memberCardCode',
-  },
-  {
-    propertyCode: 'maintain_area_code',
-  },
-];
-
-export const getSpecialPropertyCode = (propertyCode) => {
-  const SPECIAL_OBJECT_PROPERTY_CODE = [
-    //约定属性，需特殊处理查询枚举
-    'maintain_store_code',
-    'maintain_area_code',
-  ];
-  if (SPECIAL_OBJECT_PROPERTY_CODE.indexOf(propertyCode) > -1) {
-    return propertyCode;
-  }
-  return '';
-};
-
-export const getPropertyCode = (code) => {
-  //获取规则对象属性code
-  if (!code) return '';
-  return code.split('.').pop();
-};
-
-export const findChangedThresholdQuery = (oldVal, newVal) => {
-  let oldKeys = Object.keys(oldVal);
-  let newKeys = Object.keys(newVal);
-  let compireKeys = _.uniq([...oldKeys, newKeys]);
-
-  let changedKeys = []; //新 旧参数对象属性值比较，获取值发生改变的属性集合
-  compireKeys.forEach((key) => {
-    if (!_.isEqual(oldVal[key], newVal[key])) {
-      changedKeys.push(key);
-    }
-  });
-
-  let shouldUpdateIdentiy = []; //根据发生改变的属性值过滤出需要重新请求枚举的规则属性
-  queryIdentityInfo.forEach((item) => {
-    if (
-      item.queryParam.some((query) => {
-        if (changedKeys.indexOf(query.mapKey) > -1) return true;
-        return false;
-      })
-    ) {
-      shouldUpdateIdentiy.push(item.identity);
-    }
-  });
-  return shouldUpdateIdentiy;
-};
-
-export const isObj = (object) => {
-  return (
-    object &&
-    typeof object == 'object' &&
-    Object.prototype.toString.call(object).toLowerCase() == '[object object]'
-  );
-};
-
-
-export const dateFormat = 'YYYY-MM-DD';
-export const fullDateFormat = 'YYYY-MM-DD HH:mm:ss';
+import _ from 'lodash';
+
+//规则对象(属性code)及对应枚举值查询参数 查询URL关系映射
+export const queryIdentityInfo = [
+  {
+    // identity: 'MO005.member.memberLevelCode', //订单明细-会员-会员等级
+    identity: 'memberLevelCode', //会员等级
+    queryParam: [
+      {
+        mapKey: 'memberCardCode',
+        isRequired: true,
+        queryKey: 'qp-entityCode-eq',
+      },
+    ],
+  },
+  {
+    // identity: 'MO005.member.memberLevelCode', //订单明细-会员-会员等级
+    identity: 'member_level_code', //会员等级
+    queryParam: [
+      {
+        mapKey: 'memberCardCode',
+        isRequired: true,
+        queryKey: 'qp-entityCode-eq',
+      },
+    ],
+  },
+  {
+    identity: 'maintain_store_code', //维护店铺
+    requestUrl: '/crowdCondition/store', //定义需特殊请求枚举值(枚举的请求规则直接和后端开发约定不在规则对象里配置)的请求url
+    queryParam: [
+      {
+        mapKey: 'memberCardCode',
+        isRequired: true,
+        queryKey: 'memberCardCode',
+      },
+      {
+        mapKey: 'maintain_area_code',
+        isRequired: false,
+        queryKey: 'areaCodes',
+      },
+    ],
+  },
+  {
+    identity: 'maintain_area_code', //维护区域
+    requestUrl: '/crowdCondition/area/',
+    queryParam: [
+      {
+        mapKey: 'memberCardCode',
+        isRequired: true,
+        queryKey: 'memberCardCode',
+      },
+    ],
+  },
+];
+
+export const setParams = (queryIdentify, thresholdQuery) => {
+  let querParams = {};
+  let queryCodeList = queryIdentityInfo[queryIdentify] || [];
+  let mapList = queryIdentityInfo.find((item) => item.identity == queryIdentify)
+    ? queryIdentityInfo.find((item) => item.identity == queryIdentify)
+        .queryParam
+    : [];
+  mapList.length &&
+    mapList.forEach((item) => {
+      if (thresholdQuery[item.mapKey]) {
+        if (Array.isArray(thresholdQuery[item.mapKey])) {
+          let validItems = thresholdQuery[item.mapKey].filter((item) => item);
+          if (validItems.length) {
+            querParams[item.queryKey] = validItems.join(',');
+          }
+        } else {
+          querParams[item.queryKey] = thresholdQuery[item.mapKey];
+        }
+      }
+    });
+  return querParams;
+};
+
+//定义规则条件中会影响其他条件项的条件属性code
+export const relateItems = [
+  {
+    propertyCode: 'memberCardCode',
+  },
+  {
+    propertyCode: 'maintain_area_code',
+  },
+];
+
+export const getSpecialPropertyCode = (propertyCode) => {
+  const SPECIAL_OBJECT_PROPERTY_CODE = [
+    //约定属性，需特殊处理查询枚举
+    'maintain_store_code',
+    'maintain_area_code',
+  ];
+  if (SPECIAL_OBJECT_PROPERTY_CODE.indexOf(propertyCode) > -1) {
+    return propertyCode;
+  }
+  return '';
+};
+
+export const getPropertyCode = (code) => {
+  //获取规则对象属性code
+  if (!code) return '';
+  return code.split('.').pop();
+};
+
+export const findChangedThresholdQuery = (oldVal, newVal) => {
+  let oldKeys = Object.keys(oldVal);
+  let newKeys = Object.keys(newVal);
+  let compireKeys = _.uniq([...oldKeys, newKeys]);
+
+  let changedKeys = []; //新 旧参数对象属性值比较，获取值发生改变的属性集合
+  compireKeys.forEach((key) => {
+    if (!_.isEqual(oldVal[key], newVal[key])) {
+      changedKeys.push(key);
+    }
+  });
+
+  let shouldUpdateIdentiy = []; //根据发生改变的属性值过滤出需要重新请求枚举的规则属性
+  queryIdentityInfo.forEach((item) => {
+    if (
+      item.queryParam.some((query) => {
+        if (changedKeys.indexOf(query.mapKey) > -1) return true;
+        return false;
+      })
+    ) {
+      shouldUpdateIdentiy.push(item.identity);
+    }
+  });
+  return shouldUpdateIdentiy;
+};
+
+export const isObj = (object) => {
+  return (
+    object &&
+    typeof object == 'object' &&
+    Object.prototype.toString.call(object).toLowerCase() == '[object object]'
+  );
+};
+
+
+export const dateFormat = 'YYYY-MM-DD';
+export const fullDateFormat = 'YYYY-MM-DD HH:mm:ss';

package/src/components/Solution/RuleSetter/RuleInstance.tsx

@@ -1,6 +1,6 @@
-import React from 'react';
-import RuleSetter from './index';
-
-export default (props: any) => {
-  return <RuleSetter {...props} type={'instance'} />;
-};
+import React from 'react';
+import RuleSetter from './index';
+
+export default (props: any) => {
+  return <RuleSetter {...props} type={'instance'} />;
+};