@bit-sun/business-component 2.2.0-alpha.22 → 2.2.0-alpha.24

package/dist/index.esm.js

@@ -9681,7 +9681,7 @@ var formatter = function formatter(data, parentAuthority, parentName) {
 var memoizeOneFormatter = memoizeOne(formatter, isEqual$1);
 var go2BackAndClose = function go2BackAndClose() {
   localStorage.setItem(ENUM.BROWSER_CACHE.CHILD_APP_BACK, 1);
-  history.goBack();
+  history.go(-1);
 };
 /**
  * 处理bssulaTable的公共回显样式
@@ -10218,6 +10218,20 @@ var AddSelect = function AddSelect(props) {
       return _ref4.apply(this, arguments);
     };
   }();
+  var setBusinessDefaultValue = function setBusinessDefaultValue(list, record) {
+    var _record$colorValues;
+    var result = list;
+    if (businessType == 'spu' && (record === null || record === void 0 ? void 0 : (_record$colorValues = record.colorValues) === null || _record$colorValues === void 0 ? void 0 : _record$colorValues.length) == 1) {
+      result = list.map(function (i) {
+        if (i.uuid == (record === null || record === void 0 ? void 0 : record.uuid)) {
+          var _record$colorValues$;
+          i.colorName = (_record$colorValues$ = record.colorValues[0]) === null || _record$colorValues$ === void 0 ? void 0 : _record$colorValues$.value;
+        }
+        return i;
+      });
+    }
+    return result;
+  };
   useEffect(function () {
     setTableColumns(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableColumns);
   }, [modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableColumns]);
@@ -10821,12 +10835,16 @@ var AddSelect = function AddSelect(props) {
       }
     }
     if (isAllowRepeatedSelect) {
+      var newUuid = uuid();
       var list = popvalue.concat(selectRows).map(function (i) {
         return _objectSpread2(_objectSpread2({}, i), {}, {
-          uuid: i.uuid || uuid()
+          uuid: i.uuid || newUuid
         });
       });
-      setPopValue(list);
+      var recordItem = _objectSpread2(_objectSpread2({}, selectRows[0]), {}, {
+        uuid: newUuid
+      });
+      setPopValue(setBusinessDefaultValue(list, recordItem));
       setSelectedRowKeys([]);
     } else {
       setPopValue(selectRows);
@@ -21585,7 +21603,11 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
       //     }
       //   });
       (_window$$wujie = window.$wujie) === null || _window$$wujie === void 0 ? void 0 : _window$$wujie.bus.$on("main-route-change", function (appname, info) {
-        localStorage.setItem('isTabChange', true);
+        if (localStorage.getItem(ENUM.BROWSER_CACHE.CHILD_APP_BACK)) {
+          localStorage.removeItem(ENUM.BROWSER_CACHE.CHILD_APP_BACK);
+        } else {
+          localStorage.setItem('isTabChange', true);
+        }
         if (appname === itemPath) {
           istParent = 1;
           if (info.type === 'main') {
@@ -22566,7 +22588,7 @@ var index$6 = /*#__PURE__*/forwardRef(function (props, ref) {
     className: 'editTable__block'.concat(" ", 'table_border_style')
   }, /*#__PURE__*/React.createElement("tbody", null, config.colLastData.map(function (item, index) {
     var fixedTop = item.fixed ? "".concat(index * 40 + config.colHeaderToTop, "px") : 0;
-    return /*#__PURE__*/React.createElement("tr", null, colTableData.slice(startIndex, endIndex + 1).map(function (record, index) {
+    return /*#__PURE__*/React.createElement("tr", null, colTableData.map(function (record, index) {
       return /*#__PURE__*/React.createElement("td", {
         style: {
           background: index % 2 === 1 || item.fixed ? '#f7f8fb' : '#fff',
@@ -22583,7 +22605,7 @@ var index$6 = /*#__PURE__*/forwardRef(function (props, ref) {
         index: index,
         table: tableInsFn
       }) : record[item.key || item.dataIndex]);
-    }));
+    }).slice(startIndex, endIndex + 1));
   }))), /*#__PURE__*/React.createElement("table", {
     style: {
       width: '100%',
@@ -30573,7 +30595,9 @@ var FieldsSettingsTable = (function (props) {
     _props$codeProps = props.codeProps,
     codeProps = _props$codeProps === void 0 ? '' : _props$codeProps,
     moduleType = props.moduleType,
-    moduleRelationId = props.moduleRelationId;
+    moduleRelationId = props.moduleRelationId,
+    _props$tableFlag = props.tableFlag,
+    tableFlag = _props$tableFlag === void 0 ? false : _props$tableFlag;
   var ref = useRef(null);
   var _useState = useState({
       visible: false,
@@ -30662,6 +30686,9 @@ var FieldsSettingsTable = (function (props) {
       render: function render(_ref2) {
         var text = _ref2.text,
           record = _ref2.record;
+        if (tableFlag) {
+          return /*#__PURE__*/React.createElement("div", null, " \u5217\u8868\uFF1A", "{\"key\": \"extensionFields,".concat(record.code, "\",\"dataIndex\": \"extensionFields,").concat(record.code, "\",\"title\": \"").concat(record.name, "\"},"));
+        }
         if (!codeProps.columns) {
           return /*#__PURE__*/React.createElement("div", null, "\u8868\u5355\uFF1A", "{\"name\": \"extensionFields,".concat(record.code, "\",\"label\": \"").concat(record.name, "\"},"));
         }
@@ -30802,6 +30829,13 @@ function convertFileds(fields, falltValue, faltFieldRange, containerName) {
         var _field$container6;
         var targetValue = convertFileds(item, falltValue, faltFieldRange, field === null || field === void 0 ? void 0 : (_field$container6 = field.container) === null || _field$container6 === void 0 ? void 0 : _field$container6.name);
         if (targetValue) {
+          if (item.dependency) {
+            targetValue.dependency = {
+              visible: _objectSpread2(_objectSpread2({}, item.dependency.visible), {}, {
+                type: new Function('axios', 'ctx', item.dependency.visible.type).bind(null, axios)
+              })
+            };
+          }
           filedsValue.push(targetValue);
         }
       });
@@ -30810,6 +30844,14 @@ function convertFileds(fields, falltValue, faltFieldRange, containerName) {
       if (returnField) {
         var _returnField$name;
         returnField.label = field === null || field === void 0 ? void 0 : field.label;
+        if (field === null || field === void 0 ? void 0 : field.disabled) {
+          // 字段设置只读属性
+          returnField.field.props.disabled = true;
+        }
+        if (field === null || field === void 0 ? void 0 : field.invisible) {
+          // 字段设置不可见属性
+          returnField.initialVisible = false;
+        }
         if (Array.isArray(returnField.name) && ((_returnField$name = returnField.name) === null || _returnField$name === void 0 ? void 0 : _returnField$name.includes("extensionFields"))) {
           returnField.notShowLabel = true;
         }
@@ -30839,10 +30881,39 @@ function faltCustomerFieldRange(fileds) {
   });
   return columnsValue;
 }
+//form存在新加container属性分组得情况 组合操作
+function combineContainer(originFields, currentFields) {
+  var newCurrentFields = _toConsumableArray(originFields);
+  currentFields.map(function (item) {
+    if (!originFields.find(function (i) {
+      var _i$container, _i$container$props, _item$container;
+      return (i === null || i === void 0 ? void 0 : (_i$container = i.container) === null || _i$container === void 0 ? void 0 : (_i$container$props = _i$container.props) === null || _i$container$props === void 0 ? void 0 : _i$container$props.name) == (item === null || item === void 0 ? void 0 : (_item$container = item.container) === null || _item$container === void 0 ? void 0 : _item$container.name);
+    })) {
+      var _item$container2, _item$container3;
+      newCurrentFields = [].concat(_toConsumableArray(newCurrentFields), [{
+        container: {
+          type: 'card',
+          props: {
+            title: item === null || item === void 0 ? void 0 : (_item$container2 = item.container) === null || _item$container2 === void 0 ? void 0 : _item$container2.title,
+            level: 1,
+            id: Math.random(),
+            isWhiteCard: true,
+            bordered: false,
+            name: item === null || item === void 0 ? void 0 : (_item$container3 = item.container) === null || _item$container3 === void 0 ? void 0 : _item$container3.name
+          }
+        },
+        fields: (item === null || item === void 0 ? void 0 : item.fields) || []
+      }]);
+    }
+  });
+  return newCurrentFields;
+}
 function hanleCallbackValue(codeProps, value, customerFields) {
+  var cacheColumns = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
   var faltFieldRange = faltCustomerFieldRange(customerFields);
+  // const falltValue = flatFileds({fields: codeProps.fields})
   var falltValue = flatFileds({
-    fields: codeProps.fields
+    fields: combineContainer(codeProps.fields, value === null || value === void 0 ? void 0 : value.fields)
   });
   var newCodeProps = _objectSpread2({}, codeProps);
   newCodeProps.fields = convertFileds({
@@ -30852,7 +30923,10 @@ function hanleCallbackValue(codeProps, value, customerFields) {
     var faltColumnsValue = faltColumns(codeProps.columns);
     newCodeProps.columns = value.columns.map(function (item) {
       if (item.isStaticCode) {
-        return faltColumnsValue[item.key];
+        var cacheFieldProperty = cacheColumns.find(function (k) {
+          return (k.key || k.dataIndex) == (item.key || item.dataIndex);
+        });
+        return _objectSpread2(_objectSpread2({}, faltColumnsValue[item.key]), cacheFieldProperty);
       } else {
         //自定义字段-列字段
         if ((item === null || item === void 0 ? void 0 : item.key) && (item === null || item === void 0 ? void 0 : item.key.includes('extensionFields')) && (item === null || item === void 0 ? void 0 : item.key.includes(','))) {
@@ -30860,10 +30934,26 @@ function hanleCallbackValue(codeProps, value, customerFields) {
             render: function render(_ref) {
               var record = _ref.record;
               try {
-                var lastName1 = item === null || item === void 0 ? void 0 : item.key.split(',')[1]; //兼容没有fieldName的情况
-                var lastName2 = "".concat(lastName1, "Name");
-                var target = (record === null || record === void 0 ? void 0 : record.extensionFields) || {};
-                return target[lastName2] || target[lastName1] || '';
+                var _record$extensionFiel = record.extensionFields,
+                  extensionFields = _record$extensionFiel === void 0 ? {} : _record$extensionFiel;
+                var fieldName1 = item === null || item === void 0 ? void 0 : item.key.split(',')[1]; //兼容没有fieldName的情况
+                var fieldName2 = "".concat(fieldName1, "Name");
+                if (customerFields.length) {
+                  var targetField = customerFields.find(function (k) {
+                    return k.name.includes(fieldName1);
+                  });
+                  if (targetField) {
+                    var _targetField$initialS = targetField.initialSource,
+                      initialSource = _targetField$initialS === void 0 ? [] : _targetField$initialS;
+                    if (initialSource.length) {
+                      var _initialSource$find;
+                      return ((_initialSource$find = initialSource.find(function (d) {
+                        return d.value == extensionFields[fieldName1];
+                      })) === null || _initialSource$find === void 0 ? void 0 : _initialSource$find.text) || extensionFields[fieldName1];
+                    }
+                  }
+                }
+                return extensionFields[fieldName2] || extensionFields[fieldName1] || '';
               } catch (e) {
                 console.log('e', e);
               }
@@ -30896,7 +30986,10 @@ var JsonQueryTable = /*#__PURE__*/React.memo(function (props) {
     codeProps = props.codeProps,
     customerFields = props.customerFields,
     initialSetting = props.initialSetting,
-    pageType = props.pageType;
+    pageType = props.pageType,
+    _props$detailTablesSe = props.detailTablesSetting,
+    detailTablesSetting = _props$detailTablesSe === void 0 ? [] : _props$detailTablesSe,
+    saveTableCallBack = props.saveTableCallBack;
   var codeFilter = {};
   if (codeProps.columns) {
     // table
@@ -30920,7 +31013,6 @@ var JsonQueryTable = /*#__PURE__*/React.memo(function (props) {
       fields: codeProps.fields
     }).fields;
   }
-  console.log('codeFilter', codeFilter);
   var styleRef = useRef(null);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -30942,6 +31034,18 @@ var JsonQueryTable = /*#__PURE__*/React.memo(function (props) {
     _useState10 = _slicedToArray(_useState9, 2),
     moduleParams = _useState10[0],
     setModuleParams = _useState10[1];
+  var _useState11 = useState('main'),
+    _useState12 = _slicedToArray(_useState11, 2),
+    activeKey = _useState12[0],
+    setActiveKey = _useState12[1]; //默认详情页配置
+  var _useState13 = useState({}),
+    _useState14 = _slicedToArray(_useState13, 2),
+    tablesConfigParams = _useState14[0],
+    setTablesConfigParams = _useState14[1];
+  var _useState15 = useState([]),
+    _useState16 = _slicedToArray(_useState15, 2),
+    tableJsonEditorValsArr = _useState16[0],
+    setTableJsonEditorValsArr = _useState16[1];
   useEffect(function () {
     Promise.all([axios.get("/basic/flow/businessFieldGroup/one?moduleType=2&layoutPoint=".concat(pageType))]).then(function (_ref2) {
       var _ref3 = _slicedToArray(_ref2, 1),
@@ -30965,6 +31069,73 @@ var JsonQueryTable = /*#__PURE__*/React.memo(function (props) {
       }
     });
   }, []);
+  useEffect(function () {
+    //明细表的配置数据
+    var axiosArr = detailTablesSetting.map(function (item) {
+      return axios.get("/basic/flow/businessFieldGroup/one?moduleType=2&layoutPoint=".concat(item.tableCode));
+    });
+    Promise.all(axiosArr).then(function (_ref5) {
+      var _ref6 = _toArray(_ref5),
+        resArr = _ref6.slice(0);
+      var configParams = {};
+      detailTablesSetting.map(function (item, index) {
+        var _resArr$index;
+        var _ref7 = ((_resArr$index = resArr[index]) === null || _resArr$index === void 0 ? void 0 : _resArr$index.data) || {},
+          code = _ref7.code,
+          data = _ref7.data;
+        if (data) {
+          var businessType = data.businessType,
+            fieldGroup = data.code,
+            moduleType = data.moduleType;
+          configParams[item.tableCode] = {
+            businessType: businessType,
+            fieldGroup: fieldGroup,
+            moduleType: moduleType,
+            tableFlag: true
+          };
+        }
+      });
+      setTablesConfigParams(_objectSpread2({}, configParams));
+    });
+    var detailTableCodeFilter = detailTablesSetting.map(function (item) {
+      if ((item === null || item === void 0 ? void 0 : item.initialSetting) && (item === null || item === void 0 ? void 0 : item.initialSetting.length)) {
+        return _objectSpread2(_objectSpread2({}, item), {}, {
+          columns: item === null || item === void 0 ? void 0 : item.initialSetting
+        });
+      }
+      return _objectSpread2(_objectSpread2({}, item), {}, {
+        columns: item === null || item === void 0 ? void 0 : item.columns.map(function (childItem) {
+          return {
+            key: childItem.key || childItem.dataIndex,
+            dataIndex: childItem.dataIndex || childItem.key,
+            isStaticCode: true,
+            title: childItem.title
+          };
+        })
+      });
+    });
+    setTableJsonEditorValsArr(_toConsumableArray(detailTableCodeFilter));
+    var lastRes = detailTableCodeFilter.map(function (item) {
+      if ((item === null || item === void 0 ? void 0 : item.initialSetting) && (item === null || item === void 0 ? void 0 : item.initialSetting.length)) {
+        var _codeProps = {
+          fields: [],
+          columns: item === null || item === void 0 ? void 0 : item.columns
+        };
+        var newValue = {
+          fields: [],
+          columns: item.initialSetting
+        };
+        var result = hanleCallbackValue(_codeProps, newValue, item === null || item === void 0 ? void 0 : item.customerFields, item === null || item === void 0 ? void 0 : item.cacheColumns);
+        return _objectSpread2(_objectSpread2({}, item), {}, {
+          columns: result === null || result === void 0 ? void 0 : result.columns
+        });
+      }
+      return item;
+    });
+    if (lastRes.length) {
+      saveTableCallBack(lastRes, false);
+    }
+  }, [detailTablesSetting.length]);
   var onClickRun = function onClickRun(value, isSave) {
     setJsonEditorVal(value);
     try {
@@ -30974,6 +31145,40 @@ var JsonQueryTable = /*#__PURE__*/React.memo(function (props) {
       message.error(e);
     }
   };
+  //明细表保存
+  var onClickRunDetailTables = function onClickRunDetailTables(value, isSave, tableCode, tableSouce) {
+    var targetCode = tableCode || activeKey;
+    var targetTableSource = tableSouce || tableJsonEditorValsArr;
+    var newArr = targetTableSource.map(function (item) {
+      if (item.tableCode == targetCode) {
+        return _objectSpread2(_objectSpread2({}, item), {}, {
+          columns: value
+        });
+      }
+      return item;
+    });
+    setTableJsonEditorValsArr(_toConsumableArray(newArr));
+    try {
+      var target = targetTableSource.find(function (item) {
+        return item.tableCode == targetCode;
+      });
+      var _codeProps2 = {
+        fields: [],
+        columns: target === null || target === void 0 ? void 0 : target.columns
+      };
+      var newValue = {
+        fields: [],
+        columns: value
+      };
+      var result = hanleCallbackValue(_codeProps2, newValue, target === null || target === void 0 ? void 0 : target.customerFields, target === null || target === void 0 ? void 0 : target.cacheColumns);
+      saveTableCallBack({
+        columns: result.columns,
+        tableCode: targetCode
+      }, isSave, value);
+    } catch (e) {
+      message.error(e);
+    }
+  };
   React.useEffect(function () {
     localStorage.setItem('jsonEditorVal', JSON.stringify(jsonEditorVal || {}));
   }, [jsonEditorVal]);
@@ -30990,25 +31195,97 @@ var JsonQueryTable = /*#__PURE__*/React.memo(function (props) {
   });
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Drawer, {
     visible: visible,
-    width: 800,
+    width: 1400,
     onClose: function onClose() {
       return setVisible(false);
     },
     className: 'customFieldsDrawer'
+  }, detailTablesSetting.length == 0 && /*#__PURE__*/React.createElement("div", {
+    style: {
+      display: 'flex'
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      flex: 1,
+      width: 500
+    }
+  }, isEmpty(moduleParams) ? /*#__PURE__*/React.createElement("div", {
+    style: {
+      padding: "10px 0",
+      fontSize: "16px",
+      fontWeight: "bolder"
+    }
+  }, "\u63D0\u793A\uFF1A\u4E1A\u52A1\u5BF9\u8C61\u672A\u7EF4\u62A4\uFF0C\u8BF7\u5728\u901A\u7528\u5355\u636E\u5BF9\u5E94\u4E1A\u52A1\u7C7B\u578B\u4E0B\u7EF4\u62A4\u4E1A\u52A1\u5BF9\u8C61") : /*#__PURE__*/React.createElement(FieldsSettingsTable, _objectSpread2({}, tableParams))), /*#__PURE__*/React.createElement("div", {
+    style: {
+      flex: 1
+    }
+  }, /*#__PURE__*/React.createElement(Editor, {
+    type: "table",
+    onRun: onClickRun,
+    value: jsonEditorVal,
+    shallowHeight: height
+  }))), detailTablesSetting.length > 0 && /*#__PURE__*/React.createElement(Tabs, {
+    defaultActiveKey: activeKey,
+    onChange: function onChange(v) {
+      return setActiveKey(v);
+    }
+  }, /*#__PURE__*/React.createElement(Tabs.TabPane, {
+    tab: "\u8BE6\u60C5\u9875\u914D\u7F6E",
+    key: "main"
   }, /*#__PURE__*/React.createElement("div", {
-    ref: styleRef
-  }), isEmpty(moduleParams) ? /*#__PURE__*/React.createElement("div", {
+    style: {
+      display: 'flex'
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      flex: 1,
+      width: 500
+    }
+  }, isEmpty(moduleParams) ? /*#__PURE__*/React.createElement("div", {
     style: {
       padding: "10px 0",
       fontSize: "16px",
       fontWeight: "bolder"
     }
-  }, "\u63D0\u793A\uFF1A\u4E1A\u52A1\u5BF9\u8C61\u672A\u7EF4\u62A4\uFF0C\u8BF7\u5728\u901A\u7528\u5355\u636E\u5BF9\u5E94\u4E1A\u52A1\u7C7B\u578B\u4E0B\u7EF4\u62A4\u4E1A\u52A1\u5BF9\u8C61") : /*#__PURE__*/React.createElement(FieldsSettingsTable, _objectSpread2({}, tableParams)), /*#__PURE__*/React.createElement(Editor, {
+  }, "\u63D0\u793A\uFF1A\u4E1A\u52A1\u5BF9\u8C61\u672A\u7EF4\u62A4\uFF0C\u8BF7\u5728\u901A\u7528\u5355\u636E\u5BF9\u5E94\u4E1A\u52A1\u7C7B\u578B\u4E0B\u7EF4\u62A4\u4E1A\u52A1\u5BF9\u8C61") : /*#__PURE__*/React.createElement(FieldsSettingsTable, _objectSpread2({}, tableParams))), /*#__PURE__*/React.createElement("div", {
+    style: {
+      flex: 1
+    }
+  }, /*#__PURE__*/React.createElement(Editor, {
     type: "table",
     onRun: onClickRun,
     value: jsonEditorVal,
     shallowHeight: height
-  })), !visible && isAdmin() && /*#__PURE__*/React.createElement(ConfigButton, {
+  })))), tableJsonEditorValsArr.map(function (k) {
+    return /*#__PURE__*/React.createElement(Tabs.TabPane, {
+      tab: k.title,
+      key: k.tableCode
+    }, /*#__PURE__*/React.createElement("div", {
+      style: {
+        display: 'flex'
+      }
+    }, /*#__PURE__*/React.createElement("div", {
+      style: {
+        flex: 1,
+        width: 500
+      }
+    }, !tablesConfigParams[k.tableCode] ? /*#__PURE__*/React.createElement("div", {
+      style: {
+        padding: "10px 0",
+        fontSize: "16px",
+        fontWeight: "bolder"
+      }
+    }, "\u63D0\u793A\uFF1A\u4E1A\u52A1\u5BF9\u8C61\u672A\u7EF4\u62A4\uFF0C\u8BF7\u5728\u901A\u7528\u5355\u636E\u5BF9\u5E94\u4E1A\u52A1\u7C7B\u578B\u4E0B\u7EF4\u62A4\u4E1A\u52A1\u5BF9\u8C61") : /*#__PURE__*/React.createElement(FieldsSettingsTable, _objectSpread2({}, tablesConfigParams[k.tableCode]))), /*#__PURE__*/React.createElement("div", {
+      style: {
+        flex: 1
+      }
+    }, /*#__PURE__*/React.createElement(Editor, {
+      type: "table",
+      onRun: onClickRunDetailTables,
+      value: k.columns,
+      shallowHeight: height
+    }))));
+  }))), !visible && isAdmin() && /*#__PURE__*/React.createElement(ConfigButton, {
     type: 'primary',
     onClick: function onClick() {
       return setVisible(true);