@zgfe/business-lib 1.0.0-beta.3 → 1.0.0-beta.6

package/es/dialog/index.d.ts

@@ -1,6 +1,18 @@
 import { FormItemProps, ModalProps } from 'antd';
 import React from 'react';
+interface BizObjectDefaultProps {
+    [key: string]: any;
+}
+interface fieldNamesProps {
+    label: string;
+    value: string;
+}
 interface FieldProps {
+    /**
+     * @description       form.item名称
+     * @default           -
+     */
+    label?: string;
     /**
      * @description       form.item类型
      * @default           input
@@ -11,13 +23,18 @@ interface FieldProps {
      * @default           -
      */
     value?: string | number;
+    /**
+     * @description       form.item 依赖项及其值 {age:20}
+     * @default           -
+     */
+    dependenceFields?: BizObjectDefaultProps;
     /**
      * @description       提示
      * @default           -
      */
     placeholder?: string;
     /**
-     * @description       form.item p排列方向
+     * @description       form.item 排列方向 'horizontal' | 'vertical'
      * @default           horizontal
      */
     direction?: 'horizontal' | 'vertical';
@@ -26,11 +43,26 @@ interface FieldProps {
      * @default           -
      */
     options?: Array<any>;
+    /**
+     * @description   扩展名称
+     * @default       -
+     */
+    extendName?: string;
+    /**
+     * @description   下拉框的自定义节点 label、value
+     * @default      { label: 'label', value: 'value' }
+     */
+    fieldNames?: fieldNamesProps;
     /**
      * @description       影响的表单项
      * @default           -
      */
     children?: Array<string>;
+    /**
+     * @description   值发生改变
+     * @default         -
+     */
+    onChange?: () => void;
 }
 interface BizDialogProps {
     /**
@@ -64,5 +96,5 @@ interface BizDialogProps {
      */
     onCancel?: () => void;
 }
-declare const BizDialog: React.FC<ModalProps & BizDialogProps>;
+declare const BizDialog: React.FC<ModalProps & BizDialogProps & FormItemProps>;
 export default BizDialog;

package/es/dialog/index.js

@@ -1,3 +1,7 @@
+var _excluded = ["width", "initialValues", "fields", "visible", "showMark", "layout", "onOk", "onCancel"];
+
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -24,6 +28,10 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
 import { Form, Input, Modal, Radio, Space } from 'antd';
 import React, { useEffect, useState } from 'react';
 import BizSelectToInput from './components/selectToInput';
@@ -34,8 +42,6 @@ import BizList from './components/list';
 var BizDialog = function BizDialog(props) {
   var _props$width = props.width,
       width = _props$width === void 0 ? 520 : _props$width,
-      _props$title = props.title,
-      title = _props$title === void 0 ? 'Title' : _props$title,
       initialValues = props.initialValues,
       fields = props.fields,
       _props$visible = props.visible,
@@ -45,7 +51,8 @@ var BizDialog = function BizDialog(props) {
       _props$layout = props.layout,
       layout = _props$layout === void 0 ? 'horizontal' : _props$layout,
       _onOk = props.onOk,
-      _onCancel = props.onCancel;
+      _onCancel = props.onCancel,
+      res = _objectWithoutProperties(props, _excluded);
 
   var _Form$useForm = Form.useForm(),
       _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
@@ -56,74 +63,74 @@ var BizDialog = function BizDialog(props) {
       formFields = _useState2[0],
       setFormFields = _useState2[1];
 
-  var getFormItem = function getFormItem(data) {
-    var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'input';
-    var name = arguments.length > 2 ? arguments[2] : undefined;
-    var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
+  var getFormItem = function getFormItem(_ref) {
+    var type = _ref.type,
+        label = _ref.label,
+        options = _ref.options,
+        placeholder = _ref.placeholder,
+        _ref$fieldNames = _ref.fieldNames,
+        fieldNames = _ref$fieldNames === void 0 ? {
+      label: 'label',
+      value: 'value'
+    } : _ref$fieldNames,
+        extendName = _ref.extendName,
+        direction = _ref.direction,
+        onChange = _ref.onChange;
 
     if (type === 'selectToInput') {
       return /*#__PURE__*/React.createElement(BizSelectToInput, {
-        name: name,
+        name: label,
         options: options,
-        onChangeType: function onChangeType(isSelect) {
-          if (data.children && data.children.length > 0) {
-            var children = _toConsumableArray(data.children);
-
-            var arr = [];
-            fields.forEach(function (item) {
-              var field = _objectSpread({}, item);
-
-              if (children.indexOf(item.name) > -1) {
-                field.hidden = isSelect;
-              }
-
-              arr.push(field);
-            });
-            setFormFields(function () {
-              return [].concat(arr);
-            });
-          }
-        }
+        fieldNames: fieldNames,
+        extendName: extendName,
+        onChange: onChange
       });
     } else if (type === 'select') {
       return /*#__PURE__*/React.createElement(BizSelect, {
         options: options,
-        name: name,
-        size: "middle"
+        name: label,
+        size: "middle",
+        onChange: onChange
       });
     } else if (type === 'input') {
       return /*#__PURE__*/React.createElement(Input, {
         className: "biz-input",
-        placeholder: data.placeholder || "\u8BF7\u8F93\u5165".concat(name),
+        placeholder: placeholder || "\u8BF7\u8F93\u5165".concat(label),
         autoComplete: "off",
         allowClear: {
           clearIcon: /*#__PURE__*/React.createElement(IconFont, {
             className: "biz-icon",
             type: 'icon-qingchu'
           })
-        }
+        },
+        onChange: onChange
       });
     } else if (type === 'password') {
       return /*#__PURE__*/React.createElement(Input.Password, {
         className: "biz-input",
-        placeholder: data.placeholder || "\u8BF7\u8F93\u5165".concat(name)
+        placeholder: placeholder || "\u8BF7\u8F93\u5165".concat(label),
+        onChange: onChange
       });
     } else if (type === 'tab') {
       return /*#__PURE__*/React.createElement(BizTab, {
-        options: options
+        options: options,
+        onChange: onChange
       });
     } else if (type === 'radio') {
-      return /*#__PURE__*/React.createElement(Radio.Group, null, /*#__PURE__*/React.createElement(Space, {
-        direction: data.direction || 'horizontal'
-      }, options.map(function (item) {
+      return /*#__PURE__*/React.createElement(Radio.Group, {
+        onChange: onChange
+      }, /*#__PURE__*/React.createElement(Space, {
+        direction: direction || 'horizontal'
+      }, options && options.map(function (item) {
         return /*#__PURE__*/React.createElement(Radio, {
-          key: item.value,
-          value: item.value
-        }, item.label);
+          key: item[fieldNames.value],
+          value: item[fieldNames.value]
+        }, item[fieldNames.label]);
       })));
     } else if (type === 'list') {
       return /*#__PURE__*/React.createElement(BizList, {
-        options: options.length > 0 ? options : undefined
+        options: options && options.length > 0 ? options : undefined,
+        onChange: onChange
       });
     }
   };
@@ -138,11 +145,10 @@ var BizDialog = function BizDialog(props) {
       return _toConsumableArray(fields);
     });
   }, [fields]);
-  return /*#__PURE__*/React.createElement(Modal, {
+  return /*#__PURE__*/React.createElement(Modal, _objectSpread(_objectSpread({
     width: width,
     centered: true,
     visible: visible,
-    title: title,
     maskStyle: {
       background: '#021429',
       opacity: 0.8
@@ -152,7 +158,8 @@ var BizDialog = function BizDialog(props) {
     },
     cancelText: "\u53D6\u6D88",
     okText: "\u786E\u5B9A",
-    closable: false,
+    closable: false
+  }, res), {}, {
     onCancel: function onCancel() {
       return _onCancel && _onCancel();
     },
@@ -163,7 +170,7 @@ var BizDialog = function BizDialog(props) {
         console.log('Validate Failed:', info);
       });
     }
-  }, /*#__PURE__*/React.createElement(Form, {
+  }), /*#__PURE__*/React.createElement(Form, {
     className: "biz-dialog",
     form: form,
     name: "form_in_modal",
@@ -171,17 +178,84 @@ var BizDialog = function BizDialog(props) {
     initialValues: initialValues,
     layout: layout
   }, formFields === null || formFields === void 0 ? void 0 : formFields.map(function (item, index) {
-    return /*#__PURE__*/React.createElement(Form.Item, {
-      key: item.name,
-      label: item.label,
-      name: item.name,
-      hidden: item.hidden,
-      rules: item.rules,
-      help: item.help,
-      wrapperCol: {
-        offset: !item.label && layout === 'horizontal' ? 2 : 0
-      }
-    }, getFormItem(item, item.type, item.label, item.options));
+    // 判断是否有依赖项，如果依赖项的值符合，则展示，否则不展示
+    if (item.dependenceFields && Object.keys(item.dependenceFields).length > 0) {
+      var keys = Object.keys(item.dependenceFields);
+      var dependenceFields = item.dependenceFields;
+      return /*#__PURE__*/React.createElement(Form.Item, {
+        key: item.name,
+        noStyle: true,
+        shouldUpdate: function shouldUpdate(prevValues, curValues) {
+          var flag = false;
+
+          var _iterator = _createForOfIteratorHelper(keys),
+              _step;
+
+          try {
+            for (_iterator.s(); !(_step = _iterator.n()).done;) {
+              var key = _step.value;
+
+              if (prevValues[key] !== curValues[key]) {
+                flag = true;
+                break;
+              }
+            }
+          } catch (err) {
+            _iterator.e(err);
+          } finally {
+            _iterator.f();
+          }
+
+          return flag;
+        }
+      }, function (_ref2) {
+        var getFieldValue = _ref2.getFieldValue;
+        var flag = true;
+
+        var _iterator2 = _createForOfIteratorHelper(keys),
+            _step2;
+
+        try {
+          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+            var key = _step2.value;
+
+            if (getFieldValue(key) !== dependenceFields[key]) {
+              flag = false;
+              break;
+            }
+          }
+        } catch (err) {
+          _iterator2.e(err);
+        } finally {
+          _iterator2.f();
+        }
+
+        return flag ? /*#__PURE__*/React.createElement(Form.Item, {
+          label: item.label,
+          name: item.name,
+          hidden: item.hidden,
+          rules: item.rules,
+          help: item.help,
+          wrapperCol: {
+            offset: !item.label && layout === 'horizontal' ? 2 : 0
+          },
+          shouldUpdate: true
+        }, getFormItem(item)) : null;
+      });
+    } else {
+      return /*#__PURE__*/React.createElement(Form.Item, {
+        key: item.name,
+        label: item.label,
+        name: item.name,
+        hidden: item.hidden,
+        rules: item.rules,
+        help: item.help,
+        wrapperCol: {
+          offset: !item.label && layout === 'horizontal' ? 2 : 0
+        },
+        shouldUpdate: true
+      }, getFormItem(item));
+    }
   })));
 };
 

package/es/dialog/style/index.less

@@ -44,6 +44,7 @@
   &.ant-form-horizontal .ant-form-item-label > label {
     height: 40px;
   }
+
   &.ant-form-vertical .ant-form-item-label {
     margin-bottom: 12px;
     color: @titleColor;
@@ -51,7 +52,7 @@
 }
 
 .ant-modal-footer {
-  padding-bottom: 32px;
+  padding: 0 24px 24px 24px;
   border-top: none;
 
   .ant-btn + .ant-btn:not(.ant-dropdown-trigger) {
@@ -67,10 +68,19 @@
     color: #000;
     font-weight: 500;
     font-size: 24px;
+    line-height: 24px;
   }
 }
 
 .ant-modal-body {
   max-height: 400px;
+  padding-bottom: 0;
   overflow: auto;
 }
+
+.biz-form-radio {
+  width: 100%;
+  height: 40px;
+  color: @titleColor;
+  line-height: 40px;
+}

package/es/eventSelector/index.d.ts

@@ -17,6 +17,11 @@ interface EventBoxProps extends FormProps {
      * @default         -
      */
     aliasName?: string;
+    /**
+     * @description 是否展示事件概览
+     * @default   true
+     */
+    showAll?: boolean;
     /**
      * @description     选择完成后的回调
      * @default         -

package/es/eventSelector/index.js

@@ -45,6 +45,8 @@ var BizEventSelector = function BizEventSelector(props) {
       options = _props$options === void 0 ? [] : _props$options,
       defaultValue = props.defaultValue,
       value = props.value,
+      _props$showAll = props.showAll,
+      showAll = _props$showAll === void 0 ? true : _props$showAll,
       _props$fieldNames = props.fieldNames,
       fieldNames = _props$fieldNames === void 0 ? {
     label: 'name',
@@ -119,10 +121,15 @@ var BizEventSelector = function BizEventSelector(props) {
       eventOptions = _useState18[0],
       setEventOptions = _useState18[1];
 
-  var _useState19 = useState(aliasName),
+  var _useState19 = useState(true),
       _useState20 = _slicedToArray(_useState19, 2),
-      alias = _useState20[0],
-      setAlias = _useState20[1];
+      showOverview = _useState20[0],
+      setShowOverview = _useState20[1];
+
+  var _useState21 = useState(aliasName),
+      _useState22 = _slicedToArray(_useState21, 2),
+      alias = _useState22[0],
+      setAlias = _useState22[1];
 
   useEffect(function () {
     setAlias(function () {
@@ -134,8 +141,9 @@ var BizEventSelector = function BizEventSelector(props) {
     var initValue = function initValue() {
       // 所有的option
       var firstGroup = {};
-      firstGroup[fieldNames.groupLabel] = '整体概览';
-      firstGroup[fieldNames.groupValue] = 'all';
+      firstGroup[fieldNames.groupLabel] = '所有分组'; // firstGroup[fieldNames.groupLabel] = '整体概览';
+
+      firstGroup[fieldNames.groupValue] = -2;
       firstGroup[fieldNames.children] = [];
 
       var _iterator = _createForOfIteratorHelper(options),
@@ -166,11 +174,24 @@ var BizEventSelector = function BizEventSelector(props) {
         _iterator.f();
       }
 
-      setEventOptions(function (option) {
-        return [firstGroup].concat(_toConsumableArray(option));
+      var result = JSON.parse(JSON.stringify(eventOptions));
+
+      if (result.length > 1) {
+        result = [firstGroup].concat(_toConsumableArray(result));
+      } // // 丢弃事件分组不显示
+
+
+      var index = result.findIndex(function (group) {
+        return group.groupName === '丢弃事件';
       });
-      setGroup(firstGroup);
-      setGroup2(firstGroup);
+      if (index > -1) result.splice(index, 1);
+      setEventOptions(function (option) {
+        return _toConsumableArray(result); // return [firstGroup, ...option];
+      }); // setGroup(firstGroup);
+      // setGroup2(firstGroup);
+
+      setGroup(result[0]);
+      setGroup2(result[0]);
     };
 
     if (options && options.length > 0) {
@@ -195,42 +216,87 @@ var BizEventSelector = function BizEventSelector(props) {
     if (!inValue || inValue === {}) return;
     var id = _typeof(inValue) === 'object' ? inValue[fieldNames.value] : inValue;
     if (event && event[fieldNames.value] === id) return;
+    var eid = id.split(',');
 
-    var _iterator3 = _createForOfIteratorHelper(options),
-        _step3;
+    if (parseFloat(eid[0]) < 0) {
+      // 事件概览
+      if (eid[1] < 0) {
+        setEvent(function () {
+          var _ref;
 
-    try {
-      for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-        var option = _step3.value;
-        var children = option[fieldNames.children] || [];
+          return _ref = {}, _defineProperty(_ref, fieldNames.value, id), _defineProperty(_ref, fieldNames.label, '事件概览'), _ref;
+        });
+        setGroup(function () {
+          var _ref2;
 
-        var _iterator4 = _createForOfIteratorHelper(children),
-            _step4;
+          return _ref2 = {}, _defineProperty(_ref2, fieldNames.groupLabel, '所有分组'), _defineProperty(_ref2, fieldNames.groupValue, -2), _ref2;
+        });
+      } else {
+        var _iterator3 = _createForOfIteratorHelper(eventOptions),
+            _step3;
 
         try {
           var _loop = function _loop() {
-            var event = _step4.value;
+            var option = _step3.value;
 
-            if (event[fieldNames.value] == id) {
-              setEvent(function () {
-                return _objectSpread({}, event);
+            if (option[fieldNames.groupValue] === eid[1]) {
+              setGroup(function () {
+                var _ref3;
+
+                return _ref3 = {}, _defineProperty(_ref3, fieldNames.groupLabel, option[fieldNames.groupLabel]), _defineProperty(_ref3, fieldNames.groupValue, option[fieldNames.groupValue]), _ref3;
               });
+              return "break";
             }
           };
 
-          for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-            _loop();
+          for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+            var _ret = _loop();
+
+            if (_ret === "break") break;
           }
         } catch (err) {
-          _iterator4.e(err);
+          _iterator3.e(err);
         } finally {
-          _iterator4.f();
+          _iterator3.f();
         }
       }
-    } catch (err) {
-      _iterator3.e(err);
-    } finally {
-      _iterator3.f();
+    } else {
+      var _iterator4 = _createForOfIteratorHelper(options),
+          _step4;
+
+      try {
+        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+          var option = _step4.value;
+          var children = option[fieldNames.children] || [];
+
+          var _iterator5 = _createForOfIteratorHelper(children),
+              _step5;
+
+          try {
+            var _loop2 = function _loop2() {
+              var event = _step5.value;
+
+              if (event[fieldNames.value] == id) {
+                setEvent(function () {
+                  return _objectSpread({}, event);
+                });
+              }
+            };
+
+            for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+              _loop2();
+            }
+          } catch (err) {
+            _iterator5.e(err);
+          } finally {
+            _iterator5.f();
+          }
+        }
+      } catch (err) {
+        _iterator4.e(err);
+      } finally {
+        _iterator4.f();
+      }
     }
   }, [defaultValue, value]); // 更改group后，事件列表响应
 
@@ -245,9 +311,20 @@ var BizEventSelector = function BizEventSelector(props) {
       size = group[fieldNames.children].length;
     }
 
+    if (showOverview) {
+      var _arr$unshift;
+
+      arr.unshift((_arr$unshift = {}, _defineProperty(_arr$unshift, fieldNames.value, "-2,".concat(group[fieldNames.groupValue])), _defineProperty(_arr$unshift, fieldNames.label, '事件概览'), _arr$unshift));
+    }
+
     setEventData(arr);
     setEventCount(size);
-  }, [group]); // 初始化搜索框
+  }, [group]);
+  useEffect(function () {
+    setShowOverview(function () {
+      return showAll;
+    });
+  }, [showAll]); // 初始化搜索框
 
   useEffect(function () {
     setSearchValue(function () {
@@ -285,7 +362,7 @@ var BizEventSelector = function BizEventSelector(props) {
     }
   }, /*#__PURE__*/React.createElement("div", {
     className: "biz-input"
-  }, event[fieldNames.label] ? event[fieldNames.label] : /*#__PURE__*/React.createElement("span", {
+  }, event[fieldNames.label] ? event[fieldNames.label] === '事件概览' ? "".concat(group[fieldNames.groupLabel], "/").concat(event[fieldNames.label]) : event[fieldNames.label] : /*#__PURE__*/React.createElement("span", {
     className: "biz-placeholder"
   }, placeholder), /*#__PURE__*/React.createElement("span", null, alias && alias !== '' && "(".concat(alias, ")"))), /*#__PURE__*/React.createElement(IconFont, {
     className: "biz-select-zhankai",
@@ -299,7 +376,7 @@ var BizEventSelector = function BizEventSelector(props) {
 
     return /*#__PURE__*/React.createElement("div", {
       className: "biz-dropdown-item ".concat(menu[fieldNames.groupValue] === group[fieldNames.groupValue] && 'box-hover'),
-      key: menu[fieldNames.groupValue],
+      key: menu[fieldNames.groupValue] || 'key' + index,
       onMouseEnter: function onMouseEnter(e) {
         e.stopPropagation();
         setGroup(function () {
@@ -359,6 +436,8 @@ var BizEventSelector = function BizEventSelector(props) {
           setShowDropdown(false);
 
           if (onChange) {
+            item.groupId = group[fieldNames.groupValue];
+
             if (responseType === 'id') {
               onChange(item[fieldNames.value], item);
             } else {

package/es/globalAttributes/index.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import { AttrGroup } from '../targetConditionGroup/type';
 interface AttrType {
     attrId?: string;
     [props: string]: any;
@@ -12,12 +13,12 @@ interface GlobalAttributeProps {
      * @description   默认值
      * @default           {}
      */
-    defaultValue?: ValueType;
+    defaultValue?: AttrGroup;
     /**
      * @description   默认值
      * @default           {}
      */
-    value?: ValueType;
+    value?: AttrGroup;
     /**
      * @description       数据化配置选项内容
      * @description.zh-CN