Merge branch 'feature/sonar-issue' of git.quantgroup.cn:ui/merchant-manage-ui...

Merge branch 'feature/sonar-issue' of git.quantgroup.cn:ui/merchant-manage-ui into feature/merchant-info-alter

src/components/CustomTree/index.jsx

@@ -24,7 +24,7 @@ const CustomTree = forwardRef(props => {
     const findArr = childrens => {
       childrens.forEach(node => {
         if (node.children && node.children.length) {
-          node.visibleChildren && arr.push(initChildrenStatus(node.children, node.checked));
+          node.visibleChildren && arr.push(initChildrenStatus(node.children));
           findArr(node.children);
         }
       });
@@ -69,7 +69,7 @@ const CustomTree = forwardRef(props => {
         }
       });
     };
-    props.value && props.value.length && checkfn(props.value, json);
+    props.value && props.value.length && checkfn(props.value);
   };
   // 格式化数据
   const filterData = (arr, parentChecked) => {
@@ -247,7 +247,7 @@ const CustomTree = forwardRef(props => {
       await getSyncLoadChildrens(datas, ckey, isChecked);
     }
     changeChecked(datas, ckey, isChecked);
-    const values = getCheckTreeValue(datas, isChecked);
+    const values = getCheckTreeValue(datas);
     if (level === 1) {
       onVisibleChildren('', false);
     }

src/pages/ServiceGoods/components/FormTakeaway.jsx

@@ -989,7 +989,7 @@ const TakeawayGoodsInfo = forwardRef((props, ref) => {
                 singularSpu[0]?.specs[0]?.unit &&
                 singularSpu.map((item, index) => (
                   <div className={styles.specsSingularBetween}>
-                    <Form.Item label={calcLabelName(item, 'singular')}>
+                    <Form.Item label={calcLabelName(item)}>
                       <div className={styles.specsSingularBetween}>
                         <span className={styles.repertoryLimit}>
                           {item?.specs[0]?.productStock}/{item?.specs[0]?.maxStock}

src/pages/ServiceGoods/index.jsx

@@ -355,7 +355,7 @@ const ServiceGoods = options => {
           setIsUseCache(true);
           setVisibleCacheEdit(false);
           onSetData(SourceData);
-          onValuesChange(SourceData, !0);
+          onValuesChange(SourceData);
           // 外卖类型---
           if (SourceData && SourceData?.type === 5) {
             setTakeawayEditData(SourceData);