Merge remote-tracking branch 'origin/branch20240105'

src/components/company/SelectPrincipal.vue

@@ -1,11 +1,9 @@
 <template>
-  <!-- fix:80446 解决选择内容过长将选择框拉长 -->
   <a-select :value="value"
             v-bind="$attrs"
             v-on="$listeners"
             show-search
             allowClear
-            style="max-width: 180px"
             option-filter-prop="children"
             :filter-option="filterOption">
     <a-select-option v-for="item in userList" :key="item.id" :value="item.id" :title="`${ item.realname }(${ item.orgCodeTxt })`">

src/components/page/GlobalLayout.vue

@@ -667,6 +667,7 @@ body {
       margin-right: 10px;
 
       .ant-form-item-control-wrapper {
+        width: 0;
         flex: 1 1;
         display: inline-block;
         vertical-align: middle;