Merge branch 'v4' of github.com:jumpserver/lina into v4

src/views/ops/Execution/index.vue

@@ -56,12 +56,6 @@ export default {
               return <span>{row.job?.name || '-'}</span>
             }
           },
-          material: {
-            width: '160px'
-          },
-          job_type: {
-            width: '96px'
-          },
           is_finished: {
             width: '96px',
             formatter: (row) => {

src/views/ops/File/index.vue

@@ -53,10 +53,9 @@
                 multiple
               >
                 <i class="el-icon-upload" />
-                <div class="el-upload__text">
+                <div class="el-upload__text" style="margin-bottom: 10px">
                   {{ $t('DragUploadFileInfo') }}
                 </div>
-                <br>
                 <span>
                   {{ $t('UploadFileLthHelpText', {limit: SizeLimitMb}) }}
                 </span>
@@ -81,7 +80,7 @@
               </div>
             </el-card>
           </div>
-          <b>{{ $tc('Output') }}:</b>
+          <div style="margin-bottom: 5px;font-weight: bold">{{ $tc('Output') }}:</div>
           <span v-if="executionInfo.status && summary" style="float: right">
             <span>
               <span><b>{{ $tc('Status') }}: </b></span>

src/views/ops/Job/QuickJob.vue

@@ -18,7 +18,7 @@
             :value.sync="command"
             style="margin-bottom: 20px"
           />
-          <b>{{ $tc('Output') }}:</b>
+          <div style="margin-bottom: 5px;font-weight: bold">{{ $tc('Output') }}:</div>
           <span v-if="executionInfo.status" style="float: right">
             <span>
               <span><b>{{ $tc('Status') }}: </b></span>

src/views/ops/Job/index.vue

@@ -36,6 +36,7 @@ export default {
         ],
         columnsMeta: {
           name: {
+            width: '140px',
             formatterArgs: {
               can: true
             }
@@ -51,19 +52,16 @@ export default {
           },
           summary: {
             label: this.$t('Summary(success/total)'),
-            width: '140px',
             formatter: (row) => {
               return row.summary['success'] + '/' + row.summary['total']
             }
           },
           average_time_cost: {
-            width: '140px',
             formatter: (row) => {
               return row.average_time_cost.toFixed(2) + 's'
             }
           },
           asset_amount: {
-            width: '140px',
             label: this.$t('AssetAmount'),
             formatter: (row) => {
               return row.assets.length

src/views/ops/Template/Adhoc.vue

@@ -16,7 +16,7 @@ export default {
         url: '/api/v1/ops/adhocs/',
         columnsShow: {
           min: ['name', 'actions'],
-          default: ['name', 'module', 'comment', 'args', 'comment', 'date_created', 'actions']
+          default: ['name', 'module', 'args', 'comment', 'date_created', 'actions']
         },
         columnsMeta: {
           name: {

src/views/settings/Feature/Chat.vue

@@ -40,16 +40,11 @@ export default {
       ],
       encryptedFields: ['VAULT_HCP_TOKEN'],
       fields: [
-        [
+        'CHAT_AI_ENABLED',
-          this.$t('ChatAI'),
+        'GPT_MODEL',
-          [
+        'GPT_BASE_URL',
-            'CHAT_AI_ENABLED',
+        'GPT_API_KEY',
-            'GPT_MODEL',
+        'GPT_PROXY'
-            'GPT_BASE_URL',
-            'GPT_API_KEY',
-            'GPT_PROXY'
-          ]
-        ]
       ],
       fieldsMeta: {
         GPT_BASE_URL: {

src/views/settings/Feature/Ops.vue

@@ -25,9 +25,7 @@ export default {
       visible: false,
       config: {
         fields: [
-          [this.$t('Basic'), [
+          'SECURITY_COMMAND_EXECUTION', 'SECURITY_COMMAND_BLACKLIST'
-            'SECURITY_COMMAND_EXECUTION', 'SECURITY_COMMAND_BLACKLIST'
-          ]]
         ],
         fieldsMeta: {
         },

src/views/settings/Feature/Vault.vue

@@ -60,15 +60,15 @@ export default {
       ],
       encryptedFields: ['VAULT_HCP_TOKEN'],
       fields: [
-        [this.$t('Basic'), ['HISTORY_ACCOUNT_CLEAN_LIMIT']],
+        [this.$t('Storage'),
-        [this.$t('AccountStorage'),
           [
             'VAULT_ENABLED',
             'VAULT_HCP_HOST',
             'VAULT_HCP_TOKEN',
             'VAULT_HCP_MOUNT_POINT'
           ]
-        ]
+        ],
+        [this.$t('HistoryRecord'), ['HISTORY_ACCOUNT_CLEAN_LIMIT']]
       ],
       fieldsMeta: {
         HISTORY_ACCOUNT_CLEAN_LIMIT: {

src/views/settings/Feature/VirtualApp.vue

@@ -24,9 +24,7 @@ export default {
     return {
       visible: false,
       config: {
-        fields: [
+        fields: ['VIRTUAL_APP_ENABLED'],
-          [this.$t('Basic'), ['VIRTUAL_APP_ENABLED']]
-        ],
         fieldsMeta: {
         },
         successUrl: { name: 'Settings', params: { activeMenu: 'Basic' }},

src/views/settings/License.vue

@@ -112,7 +112,7 @@ export default {
           value: this.licenseData.date_expired
         },
         {
-          key: this.$t('AssetCount'),
+          key: this.$t('AssetAmount'),
           value: this.licenseData.asset_count !== null ? this.licenseData.asset_count + '' : ''
         },
         {

src/views/settings/Msg/Email/index.vue

@@ -28,7 +28,7 @@ export default {
     return {
       fields: [
         [
-          this.$t('SMTP'),
+          this.$t('Server'),
           [
             'SMTP'
           ]