@zgfe/business-lib 1.2.70-hxd.9 → 1.2.71-hxd.1

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

@@ -151,11 +151,12 @@ var FormulaContainer = /*#__PURE__*/React.forwardRef(function (props, ref) {
   }, /*#__PURE__*/React.createElement(Input, {
     style: {
       marginLeft: 16,
-      borderWidth: 0
+      borderWidth: 0,
+      width: 245
     },
     type: "number",
     value: fieldValue,
-    placeholder: "\u8BF7\u8F93\u5165\u6700\u5C0F\u503C",
+    placeholder: "\u8BF7\u8F93\u5165\u6700\u5C0F\u503C\uFF0C\u53D6\u503C\u5305\u542B\u6700\u5C0F\u503C",
     onChange: function onChange(e) {
       var _e$target$value;
       e.persist();
@@ -167,11 +168,12 @@ var FormulaContainer = /*#__PURE__*/React.forwardRef(function (props, ref) {
   }), /*#__PURE__*/React.createElement(Input, {
     style: {
       marginLeft: 16,
-      borderWidth: 0
+      borderWidth: 0,
+      width: 245
     },
     type: "number",
     value: fieldMaxValue,
-    placeholder: "\u8BF7\u8F93\u5165\u6700\u5927\u503C",
+    placeholder: "\u8BF7\u8F93\u5165\u6700\u5927\u503C\uFF0C\u53D6\u503C\u4E0D\u542B\u6700\u5927\u503C",
     onChange: function onChange(e) {
       var _e$target$value2;
       e.persist();

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

@@ -1,86 +1,86 @@
-@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;
-  }
-}
+@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/panel/cdpCshCondition.js

@@ -17,7 +17,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useContext, useEffect, useState } from 'react';
 import BizSelect from '../../../select';
 import { isArray } from 'lodash';
-import { numberAUMOperate, numberTypeCsh } from '../../../attrConditions/utils/operates';
+import { numberOperate, numberTypeCsh } from '../../../attrConditions/utils/operates';
 import { Input } from 'antd';
 import request from '../../../utils/ajax';
 import Apis from '../../../constants/apis';
@@ -302,7 +302,7 @@ var RenderByType = function RenderByType(props) {
     onChange: onCalculateChange
   }), /*#__PURE__*/React.createElement(BizSelect, {
     className: "".concat(classPrefix, "-select-condition"),
-    options: numberAUMOperate,
+    options: numberOperate,
     labelField: "name",
     keyField: "value",
     overlayWidth: 96,