@bit-sun/business-component 3.0.0-alpha.32 → 3.0.0-alpha.34

package/dist/index.esm.js

@@ -6,7 +6,7 @@ import _, { isNil, escapeRegExp, omit, debounce, cloneDeep as cloneDeep$1, throt
 import React$1, { useState, useEffect, forwardRef, useImperativeHandle, useRef, useMemo, Component, useLayoutEffect, createRef } from 'react';
 import moment$1 from 'moment';
 import { request as request$2, Table as Table$1, QueryTable, Form as Form$1 } from 'bssula';
-import { EyeOutlined, DeleteOutlined, EditOutlined, CopyOutlined, CloseSquareOutlined, WarningOutlined, SendOutlined, ProfileTwoTone, ExclamationCircleOutlined, DownOutlined, UnorderedListOutlined, SearchOutlined, CaretLeftOutlined, CloseCircleOutlined, ArrowLeftOutlined, FolderOutlined, EllipsisOutlined, CaretDownOutlined, HomeOutlined, DoubleLeftOutlined, DoubleRightOutlined, MenuUnfoldOutlined, DashOutlined, SettingOutlined, BulbOutlined, PlayCircleOutlined, SaveOutlined, FullscreenExitOutlined, MinusCircleOutlined as MinusCircleOutlined$1, PlusCircleOutlined } from '@ant-design/icons';
+import { EyeOutlined, DeleteOutlined, EditOutlined, CopyOutlined, CloseSquareOutlined, WarningOutlined, SendOutlined, ProfileTwoTone, ExclamationCircleOutlined, DownOutlined, UnorderedListOutlined, SearchOutlined, CaretLeftOutlined, CloseCircleOutlined, ArrowLeftOutlined, FolderOutlined, EllipsisOutlined, CaretDownOutlined, HomeOutlined, DoubleLeftOutlined, DoubleRightOutlined, MenuUnfoldOutlined, DashOutlined, SettingOutlined, BulbOutlined, PlayCircleOutlined, SaveOutlined, FullscreenExitOutlined, MinusCircleOutlined, PlusCircleOutlined } from '@ant-design/icons';
 import { formatMessage, history, useLocation, Link, useModel, setLocale, useIntl } from 'umi';
 import isEqual from 'lodash/isEqual';
 import 'qs';
@@ -28821,8 +28821,8 @@ var findChangedThresholdQuery = function findChangedThresholdQuery(oldVal, newVa
 var isObj = function isObj(object) {
   return object && _typeof(object) == 'object' && Object.prototype.toString.call(object).toLowerCase() == '[object object]';
 };
-var dateFormat$1 = 'YYYY-MM-DD';
-var fullDateFormat$1 = 'YYYY-MM-DD HH:mm:ss';
+var dateFormat = 'YYYY-MM-DD';
+var fullDateFormat = 'YYYY-MM-DD HH:mm:ss';
 
 var RangePicker = DatePicker.RangePicker;
 var RuleField = /*#__PURE__*/function (_Component) {
@@ -31070,7 +31070,7 @@ var RuleField = /*#__PURE__*/function (_Component) {
               style: {
                 width: customerWidth || '300px'
               },
-              format: dataTypeCode == 41 ? dateFormat$1 : fullDateFormat$1,
+              format: dataTypeCode == 41 ? dateFormat : fullDateFormat,
               value: [values[0] ? moment$1(values[0]) : '', values[1] ? moment$1(values[1]) : ''],
               onChange: function onChange(dates, dateStrings) {
                 // 业务产品要求时间范围取值固定00:00:00-23:59:59，有问题请找产品业务
@@ -31090,7 +31090,7 @@ var RuleField = /*#__PURE__*/function (_Component) {
           } else {
             return /*#__PURE__*/React$1.createElement(React$1.Fragment, null, /*#__PURE__*/React$1.createElement(DatePicker, {
               showTime: dataTypeCode == 32,
-              format: dataTypeCode == 41 ? dateFormat$1 : fullDateFormat$1,
+              format: dataTypeCode == 41 ? dateFormat : fullDateFormat,
               disabled: disabled,
               style: {
                 width: customerWidth || '300px'
@@ -31694,7 +31694,7 @@ var RuleField$1 = /*#__PURE__*/function (_Component) {
           }
         })), /*#__PURE__*/React$1.createElement(Tooltip, {
           title: '移除执行动作'
-        }, /*#__PURE__*/React$1.createElement(MinusCircleOutlined$1, {
+        }, /*#__PURE__*/React$1.createElement(MinusCircleOutlined, {
           onClick: function onClick() {
             return handleOperatingAction(i.code, 'delete');
           }
@@ -31704,7 +31704,54 @@ var RuleField$1 = /*#__PURE__*/function (_Component) {
   }]);
 }(Component);
 
-var _this$1 = undefined;
+var InnerSelect = (function (props) {
+  var disabled = props.disabled,
+    inputType = props.inputType,
+    defaultValue = props.defaultValue,
+    styleCommon = props.styleCommon,
+    value = props.value,
+    _onChange = props.onChange,
+    dictionaryCode = props.dictionaryCode;
+  var _useState = useState(getDictionarySource(dictionaryCode !== null && dictionaryCode !== void 0 ? dictionaryCode : '') || []),
+    _useState2 = _slicedToArray(_useState, 2),
+    dataSource = _useState2[0],
+    setDataSource = _useState2[1];
+  useEffect(function () {
+    if (!!dictionaryCode && !getDictionarySource(dictionaryCode)) {
+      request$2({
+        url: "/basic/bscDictItem/allItemList?qp-code-eq=".concat(dictionaryCode),
+        method: 'get',
+        converter: function converter(_ref) {
+          var _data$map;
+          var data = _ref.data;
+          var dataList = (data === null || data === void 0 ? void 0 : (_data$map = data.map) === null || _data$map === void 0 ? void 0 : _data$map.call(data, function (item) {
+            return {
+              label: item.dictItemName,
+              value: item.dictItemCode
+            };
+          })) || [];
+          setDataSource(dataList);
+          return dataList;
+        }
+      });
+    }
+  }, [dictionaryCode]);
+  return /*#__PURE__*/React$1.createElement(Select, _objectSpread2(_objectSpread2({
+    disabled: disabled
+  }, inputType === 30 ? {
+    mode: 'multiple'
+  } : {}), {}, {
+    defaultValue: defaultValue,
+    style: styleCommon,
+    value: value === null || value === void 0 ? void 0 : value.split(','),
+    onChange: function onChange(changeValue) {
+      _onChange(changeValue);
+      // handleEdit(ites.code, value);
+    },
+    options: dataSource
+  }));
+});
+
 var RangePicker$1 = DatePicker.RangePicker;
 function RenderCompItem(props) {
   var regularDataList = props.regularDataList,
@@ -31785,7 +31832,7 @@ function RenderCompItem(props) {
     disabled: disabled,
     allowClear: true,
     onClear: function onClear() {
-      handleEdit(ites.code, undefined);
+      return handleEdit(ites.code, undefined);
     },
     defaultValue: showValue(ites.code, 'input'),
     style: styleCommon,
@@ -32004,6 +32051,7 @@ function RenderCompItem(props) {
                 method: 'get',
                 converter: function converter(_ref2) {
                   var data = _ref2.data;
+                  // FIXME http://192.168.13.78/mep-fed-group/web/libs/business-component/-/merge_requests/45#note_115629
                   var handleData = data && data[0] ? data === null || data === void 0 ? void 0 : data.map(function (item) {
                     return {
                       text: item.name,
@@ -32233,6 +32281,7 @@ function RenderCompItem(props) {
   }, /*#__PURE__*/React$1.createElement(App$1, {
     disabled: disabled,
     key: showValue(ites.code),
+    // FIXME http://192.168.13.78/mep-fed-group/web/libs/business-component/-/merge_requests/45#note_115667
     setValue: function setValue(val, formulaName) {
       console.log(val, 'val');
       var value = val.map(function (item) {
@@ -32252,90 +32301,6 @@ function RenderCompItem(props) {
     sourceData: fieldListGroup
   }))));
 }
-renderFormCompItem = function renderFormCompItem(config, showValue, handleEdit, parentItem, boxStyle, disabled) {
-  if (!config) return;
-  return /*#__PURE__*/React$1.createElement("div", {
-    style: boxStyle
-  }, (config === null || config === void 0 ? void 0 : config.leftText) && ( /*#__PURE__*/React$1.createElement("div", {
-    style: {
-      flex: 'none',
-      marginRight: 10
-    }
-  }, (config === null || config === void 0 ? void 0 : config.required) && /*#__PURE__*/React$1.createElement("span", {
-    className: "requiredMark"
-  }), config.leftText)) || null, !(config === null || config === void 0 ? void 0 : config.leftText) && (config === null || config === void 0 ? void 0 : config.rightText) && (config === null || config === void 0 ? void 0 : config.required) && ( /*#__PURE__*/React$1.createElement("div", {
-    style: {
-      flex: 'none',
-      marginRight: 10
-    }
-  }, /*#__PURE__*/React$1.createElement("span", {
-    className: "requiredMark"
-  }))) || null, _this$1.renderCompItem(config, function (a, b) {
-    var c = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : parentItem;
-    var d = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : config;
-    return showValue(a, b, c, d);
-  }, function (a, b) {
-    var c = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : parentItem;
-    var d = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : config;
-    return handleEdit(a, b, c, d);
-  }, disabled), (config === null || config === void 0 ? void 0 : config.rightText) && ( /*#__PURE__*/React$1.createElement("div", {
-    style: {
-      flex: 'none',
-      marginLeft: 10
-    }
-  }, config.rightText)) || null);
-};
-renderActionList = function renderActionList(itemDetail, parentDetail, handleRuleTypeData, sRuleActionData, classDataIndex, disabled, boxStyle) {
-  var showValue = function showValue(code, type, functionItem, configItem) {
-    var functionIndex = handleRuleTypeData.findIndex(function (m) {
-      return m.code === functionItem.code;
-    });
-    var pCode = itemDetail.execute[functionIndex] && itemDetail.execute[functionIndex].properties[code];
-    var defaultValue = configItem.defaultValue;
-    if (type === 'input') {
-      return pCode === undefined ? pCode : pCode || defaultValue;
-    }
-    return pCode || defaultValue;
-  };
-  var handleEdit = function handleEdit(code, val, functionItem) {
-    var functionIndex = handleRuleTypeData.findIndex(function (m) {
-      return m.code === functionItem.code;
-    });
-    var ruleClassData = _this$1.state.ruleClassData;
-    var callBack = _this$1.props.callBack;
-    parentDetail.extraInfo.execute[functionIndex]['properties'][code] = val;
-    parentDetail.extraInfo.execute[functionIndex]['code'] = functionItem.code;
-    _this$1.setState({
-      ruleClassData: ruleClassData
-    }, function () {
-      callBack(ruleClassData);
-    });
-  };
-  return /*#__PURE__*/React$1.createElement(React$1.Fragment, null, sRuleActionData.map(function (i, index) {
-    var _i$valueList;
-    return /*#__PURE__*/React$1.createElement("div", null, /*#__PURE__*/React$1.createElement("div", {
-      style: {
-        display: 'flex'
-      }
-    }, ((_i$valueList = i.valueList) === null || _i$valueList === void 0 ? void 0 : _i$valueList.length) && i.valueList.map(function (s) {
-      return _this$1.renderFormCompItem(s, showValue, handleEdit, i, boxStyle, disabled);
-    }) || ( /*#__PURE__*/React$1.createElement("div", {
-      style: boxStyle,
-      key: i.functionName
-    }, /*#__PURE__*/React$1.createElement("div", null, i.functionName))), /*#__PURE__*/React$1.createElement(MinusCircleOutlined, {
-      className: 'icon_btn_style',
-      onClick: function onClick() {
-        _this$1.handleDeleteRuleAction(classDataIndex, i.code);
-      },
-      style: {
-        color: 'gray',
-        marginLeft: '15px',
-        marginTop: '15px',
-        display: disabled ? 'none' : 'inline-block'
-      }
-    })));
-  }));
-};
 
 var RangePicker$2 = DatePicker.RangePicker;
 var RuleObjectComponent = /*#__PURE__*/function (_Component) {
@@ -32664,7 +32629,8 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
       var ruleClassData = _this.state.ruleClassData;
       var _this$props2 = _this.props,
         callBack = _this$props2.callBack,
-        ruleTypeData = _this$props2.ruleTypeData,
+        _this$props2$ruleType = _this$props2.ruleTypeData,
+        ruleTypeData = _this$props2$ruleType === void 0 ? [] : _this$props2$ruleType,
         ruleGroupInfo = _this$props2.ruleGroupInfo;
       var isRuleInstance = (ruleGroupInfo === null || ruleGroupInfo === void 0 ? void 0 : (_ruleGroupInfo$type2 = ruleGroupInfo.type) === null || _ruleGroupInfo$type2 === void 0 ? void 0 : _ruleGroupInfo$type2.indexOf('instance')) > -1;
       var initKongData = {
@@ -32681,7 +32647,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
             enable: false,
             value: ''
           },
-          execute: ruleTypeData.map(function (s) {
+          execute: (ruleTypeData === null || ruleTypeData === void 0 ? void 0 : ruleTypeData.map(function (s) {
             return {
               priority: 1,
               code: s.code,
@@ -32689,7 +32655,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
                 configPropertyCode: 'configPropertyValue'
               }
             };
-          })
+          })) || []
         }
       };
       var initTemplateData = (ruleGroupInfo === null || ruleGroupInfo === void 0 ? void 0 : ruleGroupInfo.templateData) && ((_Object$keys2 = Object.keys(ruleGroupInfo === null || ruleGroupInfo === void 0 ? void 0 : ruleGroupInfo.templateData)) === null || _Object$keys2 === void 0 ? void 0 : _Object$keys2.length) ? _objectSpread2({
@@ -32902,7 +32868,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
           marginLeft: '15px',
           display: floorIndex > 4 || disabled ? 'none' : 'inline-block'
         }
-      }), /*#__PURE__*/React$1.createElement(MinusCircleOutlined$1, {
+      }), /*#__PURE__*/React$1.createElement(MinusCircleOutlined, {
         className: 'icon_btn_style',
         onClick: function onClick() {
           _this.handleDeleteRule(itemDetail, parentDetail, classDataIndex);
@@ -33002,7 +32968,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         style: {
           display: 'flex'
         }
-      }, _this.renderFormCompItem(ruleReturnConfig, showValue, handleEdit, {}, boxStyle, disabled), /*#__PURE__*/React$1.createElement(MinusCircleOutlined$1, {
+      }, _this.renderFormCompItem(ruleReturnConfig, showValue, handleEdit, {}, boxStyle, disabled), /*#__PURE__*/React$1.createElement(MinusCircleOutlined, {
         className: 'icon_btn_style',
         onClick: function onClick() {
           _this.handleEditExtraInfoResponse('enable', false, parentDetail, classDataIndex);
@@ -33091,7 +33057,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         }) || /*#__PURE__*/React$1.createElement("div", {
           style: boxStyle,
           key: i.functionName
-        }, /*#__PURE__*/React$1.createElement("div", null, i.functionName)), /*#__PURE__*/React$1.createElement(MinusCircleOutlined$1, {
+        }, /*#__PURE__*/React$1.createElement("div", null, i.functionName)), /*#__PURE__*/React$1.createElement(MinusCircleOutlined, {
           className: 'icon_btn_style',
           onClick: function onClick() {
             _this.handleDeleteRuleAction(classDataIndex, i.code);

package/dist/index.js

@@ -28843,8 +28843,8 @@ var findChangedThresholdQuery = function findChangedThresholdQuery(oldVal, newVa
 var isObj = function isObj(object) {
   return object && _typeof(object) == 'object' && Object.prototype.toString.call(object).toLowerCase() == '[object object]';
 };
-var dateFormat$1 = 'YYYY-MM-DD';
-var fullDateFormat$1 = 'YYYY-MM-DD HH:mm:ss';
+var dateFormat = 'YYYY-MM-DD';
+var fullDateFormat = 'YYYY-MM-DD HH:mm:ss';
 
 var RangePicker = antd.DatePicker.RangePicker;
 var RuleField = /*#__PURE__*/function (_Component) {
@@ -31092,7 +31092,7 @@ var RuleField = /*#__PURE__*/function (_Component) {
               style: {
                 width: customerWidth || '300px'
               },
-              format: dataTypeCode == 41 ? dateFormat$1 : fullDateFormat$1,
+              format: dataTypeCode == 41 ? dateFormat : fullDateFormat,
               value: [values[0] ? moment__default['default'](values[0]) : '', values[1] ? moment__default['default'](values[1]) : ''],
               onChange: function onChange(dates, dateStrings) {
                 // 业务产品要求时间范围取值固定00:00:00-23:59:59，有问题请找产品业务
@@ -31112,7 +31112,7 @@ var RuleField = /*#__PURE__*/function (_Component) {
           } else {
             return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.DatePicker, {
               showTime: dataTypeCode == 32,
-              format: dataTypeCode == 41 ? dateFormat$1 : fullDateFormat$1,
+              format: dataTypeCode == 41 ? dateFormat : fullDateFormat,
               disabled: disabled,
               style: {
                 width: customerWidth || '300px'
@@ -31726,7 +31726,54 @@ var RuleField$1 = /*#__PURE__*/function (_Component) {
   }]);
 }(React$1.Component);
 
-var _this$1 = undefined;
+var InnerSelect = (function (props) {
+  var disabled = props.disabled,
+    inputType = props.inputType,
+    defaultValue = props.defaultValue,
+    styleCommon = props.styleCommon,
+    value = props.value,
+    _onChange = props.onChange,
+    dictionaryCode = props.dictionaryCode;
+  var _useState = React$1.useState(getDictionarySource(dictionaryCode !== null && dictionaryCode !== void 0 ? dictionaryCode : '') || []),
+    _useState2 = _slicedToArray(_useState, 2),
+    dataSource = _useState2[0],
+    setDataSource = _useState2[1];
+  React$1.useEffect(function () {
+    if (!!dictionaryCode && !getDictionarySource(dictionaryCode)) {
+      bssula.request({
+        url: "/basic/bscDictItem/allItemList?qp-code-eq=".concat(dictionaryCode),
+        method: 'get',
+        converter: function converter(_ref) {
+          var _data$map;
+          var data = _ref.data;
+          var dataList = (data === null || data === void 0 ? void 0 : (_data$map = data.map) === null || _data$map === void 0 ? void 0 : _data$map.call(data, function (item) {
+            return {
+              label: item.dictItemName,
+              value: item.dictItemCode
+            };
+          })) || [];
+          setDataSource(dataList);
+          return dataList;
+        }
+      });
+    }
+  }, [dictionaryCode]);
+  return /*#__PURE__*/React__default['default'].createElement(antd.Select, _objectSpread2(_objectSpread2({
+    disabled: disabled
+  }, inputType === 30 ? {
+    mode: 'multiple'
+  } : {}), {}, {
+    defaultValue: defaultValue,
+    style: styleCommon,
+    value: value === null || value === void 0 ? void 0 : value.split(','),
+    onChange: function onChange(changeValue) {
+      _onChange(changeValue);
+      // handleEdit(ites.code, value);
+    },
+    options: dataSource
+  }));
+});
+
 var RangePicker$1 = antd.DatePicker.RangePicker;
 function RenderCompItem(props) {
   var regularDataList = props.regularDataList,
@@ -31807,7 +31854,7 @@ function RenderCompItem(props) {
     disabled: disabled,
     allowClear: true,
     onClear: function onClear() {
-      handleEdit(ites.code, undefined);
+      return handleEdit(ites.code, undefined);
     },
     defaultValue: showValue(ites.code, 'input'),
     style: styleCommon,
@@ -32026,6 +32073,7 @@ function RenderCompItem(props) {
                 method: 'get',
                 converter: function converter(_ref2) {
                   var data = _ref2.data;
+                  // FIXME http://192.168.13.78/mep-fed-group/web/libs/business-component/-/merge_requests/45#note_115629
                   var handleData = data && data[0] ? data === null || data === void 0 ? void 0 : data.map(function (item) {
                     return {
                       text: item.name,
@@ -32255,6 +32303,7 @@ function RenderCompItem(props) {
   }, /*#__PURE__*/React__default['default'].createElement(App$1, {
     disabled: disabled,
     key: showValue(ites.code),
+    // FIXME http://192.168.13.78/mep-fed-group/web/libs/business-component/-/merge_requests/45#note_115667
     setValue: function setValue(val, formulaName) {
       console.log(val, 'val');
       var value = val.map(function (item) {
@@ -32274,90 +32323,6 @@ function RenderCompItem(props) {
     sourceData: fieldListGroup
   }))));
 }
-renderFormCompItem = function renderFormCompItem(config, showValue, handleEdit, parentItem, boxStyle, disabled) {
-  if (!config) return;
-  return /*#__PURE__*/React__default['default'].createElement("div", {
-    style: boxStyle
-  }, (config === null || config === void 0 ? void 0 : config.leftText) && ( /*#__PURE__*/React__default['default'].createElement("div", {
-    style: {
-      flex: 'none',
-      marginRight: 10
-    }
-  }, (config === null || config === void 0 ? void 0 : config.required) && /*#__PURE__*/React__default['default'].createElement("span", {
-    className: "requiredMark"
-  }), config.leftText)) || null, !(config === null || config === void 0 ? void 0 : config.leftText) && (config === null || config === void 0 ? void 0 : config.rightText) && (config === null || config === void 0 ? void 0 : config.required) && ( /*#__PURE__*/React__default['default'].createElement("div", {
-    style: {
-      flex: 'none',
-      marginRight: 10
-    }
-  }, /*#__PURE__*/React__default['default'].createElement("span", {
-    className: "requiredMark"
-  }))) || null, _this$1.renderCompItem(config, function (a, b) {
-    var c = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : parentItem;
-    var d = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : config;
-    return showValue(a, b, c, d);
-  }, function (a, b) {
-    var c = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : parentItem;
-    var d = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : config;
-    return handleEdit(a, b, c, d);
-  }, disabled), (config === null || config === void 0 ? void 0 : config.rightText) && ( /*#__PURE__*/React__default['default'].createElement("div", {
-    style: {
-      flex: 'none',
-      marginLeft: 10
-    }
-  }, config.rightText)) || null);
-};
-renderActionList = function renderActionList(itemDetail, parentDetail, handleRuleTypeData, sRuleActionData, classDataIndex, disabled, boxStyle) {
-  var showValue = function showValue(code, type, functionItem, configItem) {
-    var functionIndex = handleRuleTypeData.findIndex(function (m) {
-      return m.code === functionItem.code;
-    });
-    var pCode = itemDetail.execute[functionIndex] && itemDetail.execute[functionIndex].properties[code];
-    var defaultValue = configItem.defaultValue;
-    if (type === 'input') {
-      return pCode === undefined ? pCode : pCode || defaultValue;
-    }
-    return pCode || defaultValue;
-  };
-  var handleEdit = function handleEdit(code, val, functionItem) {
-    var functionIndex = handleRuleTypeData.findIndex(function (m) {
-      return m.code === functionItem.code;
-    });
-    var ruleClassData = _this$1.state.ruleClassData;
-    var callBack = _this$1.props.callBack;
-    parentDetail.extraInfo.execute[functionIndex]['properties'][code] = val;
-    parentDetail.extraInfo.execute[functionIndex]['code'] = functionItem.code;
-    _this$1.setState({
-      ruleClassData: ruleClassData
-    }, function () {
-      callBack(ruleClassData);
-    });
-  };
-  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, sRuleActionData.map(function (i, index) {
-    var _i$valueList;
-    return /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement("div", {
-      style: {
-        display: 'flex'
-      }
-    }, ((_i$valueList = i.valueList) === null || _i$valueList === void 0 ? void 0 : _i$valueList.length) && i.valueList.map(function (s) {
-      return _this$1.renderFormCompItem(s, showValue, handleEdit, i, boxStyle, disabled);
-    }) || ( /*#__PURE__*/React__default['default'].createElement("div", {
-      style: boxStyle,
-      key: i.functionName
-    }, /*#__PURE__*/React__default['default'].createElement("div", null, i.functionName))), /*#__PURE__*/React__default['default'].createElement(MinusCircleOutlined, {
-      className: 'icon_btn_style',
-      onClick: function onClick() {
-        _this$1.handleDeleteRuleAction(classDataIndex, i.code);
-      },
-      style: {
-        color: 'gray',
-        marginLeft: '15px',
-        marginTop: '15px',
-        display: disabled ? 'none' : 'inline-block'
-      }
-    })));
-  }));
-};
 
 var RangePicker$2 = antd.DatePicker.RangePicker;
 var RuleObjectComponent = /*#__PURE__*/function (_Component) {
@@ -32686,7 +32651,8 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
       var ruleClassData = _this.state.ruleClassData;
       var _this$props2 = _this.props,
         callBack = _this$props2.callBack,
-        ruleTypeData = _this$props2.ruleTypeData,
+        _this$props2$ruleType = _this$props2.ruleTypeData,
+        ruleTypeData = _this$props2$ruleType === void 0 ? [] : _this$props2$ruleType,
         ruleGroupInfo = _this$props2.ruleGroupInfo;
       var isRuleInstance = (ruleGroupInfo === null || ruleGroupInfo === void 0 ? void 0 : (_ruleGroupInfo$type2 = ruleGroupInfo.type) === null || _ruleGroupInfo$type2 === void 0 ? void 0 : _ruleGroupInfo$type2.indexOf('instance')) > -1;
       var initKongData = {
@@ -32703,7 +32669,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
             enable: false,
             value: ''
           },
-          execute: ruleTypeData.map(function (s) {
+          execute: (ruleTypeData === null || ruleTypeData === void 0 ? void 0 : ruleTypeData.map(function (s) {
             return {
               priority: 1,
               code: s.code,
@@ -32711,7 +32677,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
                 configPropertyCode: 'configPropertyValue'
               }
             };
-          })
+          })) || []
         }
       };
       var initTemplateData = (ruleGroupInfo === null || ruleGroupInfo === void 0 ? void 0 : ruleGroupInfo.templateData) && ((_Object$keys2 = Object.keys(ruleGroupInfo === null || ruleGroupInfo === void 0 ? void 0 : ruleGroupInfo.templateData)) === null || _Object$keys2 === void 0 ? void 0 : _Object$keys2.length) ? _objectSpread2({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "3.0.0-alpha.32",
+  "version": "3.0.0-alpha.34",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

package/src/components/Solution/RuleComponent/RenderCompItem.tsx

@@ -7,6 +7,11 @@ import { Input, InputNumber, DatePicker, Switch, Select } from 'antd';
 import React, { useEffect, useState } from 'react'
 import { request } from 'bssula';
 import Formula from './Formula';
+import {
+  dateFormat,
+  fullDateFormat
+} from './util';
+import InnerSelect from './InnerSelect';
 const { RangePicker } = DatePicker;
 export default function RenderCompItem(props:any){
     const { regularDataList,ites, showValue, handleEdit,disabled } = props;
@@ -56,9 +61,7 @@ export default function RenderCompItem(props:any){
           <Input
             disabled={disabled}
             allowClear={true}
-            onClear={() => {
-              handleEdit(ites.code, undefined);
-            }}
+            onClear={() => handleEdit(ites.code, undefined)}
             defaultValue={showValue(ites.code, 'input')}
             style={styleCommon}
             onBlur={(e) => {
@@ -71,7 +74,7 @@ export default function RenderCompItem(props:any){
             }}
           />
         )) ||
-        null}
+          null}
         {/* 输入 / 长整数23/小数22  */}
         {(ites?.inputType === 10 &&
           (ites?.valueType === 23 || ites?.valueType === 22) && (
@@ -88,7 +91,7 @@ export default function RenderCompItem(props:any){
               }}
             />
           )) ||
-        null}
+          null}
         {/* 输入/日期  */}
         {(ites?.inputType === 10 && (ites?.valueType === 41 || ites?.valueType === 32) && (
           <DatePicker
@@ -103,7 +106,7 @@ export default function RenderCompItem(props:any){
             }}
           />
         )) ||
-        null}
+          null}
         {/* 输入/时间  */}
         {(ites?.inputType === 10 && ites?.valueType === 40 && (
           <RangePicker
@@ -117,7 +120,7 @@ export default function RenderCompItem(props:any){
             }}
           />
         )) ||
-        null}
+          null}
         {/* 输入/布尔值  */}
         {(ites?.inputType === 10 && ites?.valueType === 24 && (
           <Switch
@@ -130,7 +133,7 @@ export default function RenderCompItem(props:any){
             }}
           />
         )) ||
-        null}
+          null}
         {/* 单选/多选  自定义  */}
         {((ites?.inputType === 20 || ites?.inputType === 30) &&
           ites?.choiceType === 10 && (
@@ -140,12 +143,12 @@ export default function RenderCompItem(props:any){
               showArrow
               {...(ites?.inputType === 30
                 ? {
-                  mode: 'multiple',
-                }
+                    mode: 'multiple',
+                  }
                 : {})}
               defaultValue={ites.defaultValue}
               style={styleCommon}
-              value={showValue(ites.code)}
+              value={showValue(ites.code) as string}
               onChange={(value) => {
                 handleEdit(ites.code, value);
               }}
@@ -157,7 +160,7 @@ export default function RenderCompItem(props:any){
               ))}
             </Select>
           )) ||
-        null}
+          null}
         {/* 单选/多选  数据字典  */}
         {((ites?.inputType === 20 || ites?.inputType === 30) &&
           ites?.choiceType === 20 && (
@@ -173,7 +176,7 @@ export default function RenderCompItem(props:any){
               dictionaryCode={ites.dictionaryCode}
             />
           )) ||
-        null}
+          null}
         {/* 单选/多选  仓库选择器(物理仓)  */}
         {((ites?.inputType === 20 || ites?.inputType === 30) &&
           ites?.choiceType === 110 && (
@@ -184,9 +187,9 @@ export default function RenderCompItem(props:any){
                 placeholder: '请选择物理仓',
                 ...(ites?.inputType === 30
                   ? {
-                    mode: 'multiple',
-                    maxTagCount: 1,
-                  }
+                      mode: 'multiple',
+                      maxTagCount: 1,
+                    }
                   : {}),
               }}
               disabled={disabled}
@@ -196,13 +199,13 @@ export default function RenderCompItem(props:any){
                 mappingValueField: 'physicalWarehouseCode',
                 filterInit: 'qp-physicalWarehouseCode-in',
               }}
-              onChange={(value) => {
+              onChange={(value: any) => {
                 handleEdit(ites.code, value);
               }}
               getPopupContainer={() => document.body}
             />
           )) ||
-        null}
+          null}
         {/* 单选/多选  仓库选择器(逻辑仓)  */}
         {((ites?.inputType === 20 || ites?.inputType === 30) &&
           ites?.choiceType === 120 && (
@@ -213,9 +216,9 @@ export default function RenderCompItem(props:any){
                 placeholder: '请选择逻辑仓',
                 ...(ites?.inputType === 30
                   ? {
-                    mode: 'multiple',
-                    maxTagCount: 1,
-                  }
+                      mode: 'multiple',
+                      maxTagCount: 1,
+                    }
                   : {}),
               }}
               disabled={disabled}
@@ -231,7 +234,7 @@ export default function RenderCompItem(props:any){
               getPopupContainer={() => document.body}
             />
           )) ||
-        null}
+          null}
         {/* 单选/多选  仓库选择器(虚拟仓)  */}
         {((ites?.inputType === 20 || ites?.inputType === 30) &&
           ites?.choiceType === 130 && (
@@ -242,9 +245,9 @@ export default function RenderCompItem(props:any){
                 placeholder: '请选择虚拟仓',
                 ...(ites?.inputType === 30
                   ? {
-                    mode: 'multiple',
-                    maxTagCount: 1,
-                  }
+                      mode: 'multiple',
+                      maxTagCount: 1,
+                    }
                   : {}),
               }}
               disabled={disabled}
@@ -260,7 +263,7 @@ export default function RenderCompItem(props:any){
               getPopupContainer={() => document.body}
             />
           )) ||
-        null}
+          null}
         {/* 单选/多选  仓库选择器(渠道仓)  */}
         {((ites?.inputType === 20 || ites?.inputType === 30) &&
           ites?.choiceType === 140 && (
@@ -271,9 +274,9 @@ export default function RenderCompItem(props:any){
                 placeholder: '请选择渠道仓',
                 ...(ites?.inputType === 30
                   ? {
-                    mode: 'multiple',
-                    maxTagCount: 1,
-                  }
+                      mode: 'multiple',
+                      maxTagCount: 1,
+                    }
                   : {}),
               }}
               disabled={disabled}
@@ -283,13 +286,13 @@ export default function RenderCompItem(props:any){
                 mappingValueField: 'channelWarehouseCode',
                 filterInit: 'qp-channelWarehouseCode-in',
               }}
-              onChange={(value) => {
+              onChange={(value: any) => {
                 handleEdit(ites.code, value);
               }}
               getPopupContainer={() => document.body}
             />
           )) ||
-        null}
+          null}
         {/* 单选/多选  商品SPU选择器  */}
         {((ites?.inputType === 20 || ites?.inputType === 30) &&
           ites?.choiceType === 150 && (
@@ -300,9 +303,9 @@ export default function RenderCompItem(props:any){
                 placeholder: '请选择SPU',
                 ...(ites?.inputType === 30
                   ? {
-                    mode: 'multiple',
-                    maxTagCount: 1,
-                  }
+                      mode: 'multiple',
+                      maxTagCount: 1,
+                    }
                   : {}),
               }}
               disabled={disabled}
@@ -317,7 +320,7 @@ export default function RenderCompItem(props:any){
               getPopupContainer={() => document.body}
             />
           )) ||
-        null}
+          null}
         {/* 单选/多选  商品SKU选择器  */}
         {((ites?.inputType === 20 || ites?.inputType === 30) &&
           ites?.choiceType === 160 && (
@@ -328,9 +331,9 @@ export default function RenderCompItem(props:any){
                 placeholder: '请选择商品',
                 ...(ites?.inputType === 30
                   ? {
-                    mode: 'multiple',
-                    maxTagCount: 1,
-                  }
+                      mode: 'multiple',
+                      maxTagCount: 1,
+                    }
                   : {}),
               }}
               disabled={disabled}
@@ -339,13 +342,13 @@ export default function RenderCompItem(props:any){
               requestConfig={{
                 filterInit: 'qp-skuCode-in',
               }}
-              onChange={(value) => {
+              onChange={(value: any) => {
                 handleEdit(ites.code, value);
               }}
               getPopupContainer={() => document.body}
             />
           )) ||
-        null}
+          null}
         {/* 单选/多选  省市区  */}
         {((ites?.inputType === 20 || ites?.inputType === 30) &&
           ites?.choiceType === 190 && (
@@ -358,17 +361,18 @@ export default function RenderCompItem(props:any){
                 return await request({
                   url: '/basic/bscArea/getBscAreaList?qp-level-eq=1&qp-pid-eq=100000',
                   method: 'get',
-                  converter: ({ data }) => {
+                  converter: ({ data }: any) => {
+                    // FIXME http://192.168.13.78/mep-fed-group/web/libs/business-component/-/merge_requests/45#note_115629
                     const handleData =
                       data && data[0]
-                        ? data?.map((item) => {
-                          return {
-                            text: item.name,
-                            value: item.id,
-                            level: item.level,
-                            id: item.id,
-                          };
-                        })
+                        ? data?.map((item: any) => {
+                            return {
+                              text: item.name,
+                              value: item.id,
+                              level: item.level,
+                              id: item.id,
+                            };
+                          })
                         : [];
                     return handleData;
                   },
@@ -381,7 +385,7 @@ export default function RenderCompItem(props:any){
               getPopupContainer={() => document.body}
             />
           )) ||
-        null}
+          null}
         {/* 单选/多选  行政组织选择器  */}
         {((ites?.inputType === 20 || ites?.inputType === 30) &&
           ites?.choiceType === 210 && (
@@ -398,7 +402,7 @@ export default function RenderCompItem(props:any){
               getPopupContainer={() => document.body}
             />
           )) ||
-        null}
+          null}
         {/* 单选/多选  采购组织选择器  */}
         {((ites?.inputType === 20 || ites?.inputType === 30) &&
           ites?.choiceType === 220 && (
@@ -415,7 +419,7 @@ export default function RenderCompItem(props:any){
               getPopupContainer={() => document.body}
             />
           )) ||
-        null}
+          null}
         {/* 单选/多选  销售组织选择器  */}
         {((ites?.inputType === 20 || ites?.inputType === 30) &&
           ites?.choiceType === 230 && (
@@ -432,7 +436,7 @@ export default function RenderCompItem(props:any){
               getPopupContainer={() => document.body}
             />
           )) ||
-        null}
+          null}
         {/* 单选/多选  供应商选择器  */}
         {((ites?.inputType === 20 || ites?.inputType === 30) &&
           ites?.choiceType === 240 && (
@@ -443,9 +447,9 @@ export default function RenderCompItem(props:any){
                 placeholder: '请选择供应商',
                 ...(ites?.inputType === 30
                   ? {
-                    mode: 'multiple',
-                    maxTagCount: 1,
-                  }
+                      mode: 'multiple',
+                      maxTagCount: 1,
+                    }
                   : {}),
               }}
               disabled={disabled}
@@ -460,7 +464,7 @@ export default function RenderCompItem(props:any){
               getPopupContainer={() => document.body}
             />
           )) ||
-        null}
+          null}
         {/* 单选/多选  客户选择器  */}
         {((ites?.inputType === 20 || ites?.inputType === 30) &&
           ites?.choiceType === 250 && (
@@ -471,9 +475,9 @@ export default function RenderCompItem(props:any){
                 placeholder: '请选择客户',
                 ...(ites?.inputType === 30
                   ? {
-                    mode: 'multiple',
-                    maxTagCount: 1,
-                  }
+                      mode: 'multiple',
+                      maxTagCount: 1,
+                    }
                   : {}),
               }}
               disabled={disabled}
@@ -488,7 +492,7 @@ export default function RenderCompItem(props:any){
               getPopupContainer={() => document.body}
             />
           )) ||
-        null}
+          null}
         {/* 单选/多选  店铺选择器  */}
         {((ites?.inputType === 20 || ites?.inputType === 30) &&
           ites?.choiceType === 260 && (
@@ -499,9 +503,9 @@ export default function RenderCompItem(props:any){
                 placeholder: '请选择店铺',
                 ...(ites?.inputType === 30
                   ? {
-                    mode: 'multiple',
-                    maxTagCount: 1,
-                  }
+                      mode: 'multiple',
+                      maxTagCount: 1,
+                    }
                   : {}),
               }}
               disabled={disabled}
@@ -516,7 +520,7 @@ export default function RenderCompItem(props:any){
               getPopupContainer={() => document.body}
             />
           )) ||
-        null}
+          null}
         {/* 单选/多选  员工选择器  */}
         {((ites?.inputType === 20 || ites?.inputType === 30) &&
           ites?.choiceType === 270 && (
@@ -527,9 +531,9 @@ export default function RenderCompItem(props:any){
                 placeholder: '请选择员工',
                 ...(ites?.inputType === 30
                   ? {
-                    mode: 'multiple',
-                    maxTagCount: 1,
-                  }
+                      mode: 'multiple',
+                      maxTagCount: 1,
+                    }
                   : {}),
               }}
               disabled={disabled}
@@ -544,7 +548,7 @@ export default function RenderCompItem(props:any){
               getPopupContainer={() => document.body}
             />
           )) ||
-        null}
+          null}
         {/* 单选/多选  库存组织选择器  */}
         {((ites?.inputType === 20 || ites?.inputType === 30) &&
           ites?.choiceType === 280 && (
@@ -578,7 +582,7 @@ export default function RenderCompItem(props:any){
               getPopupContainer={() => document.body}
             />
           )) ||
-        null}
+          null}
         {/* 单选/多选  配送方式选择器  */}
         {((ites?.inputType === 20 || ites?.inputType === 30) &&
           ites?.choiceType === 310 && (
@@ -589,9 +593,9 @@ export default function RenderCompItem(props:any){
                 placeholder: '请选择配送方式',
                 ...(ites?.inputType === 30
                   ? {
-                    mode: 'multiple',
-                    maxTagCount: 1,
-                  }
+                      mode: 'multiple',
+                      maxTagCount: 1,
+                    }
                   : {}),
               }}
               disabled={disabled}
@@ -634,13 +638,14 @@ export default function RenderCompItem(props:any){
               getPopupContainer={() => document.body}
             />
           )) ||
-        null}
+          null}
         {/* 表达式 */}
         {ites?.inputType === 40 && (
           <div style={{ display: 'flex' }}>
             <Formula
               disabled={disabled}
               key={showValue(ites.code)}
+              // FIXME http://192.168.13.78/mep-fed-group/web/libs/business-component/-/merge_requests/45#note_115667
               setValue={(val, formulaName) => {
                 console.log(val, 'val');
                 const value = val.map((item) => {
@@ -662,123 +667,4 @@ export default function RenderCompItem(props:any){
         )}
       </>
     );
-};
-
-renderFormCompItem = (
-  config,
-  showValue,
-  handleEdit,
-  parentItem,
-  boxStyle,
-  disabled
-) => {
-  if (!config) return;
-  return (
-    <div style={boxStyle}>
-      {(config?.leftText && (
-        <div style={{ flex: 'none', marginRight: 10 }}>
-          {config?.required && <span className="requiredMark" />}
-          {config.leftText}
-        </div>
-      )) ||
-      null}
-      {(!config?.leftText && config?.rightText && config?.required && (
-        <div style={{ flex: 'none', marginRight: 10 }}>
-          <span className="requiredMark" />
-        </div>
-      )) ||
-      null}
-      {this.renderCompItem(
-        config,
-        (a, b, c = parentItem, d = config) => showValue(a, b, c, d),
-        (a, b, c = parentItem, d = config) => handleEdit(a, b, c, d),
-        disabled
-      )}
-      {(config?.rightText && (
-        <div style={{ flex: 'none', marginLeft: 10 }}>{config.rightText}</div>
-      )) ||
-      null}
-    </div>
-  );
-};
-
-renderActionList = (
-  itemDetail,
-  parentDetail,
-  handleRuleTypeData,
-  sRuleActionData,
-  classDataIndex,
-  disabled,
-  boxStyle,
-) => {
-  const showValue = (code, type, functionItem, configItem) => {
-    const functionIndex = handleRuleTypeData.findIndex(
-      (m) => m.code === functionItem.code,
-    );
-    const pCode =
-      itemDetail.execute[functionIndex] &&
-      itemDetail.execute[functionIndex].properties[code];
-    let defaultValue = configItem.defaultValue;
-    if (type === 'input') {
-      return pCode === undefined ? pCode : pCode || defaultValue;
-    }
-    return pCode || defaultValue;
-  };
-  const handleEdit = (code, val, functionItem) => {
-    const functionIndex = handleRuleTypeData.findIndex(
-      (m) => m.code === functionItem.code,
-    );
-    const { ruleClassData } = this.state;
-    const { callBack } = this.props;
-    parentDetail.extraInfo.execute[functionIndex]['properties'][code] = val;
-    parentDetail.extraInfo.execute[functionIndex]['code'] = functionItem.code;
-
-    this.setState(
-      {
-        ruleClassData,
-      },
-      () => {
-        callBack(ruleClassData);
-      },
-    );
-  };
-
-  return (
-    <>
-      {sRuleActionData.map((i, index) => (
-        <div>
-          <div style={{ display: 'flex' }}>
-            {(i.valueList?.length &&
-              i.valueList.map((s) => {
-                return this.renderFormCompItem(
-                  s,
-                  showValue,
-                  handleEdit,
-                  i,
-                  boxStyle,
-                  disabled
-                );
-              })) || (
-              <div style={boxStyle} key={i.functionName}>
-                <div>{i.functionName}</div>
-              </div>
-            )}
-            <MinusCircleOutlined
-              className={'icon_btn_style'}
-              onClick={() => {
-                this.handleDeleteRuleAction(classDataIndex, i.code);
-              }}
-              style={{
-                color: 'gray',
-                marginLeft: '15px',
-                marginTop: '15px',
-                display: disabled ? 'none' : 'inline-block',
-              }}
-            />
-          </div>
-        </div>
-      ))}
-    </>
-
-    );
   };

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

@@ -31,8 +31,6 @@ import {
   getSpecialPropertyCode,
   getPropertyCode,
   isObj,
-  dateFormat,
-  fullDateFormat
 } from './util';
 import { getDictionarySource, uuid } from '../../../utils/utils';
 import {
@@ -45,7 +43,6 @@ import { request } from 'bssula';
 import Formula from './Formula';
 import RenderSpecificAction from './renderSpecificAction';
 import RenderCompItem from './RenderCompItem';
-import InnerSelect from './InnerSelect';
 
 const { RangePicker } = DatePicker;
 
@@ -532,7 +529,7 @@ class RuleObjectComponent extends Component {
 
   handleAddRule = () => {
     const { ruleClassData } = this.state;
-    const { callBack, ruleTypeData, ruleGroupInfo } = this.props;
+    const { callBack, ruleTypeData=[], ruleGroupInfo } = this.props;
     const isRuleInstance = ruleGroupInfo?.type?.indexOf('instance') > -1;
     const initKongData = {
       ruleName: `规则${ruleClassData?.length + 1}`,
@@ -548,7 +545,7 @@ class RuleObjectComponent extends Component {
           enable: false,
           value: '',
         },
-        execute: ruleTypeData.map((s) => {
+        execute: ruleTypeData?.map((s) => {
           return {
             priority: 1,
             code: s.code,
@@ -556,7 +553,7 @@ class RuleObjectComponent extends Component {
               configPropertyCode: 'configPropertyValue',
             },
           };
-        }),
+        })||[],
       },
     }
     const initTemplateData = ruleGroupInfo?.templateData && Object.keys(ruleGroupInfo?.templateData)?.length ? {