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

src/components/Form/DataForm/components/el-form-renderer/el-form-renderer.vue

@@ -168,7 +168,11 @@ export default {
      * @param  {All} options.value 表单数据
      */
     updateValue({ id, value }) {
+      if (!value) return
       this.value = { ...this.value, [id]: value }
+      this.$nextTick(() => {
+        this.$refs.elForm.validateField(id)
+      })
     },
     /**
      * @return {object} key is item's id, value is item's value

src/views/accounts/AccountChangeSecret/Overview/CardSummary.vue

@@ -49,6 +49,7 @@ export default {
         {
           title: this.$t('Tasks'),
           body: {
+            route: { name: 'AccountChangeSecret' },
             count: this.data.total_count_change_secrets
           }
         },
@@ -71,6 +72,7 @@ export default {
         {
           title: this.$t('Total'),
           body: {
+            route: { name: 'AccountChangeSecretExecutionList' },
             count: this.data.total_count_change_secret_executions
           }
         },

src/views/assets/Domain/DomainDetail/AssetList.vue

@@ -29,7 +29,7 @@ export default {
     return {
       tableConfig: {
         category: 'all',
-        url: `/api/v1/assets/assets/?domain=${this.$route.params.id}&is_gateway=0`,
+        url: `/api/v1/assets/assets/?domain=${this.object.id}&is_gateway=0`,
         tableConfig: {
           columns: ['name', 'address', 'platform', 'actions'],
           columnsMeta: {

src/views/assets/Domain/DomainDetail/GatewayList.vue

@@ -39,7 +39,7 @@ export default {
   data() {
     return {
       tableConfig: {
-        url: `/api/v1/assets/gateways/?domain=${this.$route.params.id}`,
+        url: `/api/v1/assets/gateways/?domain=${this.object.id}`,
         columnsExclude: [
           'info', 'spec_info', 'auto_config'
         ],

src/views/assets/Domain/components/AddGatewayDialog.vue

@@ -41,6 +41,7 @@ export default {
     }
   },
   data() {
+    const vm = this
     return {
       formConfig: {
         getUrl: () => {
@@ -53,7 +54,7 @@ export default {
         createSuccessMsg: this.$t('AddSuccessMsg'),
         updateSuccessNextRoute: {
           name: 'ZoneDetail',
-          params: { id: this.$route.params.id }
+          params: { id: this.object.id }
         },
         fields: ['gateways'],
         fieldsMeta: {
@@ -73,7 +74,7 @@ export default {
         cleanFormValue(values) {
           const data = []
           values.gateways.forEach(item => {
-            const d = { id: item.pk, domain: this.$route.params.id }
+            const d = { id: item.pk, domain: vm.object.id }
             data.push(d)
           })
           return data

src/views/dashboard/Pam/MissionSummery.vue

@@ -25,8 +25,8 @@ export default {
   data() {
     return {
       config: {
-        title: this.$t('TaskDistribution'),
-        tip: this.$t('TaskDistribution')
+        title: this.$t('TaskSummary'),
+        tip: this.$t('TaskSummary')
       },
       counter: {
         total_count_change_secret_automation: 0,
@@ -61,7 +61,7 @@ export default {
         },
         series: [
           {
-            name: this.$t('TaskDistribution'),
+            name: this.$t('TaskSummary'),
             type: 'pie',
             top: '10%',
             radius: ['45%', '60%'],

src/views/dashboard/Pam/SummaryChart.vue

@@ -7,7 +7,7 @@
         </div>
 
         <div class="total-section">
-          <div class="total-title">Total accounts</div>
+          <div class="total-title">{{ $t('TotalAccounts') }}</div>
           <div class="total-account"> {{ config.total }} </div>
           <div class="week-add">
             <div class="week-add-title"> {{ $t('WeekAdd') }} </div>