fix: merge hotfixs to 1.5 (#2369)

* fix: hide email and label of member table (#2343) (#2346)

Co-authored-by: sherotree <[email protected]>

* feat: modify route about service analysis (#2342) (#2347)

* feat: modiify route about service analysis

* fix: route when click service monitoor menu

Co-authored-by: sherotree <[email protected]>

* fix: trace detail bgo back to transaction in service monitor (#2349) (#2350)

Co-authored-by: sherotree <[email protected]>

* fix(common): msp project detail display bug in orgCenter (#2351) (#2352)

Co-authored-by: hujiahao-hjh <[email protected]>

* Hotfix/select onchange (#2358) (#2359)

* fix: select not trigger passed in onChange function

* fix: update tag style in filter

Co-authored-by: 随风 <[email protected]>

Co-authored-by: erda-bot <[email protected]>
Co-authored-by: sherotree <[email protected]>
Co-authored-by: hujiahao-hjh <[email protected]>

Author: 4 people

shell/app/common/components/configurable-filter/index.scss

@@ -184,6 +184,8 @@
     .twt-tag-item {
       height: 20px;
       line-height: 20px;
+      margin-left: 0;
+      margin-right: 4px;
     }
 
     .rc-virtual-list-holder-inner {
@@ -193,6 +195,7 @@
 
     .ant-select-item {
       padding: 0;
+      margin-right: 4px;
       background-color: transparent !important;
     }
 

shell/app/common/components/render-form-item/index.tsx

@@ -215,7 +215,7 @@ const RenderFormItem = ({
 
       ItemComp = (
         <ClassWrapper>
-          <SelectComp options={options} size={size} itemProps={itemProps} />
+          <SelectComp options={options} size={size} {...itemProps} />
         </ClassWrapper>
       );
       action = i18n.t('common:select');
@@ -227,7 +227,7 @@ const RenderFormItem = ({
 
       ItemComp = (
         <ClassWrapper>
-          <TagsSelect options={options} size={size} itemProps={itemProps} />
+          <TagsSelect options={options} size={size} {...itemProps} />
         </ClassWrapper>
       );
       action = i18n.t('common:select');
@@ -278,8 +278,8 @@ const RenderFormItem = ({
       break;
     case 'dateRange':
       ItemComp = (
-        <ClassWrapper {...itemProps}>
-          <DateRange />
+        <ClassWrapper>
+          <DateRange {...itemProps} />
         </ClassWrapper>
       );
       break;
@@ -381,11 +381,11 @@ interface SelectCompProps {
   value: Array<number | string>;
   onChange: (value: Array<number | string>) => void;
   itemProps: Obj;
+  optionRender: (option: IOption) => JSX.Element;
 }
 
-const SelectComp = ({ value, onChange, options, size, itemProps }: SelectCompProps) => {
+const SelectComp = ({ value, onChange, options, size, optionRender, ...restItemProps }: SelectCompProps) => {
   const fixOptions = options.filter?.((item: IOption) => item.fix) || [];
-  const { optionRender, ...restItemProps } = itemProps;
   return (
     <Select
       {...restItemProps}
@@ -525,12 +525,12 @@ interface TagsSelectProps {
   itemProps: Obj;
 }
 
-const TagsSelect = ({ size, options, value = [], onChange, itemProps }: TagsSelectProps) => {
+const TagsSelect = ({ size, options, value = [], onChange, ...restItemProps }: TagsSelectProps) => {
   const [open, setOpen] = React.useState(false);
 
   return (
     <Select
-      {...itemProps}
+      {...restItemProps}
       value={value}
       onChange={onChange}
       className="erda-tags-select"