From d2b6eab486f787ceda26193336755b99f68e938d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E6=B4=AA?=
 <liuhonghong@geedgenetworks.com>
Date: Tue, 19 Nov 2024 10:03:59 +0800
Subject: [PATCH] =?UTF-8?q?fix:=201=E3=80=81=E8=BF=98=E5=8E=9Fsetting?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2ctime=E3=80=81utime=E3=80=81enabled=E7=AD=89?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=9B2=E3=80=81=E8=B0=83=E6=95=B4entity?=
 =?UTF-8?q?=20setting=E5=88=97=E8=A1=A8=E9=97=B4=E8=B7=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/table/setting/ProfilesTable.vue    | 15 ++++++++-------
 src/components/table/setting/SourcesTable.vue     |  4 ++--
 .../setting/entitySetting/EntitySettingForm.vue   |  6 +++---
 src/views/setting/sources/SourcesForm.vue         |  6 +++---
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/components/table/setting/ProfilesTable.vue b/src/components/table/setting/ProfilesTable.vue
index 6376197d..b2adbff8 100644
--- a/src/components/table/setting/ProfilesTable.vue
+++ b/src/components/table/setting/ProfilesTable.vue
@@ -33,7 +33,7 @@
         <div class="col-resize-area"></div>
       </template>
       <template #default="scope" :column="item">
-        <template v-if="item.prop === 'create_time' || item.prop === 'update_time'">
+        <template v-if="item.prop === 'ctime' || item.prop === 'utime'">
           <template v-if="scope.row[item.prop]">
             {{ dateFormatByAppearance(scope.row[item.prop]) || '-' }}
           </template>
@@ -83,13 +83,13 @@ export default {
           prop: 'entitySource',
           show: true,
           sortable: 'custom',
-          minWidth: 200
+          minWidth: 100
         },
         {
           label: this.$t('setting.entityTypes'),
           prop: 'entities',
           show: true,
-          minWidth: 200
+          minWidth: 150
         },
         {
           label: this.$t('setting.relationTypes'),
@@ -99,14 +99,15 @@ export default {
         },
         {
           label: this.$t('config.user.createTime'),
-          prop: 'create_time',
+          prop: 'ctime',
           show: true,
-          minWidth: 200
+          minWidth: 150
         },
         {
           label: this.$t('overall.updateTime'),
-          prop: 'update_time',
-          show: true
+          prop: 'utime',
+          show: true,
+          minWidth: 150
         }
       ]
     }
diff --git a/src/components/table/setting/SourcesTable.vue b/src/components/table/setting/SourcesTable.vue
index aa82ebca..3609bc0d 100644
--- a/src/components/table/setting/SourcesTable.vue
+++ b/src/components/table/setting/SourcesTable.vue
@@ -33,7 +33,7 @@
         <div class="col-resize-area"></div>
       </template>
       <template #default="scope" :column="item">
-        <template v-if="item.prop === 'create_time'">
+        <template v-if="item.prop === 'ctime'">
           <template v-if="scope.row[item.prop]">
             {{ dateFormatByAppearance(scope.row[item.prop]) || '-' }}
           </template>
@@ -144,7 +144,7 @@ export default {
         },
         {
           label: this.$t('config.user.createTime'),
-          prop: 'create_time',
+          prop: 'ctime',
           show: true,
           minWidth: 150
         },
diff --git a/src/views/setting/entitySetting/EntitySettingForm.vue b/src/views/setting/entitySetting/EntitySettingForm.vue
index 76813f26..ecf7dafa 100644
--- a/src/views/setting/entitySetting/EntitySettingForm.vue
+++ b/src/views/setting/entitySetting/EntitySettingForm.vue
@@ -182,10 +182,10 @@
       <div class="switch__block margin-20">
         <div class="block-title">{{ $t('overall.status') }}</div>
         <el-switch
-            v-model="editObj.is_valid"
+            v-model="editObj.enable"
             :active-value="1"
             :inactive-value="0"
-            :active-text="$t(switchStatus(editObj.is_valid))"/>
+            :active-text="$t(switchStatus(editObj.enable))"/>
       </div>
     </div>
 
@@ -295,7 +295,7 @@ export default {
       relationData: {
         data: [{ from_entity_index: '', to_entity_index: '', type: '', fromDisabled: false, toDisabled: false }]
       },
-      is_valid: 1
+      enable: 1
     })
 
     return {
diff --git a/src/views/setting/sources/SourcesForm.vue b/src/views/setting/sources/SourcesForm.vue
index 4f686a19..0cabd4af 100644
--- a/src/views/setting/sources/SourcesForm.vue
+++ b/src/views/setting/sources/SourcesForm.vue
@@ -142,10 +142,10 @@
       <div class="form-setting__block margin-b-20">
         <div class="block-title">{{ $t('overall.status') }}</div>
         <el-switch
-            v-model="sourceObj.is_valid"
+            v-model="sourceObj.enable"
             :active-value="1"
             :inactive-value="0"
-            :active-text="$t(switchStatus(sourceObj.is_valid))"/>
+            :active-text="$t(switchStatus(sourceObj.enable))"/>
       </div>
     </div>
 
@@ -482,7 +482,7 @@ export default {
         data: [{ function: '', lookup_field: '', output_type: '', output_field: '' }]
       },
       description: '',
-      is_valid: 1
+      enable: 1
     }
     const sourceObj = ref(_.cloneDeep(blankObject))
     return {