From e94beb9fbd607847f8312f63a869e292289eda81 Mon Sep 17 00:00:00 2001
From: RubyLiu <liulubingjava@163.com>
Date: Wed, 6 Sep 2023 11:33:01 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/pure/ms-table/base-table.vue   | 29 ++++++++++++++++++-
 .../project/components/addProjectModal.vue    |  3 +-
 .../organization/project/orgProject.vue       |  6 ++--
 .../components/systemOrganization.vue         |  7 +++--
 .../components/systemProject.vue              |  5 ++--
 5 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/frontend/src/components/pure/ms-table/base-table.vue b/frontend/src/components/pure/ms-table/base-table.vue
index 053f947b35..9cde4054b5 100644
--- a/frontend/src/components/pure/ms-table/base-table.vue
+++ b/frontend/src/components/pure/ms-table/base-table.vue
@@ -26,7 +26,6 @@
           :width="item.width"
           :align="item.align"
           :fixed="item.fixed"
-          :ellipsis="item.ellipsis"
           :sortable="item.sortable"
           :filterable="item.filterable"
           :cell-class="item.cellClass"
@@ -112,6 +111,33 @@
                   </template>
                 </a-tooltip>
               </template>
+              <template v-else-if="item.ellipsis">
+                <a-input
+                  v-if="
+                    editActiveKey === `${item.dataIndex}${rowIndex}` &&
+                    item.editable &&
+                    item.editType === ColumnEditTypeEnum.INPUT
+                  "
+                  ref="currentInputRef"
+                  v-model="record[item.dataIndex as string]"
+                  @blur="handleEditInputBlur()"
+                  @press-enter="handleEditInputEnter(record)"
+                />
+                <template v-else>
+                  <div class="one-line-text max-w-[300px]">
+                    <slot :name="item.slotName" v-bind="{ record, rowIndex, column }">
+                      {{ record[item.dataIndex as string] || '-' }}
+                    </slot>
+                  </div>
+                  <MsIcon
+                    v-if="item.editable && !record.deleted"
+                    class="ml-2 cursor-pointer"
+                    :class="{ 'ms-table-edit-active': editActiveKey === rowIndex }"
+                    type="icon-icon_edit_outlined"
+                    @click="handleEdit(item.dataIndex as string, rowIndex)"
+                  />
+                </template>
+              </template>
               <template v-else>
                 <a-input
                   v-if="
@@ -350,6 +376,7 @@
       currentInputRef.value[0].focus();
     } else {
       nextTick(() => {
+        debugger;
         currentInputRef.value[0].focus();
       });
     }
diff --git a/frontend/src/views/setting/organization/project/components/addProjectModal.vue b/frontend/src/views/setting/organization/project/components/addProjectModal.vue
index 2e136085bd..b1996a0d4a 100644
--- a/frontend/src/views/setting/organization/project/components/addProjectModal.vue
+++ b/frontend/src/views/setting/organization/project/components/addProjectModal.vue
@@ -3,7 +3,6 @@
     v-model:visible="currentVisible"
     width="680px"
     class="ms-modal-form ms-modal-medium"
-    :ok-text="isEdit ? t('common.update') : t('common.create')"
     unmount-on-close
     @cancel="handleCancel(false)"
   >
@@ -104,7 +103,7 @@
   const formRef = ref<FormInstance>();
 
   const loading = ref(false);
-  const isEdit = computed(() => !!props.currentProject);
+  const isEdit = computed(() => props.currentProject && props.currentProject.id);
   const affiliatedOrgOption = ref<SystemOrgOption[]>([]);
   const appStore = useAppStore();
   const currentOrgId = computed(() => appStore.currentOrgId);
diff --git a/frontend/src/views/setting/organization/project/orgProject.vue b/frontend/src/views/setting/organization/project/orgProject.vue
index 55d18585c1..a500ea1840 100644
--- a/frontend/src/views/setting/organization/project/orgProject.vue
+++ b/frontend/src/views/setting/organization/project/orgProject.vue
@@ -101,8 +101,6 @@
       dataIndex: 'num',
       width: 100,
       showTooltip: true,
-      editable: true,
-      editType: ColumnEditTypeEnum.INPUT,
     },
     {
       title: 'system.organization.name',
@@ -110,7 +108,7 @@
       editable: true,
       editType: ColumnEditTypeEnum.INPUT,
       dataIndex: 'name',
-      showTooltip: true,
+      ellipsis: true,
     },
     {
       title: 'system.organization.member',
@@ -251,7 +249,6 @@
 
   const showAddProjectModal = (record: any) => {
     const { id, name, description, enable, adminList, organizationId, moduleIds } = record;
-    addProjectVisible.value = true;
     currentUpdateProject.value = {
       id,
       name,
@@ -261,6 +258,7 @@
       organizationId,
       moduleIds,
     };
+    addProjectVisible.value = true;
   };
 
   const showAddUserModal = (record: any) => {
diff --git a/frontend/src/views/setting/system/organizationAndProject/components/systemOrganization.vue b/frontend/src/views/setting/system/organizationAndProject/components/systemOrganization.vue
index e39a270f4e..fb1d8ea607 100644
--- a/frontend/src/views/setting/system/organizationAndProject/components/systemOrganization.vue
+++ b/frontend/src/views/setting/system/organizationAndProject/components/systemOrganization.vue
@@ -65,7 +65,7 @@
     revokeDeleteOrg,
     createOrUpdateOrg,
   } from '@/api/modules/setting/organizationAndProject';
-  import { TableKeyEnum } from '@/enums/tableEnum';
+  import { ColumnEditTypeEnum, TableKeyEnum } from '@/enums/tableEnum';
   import { MsTableColumn } from '@/components/pure/ms-table/type';
   import MsTableMoreAction from '@/components/pure/ms-table-more-action/index.vue';
   import MsButton from '@/components/pure/ms-button/index.vue';
@@ -105,7 +105,8 @@
       dataIndex: 'name',
       width: 200,
       editable: true,
-      showTooltip: true,
+      editType: ColumnEditTypeEnum.INPUT,
+      ellipsis: true,
     },
     {
       title: 'system.organization.member',
@@ -123,6 +124,7 @@
     {
       title: 'system.organization.description',
       dataIndex: 'description',
+      showTooltip: true,
     },
     {
       title: 'system.organization.creator',
@@ -306,4 +308,3 @@
     cursor: pointer;
   }
 </style>
-@/api/modules/setting/organizationAndProject
diff --git a/frontend/src/views/setting/system/organizationAndProject/components/systemProject.vue b/frontend/src/views/setting/system/organizationAndProject/components/systemProject.vue
index b8a3a8b867..6e2a687909 100644
--- a/frontend/src/views/setting/system/organizationAndProject/components/systemProject.vue
+++ b/frontend/src/views/setting/system/organizationAndProject/components/systemProject.vue
@@ -60,7 +60,7 @@
     revokeDeleteProject,
     createOrUpdateProject,
   } from '@/api/modules/setting/organizationAndProject';
-  import { TableKeyEnum } from '@/enums/tableEnum';
+  import { ColumnEditTypeEnum, TableKeyEnum } from '@/enums/tableEnum';
   import { MsTableColumn } from '@/components/pure/ms-table/type';
   import MsTableMoreAction from '@/components/pure/ms-table-more-action/index.vue';
   import MsButton from '@/components/pure/ms-button/index.vue';
@@ -99,7 +99,8 @@
       slotName: 'name',
       dataIndex: 'name',
       editable: true,
-      showTooltip: true,
+      editType: ColumnEditTypeEnum.INPUT,
+      ellipsis: true,
       width: 300,
     },
     {