Merge branch 'release/2.19.1.2501.01' into release/2.19.1.2501.01-个税

pc4mobx/hrmSalary/pages/ledgerPage/components/index.less

@@ -41,6 +41,10 @@
 .baseSettingWrapper {
   padding: 12px 12px 12px 20px;
 
+  .wea-form-item-wrapper {
+    display: inline-block !important;
+  }
+
   .baseSettingLeft {
     border: 1px solid #ebedf0;
     padding: 0 !important;

pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemBaseInfo.js

@@ -46,7 +46,7 @@ class LedgerSalaryItemBaseInfo extends Component {
   };
   handleDeleteEmplist = (item) => {
     const { dataSource, onChangeSortableList } = this.props;
-    onChangeSortableList(_.xorWith(dataSource, [item], _.isEqual));
+    onChangeSortableList(_.filter(dataSource, o => o.id !== item.id));
   };
 
   render() {

pc4mobx/hrmSalary/pages/salaryItem/index.less

@@ -200,6 +200,7 @@
       border: 1px solid #e5e5e5 !important;
       padding: 4px 8px !important;
       min-height: 70px !important;
+      word-wrap: break-word;
     }
   }
 }