ow

WebVue/src/views/master/FamilyPersonQuickCreateModal.vue

@@ -209,4 +209,14 @@ const handleOk = async () => {
   margin-left: 2px;
   color: #ff4d4f;
 }
+
+/* 弹窗外壳上存在全局（非 scoped）样式会把 select 的左边框去掉，例如：
+   ColumnModal.vue 的   .ant-modal-body .ant-select-single .ant-select-selector { border-left: 0 !important }
+   DmsFolderModal.vue 的 .draggable-modal .ant-select-single .ant-select-selector { border-left: 0 !important }
+   它们本意只想作用于自己那个弹窗，却因为写成了全局选择器而命中所有弹窗。
+   这里用更高优先级显式恢复完整边框，使「性别」与同弹窗的两个输入框外观一致。 */
+.fpcq-form .fpcq-field :deep(.ant-select-single .ant-select-selector) {
+  border: 1px solid #d9d9d9 !important;
+  border-radius: 6px !important;
+}
 </style>

WebVue/src/views/master/FamilyTreeOperation.vue

@@ -11,8 +11,7 @@
           <a-button type="primary" :disabled="isEdit" :icon="h(FileSearchOutlined)"
             @click.prevent="onSearch">查询</a-button>
           <a-button :disabled="isEdit" :icon="h(ClearOutlined)" @click.prevent="onReset">重置</a-button>
-          <a-button type="primary" :disabled="isEdit" :icon="h(FileAddOutlined)"
+          <a-button type="primary" :disabled="isEdit" :icon="h(FileAddOutlined)" @click.prevent="onCreate">新增</a-button>
-            @click.prevent="onCreate">新增</a-button>
         </div>
       </div>
       <div class="page-main ft-page" :class="{ 'ft-readonly': !isEdit }" :style="{ height: resultH }">
@@ -72,9 +71,9 @@
               <div class="ft-inline">
                 <a-input-group compact class="ft-inline-main" style="display: flex; width: 100%">
                   <a-input size="large" :disabled="true" v-model:value="data.FamilyTree.AncestorPersonGenealogyName"
-                    placeholder="族谱名" style="width: 50%" />
+                    placeholder="尚未指定祖先" style="flex: 1 1 auto; min-width: 0" />
-                  <a-input-search size="large" required :disabled="!isCreate" style="width: 50%"
+                  <a-button size="large" :disabled="!isCreate" :icon="h(UserAddOutlined)" style="flex: 0 0 auto"
-                    v-model:value="data.FamilyTree.AncestorPersonId" @search="onModalPerson" />
+                    @click.prevent="onModalPerson">新增祖先</a-button>
                 </a-input-group>
                 <a-button class="ft-inline-btn" size="large" type="primary" :disabled="!hasData"
                   :icon="h(ApartmentOutlined)" @click.prevent="onShowAncestryChart">祖谱系图</a-button>
@@ -463,6 +462,7 @@ import {
   CloseCircleOutlined,
   CrownOutlined,
   RightOutlined,
+  UserAddOutlined,
 } from "@ant-design/icons-vue";
 import {
   PermissionContext,
@@ -1002,6 +1002,7 @@ const onReset = () => {
 const onCreate = () => {
   onReset();
   isEdit.value = true;
+  isCreate.value = true;
 };
 
 const onAmend = () => {
@@ -1843,7 +1844,7 @@ const onPersonQuickCreated = (person: FamilyPersonDisplayData) => {
   background: #fff;
 }
 
-.family-tree-op .page-header .fto-search-input .ant-input-group > .ant-input {
+.family-tree-op .page-header .fto-search-input .ant-input-group>.ant-input {
   border-radius: 9px 0 0 9px !important;
 }
 
@@ -1917,8 +1918,9 @@ const onPersonQuickCreated = (person: FamilyPersonDisplayData) => {
   border-radius: 0 !important;
 }
 
-.family-tree-op .page-main.ft-page .ft-inline-main .ant-input-search .ant-input-affix-wrapper {
+/* 「祖先」行右侧的「新增祖先」按钮：与左侧输入框拼成一整块，去掉自身圆角，由外层容器统一裁切 */
-  border-left: 0;
+.family-tree-op .page-main.ft-page .ft-inline-main.ant-input-group .ant-btn {
+  border-radius: 0 !important;
 }
 
 /* 「当前族员」两个按钮等宽 */