diff --git a/sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/authority.js b/sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/authority.js index 96ef1239..fb7b789d 100644 --- a/sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/authority.js +++ b/sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/authority.js @@ -55,7 +55,7 @@ angular.module('sentinelDashboardApp').controller('AuthorityRuleController', ['$ var authorityRuleDialog; $scope.editRule = function (rule) { - $scope.currentRule = rule; + $scope.currentRule = angular.copy(rule); $scope.authorityRuleDialog = { title: '编辑授权规则', type: 'edit', diff --git a/sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/degrade.js b/sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/degrade.js index 14423f65..45773c66 100755 --- a/sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/degrade.js +++ b/sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/degrade.js @@ -45,7 +45,7 @@ app.controller('DegradeCtl', ['$scope', '$stateParams', 'DegradeService', 'ngDia var degradeRuleDialog; $scope.editRule = function (rule) { - $scope.currentRule = rule; + $scope.currentRule = angular.copy(rule); $scope.degradeRuleDialog = { title: '编辑降级规则', type: 'edit', diff --git a/sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/flow_v1.js b/sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/flow_v1.js index d587a13d..643ff12d 100755 --- a/sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/flow_v1.js +++ b/sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/flow_v1.js @@ -61,7 +61,7 @@ app.controller('FlowControllerV1', ['$scope', '$stateParams', 'FlowServiceV1', ' var flowRuleDialog; $scope.editRule = function (rule) { - $scope.currentRule = rule; + $scope.currentRule = angular.copy(rule); $scope.flowRuleDialog = { title: '编辑流控规则', type: 'edit', diff --git a/sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/flow_v2.js b/sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/flow_v2.js index 4e11c244..8a98c8d5 100755 --- a/sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/flow_v2.js +++ b/sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/flow_v2.js @@ -61,7 +61,7 @@ app.controller('FlowControllerV2', ['$scope', '$stateParams', 'FlowServiceV2', ' var flowRuleDialog; $scope.editRule = function (rule) { - $scope.currentRule = rule; + $scope.currentRule = angular.copy(rule); $scope.flowRuleDialog = { title: '编辑流控规则', type: 'edit', @@ -88,7 +88,8 @@ app.controller('FlowControllerV2', ['$scope', '$stateParams', 'FlowServiceV2', ' limitApp: 'default', clusterMode: false, clusterConfig: { - thresholdType: 0 + thresholdType: 0, + fallbackToLocalWhenFail: true } }; $scope.flowRuleDialog = { diff --git a/sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/param_flow.js b/sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/param_flow.js index 4b6f799e..65cf157e 100644 --- a/sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/param_flow.js +++ b/sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/param_flow.js @@ -129,7 +129,7 @@ angular.module('sentinelDashboardApp').controller('ParamFlowController', ['$scop var paramFlowRuleDialog; $scope.editRule = function (rule) { - $scope.currentRule = rule; + $scope.currentRule = angular.copy(rule); $scope.paramFlowRuleDialog = { title: '编辑热点规则', type: 'edit', diff --git a/sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/system.js b/sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/system.js index c08d418f..8e7ed655 100755 --- a/sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/system.js +++ b/sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/system.js @@ -58,7 +58,7 @@ app.controller('SystemCtl', ['$scope', '$stateParams', 'SystemService', 'ngDialo $scope.getMachineRules = getMachineRules; var systemRuleDialog; $scope.editRule = function (rule) { - $scope.currentRule = rule; + $scope.currentRule = angular.copy(rule); $scope.systemRuleDialog = { title: '编辑系统保护规则', type: 'edit', diff --git a/sentinel-dashboard/src/main/webapp/resources/app/views/dialog/flow-rule-dialog.html b/sentinel-dashboard/src/main/webapp/resources/app/views/dialog/flow-rule-dialog.html index bd07ac36..b7dd29c5 100755 --- a/sentinel-dashboard/src/main/webapp/resources/app/views/dialog/flow-rule-dialog.html +++ b/sentinel-dashboard/src/main/webapp/resources/app/views/dialog/flow-rule-dialog.html @@ -53,7 +53,9 @@
+
@@ -66,6 +68,16 @@
+
+ +
+ +
+
+
@@ -133,4 +145,4 @@
- + \ No newline at end of file diff --git a/sentinel-dashboard/src/main/webapp/resources/app/views/metric.html b/sentinel-dashboard/src/main/webapp/resources/app/views/metric.html index ed08eb74..a77b895f 100755 --- a/sentinel-dashboard/src/main/webapp/resources/app/views/metric.html +++ b/sentinel-dashboard/src/main/webapp/resources/app/views/metric.html @@ -51,9 +51,9 @@ 时间 - p_qps - b_qps - rt(ms) + p_qps + b_qps + rt(ms)