@zgfe/business-lib 1.2.32 → 1.2.33-beiming.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.js

@@ -28,13 +28,17 @@ var FormulaContainer = /*#__PURE__*/React.forwardRef(function (props, ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     fieldValue = _useState6[0],
     setFieldValue = _useState6[1];
+  var _useState7 = useState(),
+    _useState8 = _slicedToArray(_useState7, 2),
+    fieldMaxValue = _useState8[0],
+    setFieldMaxValue = _useState8[1];
   useEffect(function () {
     init();
   }, []);
   useEffect(function () {
     var item = formatTarget(targetList, 1);
-    props.onChange && props.onChange(item.formulaList, item.formula, operator === null || operator === void 0 ? void 0 : operator.value, fieldValue);
-  }, [targetList, operator, fieldValue]);
+    props.onChange && props.onChange(item.formulaList, item.formula, operator === null || operator === void 0 ? void 0 : operator.value, fieldValue, fieldMaxValue);
+  }, [targetList, operator, fieldValue, fieldMaxValue]);
   useImperativeHandle(ref, function () {
     return {
       reset: init
@@ -45,6 +49,7 @@ var FormulaContainer = /*#__PURE__*/React.forwardRef(function (props, ref) {
       value: props.operator
     });
     setFieldValue(props.fieldValue);
+    setFieldMaxValue(props.fieldMaxValue);
     setTargetList(targetsFormat(props.formula, props.value, 1));
   };
   var _onChange = function onChange(index, data) {
@@ -138,14 +143,18 @@ var FormulaContainer = /*#__PURE__*/React.forwardRef(function (props, ref) {
     overlayWidth: 96,
     value: operator,
     onChange: onOperateChange
-  }), /*#__PURE__*/React.createElement(Input, {
+  }), operator && operator.value === 'between' ? /*#__PURE__*/React.createElement("span", {
+    style: {
+      display: 'flex'
+    }
+  }, /*#__PURE__*/React.createElement(Input, {
     style: {
       marginLeft: 16,
       borderWidth: 0
     },
     type: "number",
     value: fieldValue,
-    placeholder: "\u8BF7\u8F93\u5165",
+    placeholder: "\u8BF7\u8F93\u5165\u6700\u5C0F\u503C",
     onChange: function onChange(e) {
       var _e$target$value;
       e.persist();
@@ -154,6 +163,38 @@ var FormulaContainer = /*#__PURE__*/React.forwardRef(function (props, ref) {
       var dealStr = xsStr ? str.split('.')[0] + '.' + xsStr : str;
       setFieldValue(dealStr);
     }
+  }), /*#__PURE__*/React.createElement(Input, {
+    style: {
+      marginLeft: 16,
+      borderWidth: 0
+    },
+    type: "number",
+    value: fieldMaxValue,
+    placeholder: "\u8BF7\u8F93\u5165\u6700\u5927\u503C",
+    onChange: function onChange(e) {
+      var _e$target$value2;
+      e.persist();
+      var str = (_e$target$value2 = e.target.value) === null || _e$target$value2 === void 0 ? void 0 : _e$target$value2.slice(0, 20);
+      var xsStr = str.split('.')[1] ? str.split('.')[1].slice(0, 2) : '';
+      var dealStr = xsStr ? str.split('.')[0] + '.' + xsStr : str;
+      setFieldMaxValue(dealStr);
+    }
+  })) : /*#__PURE__*/React.createElement(Input, {
+    style: {
+      marginLeft: 16,
+      borderWidth: 0
+    },
+    type: "number",
+    value: fieldValue,
+    placeholder: "\u8BF7\u8F93\u5165",
+    onChange: function onChange(e) {
+      var _e$target$value3;
+      e.persist();
+      var str = (_e$target$value3 = e.target.value) === null || _e$target$value3 === void 0 ? void 0 : _e$target$value3.slice(0, 20);
+      var xsStr = str.split('.')[1] ? str.split('.')[1].slice(0, 2) : '';
+      var dealStr = xsStr ? str.split('.')[0] + '.' + xsStr : str;
+      setFieldValue(dealStr);
+    }
   }), /*#__PURE__*/React.createElement(IconFont, {
     style: {
       marginLeft: 16

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

@@ -1,82 +1,82 @@
-@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;
+  &-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;
+  }
+}

package/es/AUMFormulaTarget/components/formula/types.d.ts

@@ -6,7 +6,8 @@ export declare namespace FormulaContainerTypes {
         resultFormat?: string;
         operator?: string;
         fieldValue?: string;
-        onChange?: (formulaList: TargetConditionTypes.Value[], formula: string, operator?: string, fieldValue?: string) => void;
+        fieldMaxValue?: string;
+        onChange?: (formulaList: TargetConditionTypes.Value[], formula: string, operator?: string, fieldValue?: string, fieldMaxValue?: string) => void;
     }
     type Value = null | string | TargetConditionTypes.Value;
     interface FormulaItemValue {