From 19597adc4192f7af1f1e8095e6534d2ac72984b8 Mon Sep 17 00:00:00 2001 From: Caozhenhui <823914102@qq.com> Date: Thu, 30 Dec 2021 15:48:38 +0800 Subject: [PATCH 1/2] added for point.object_type --- admin/app/controllers/settings/datasource/point.controller.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/admin/app/controllers/settings/datasource/point.controller.js b/admin/app/controllers/settings/datasource/point.controller.js index e426df06..f31d8db1 100644 --- a/admin/app/controllers/settings/datasource/point.controller.js +++ b/admin/app/controllers/settings/datasource/point.controller.js @@ -183,6 +183,10 @@ app.controller('ModalAddPointCtrl', function($scope, $uibModalInstance) { $scope.cancel = function() { $uibModalInstance.dismiss('cancel'); }; + + $scope.$watch("point.object_type",function () { + $scope.point.is_virtual = false; + }) }); app.controller('ModalEditPointCtrl', function($scope, $uibModalInstance, params) { From afd29bf8bce4d298389e3e9440b73a039aaa0106 Mon Sep 17 00:00:00 2001 From: Caozhenhui <823914102@qq.com> Date: Thu, 30 Dec 2021 17:00:33 +0800 Subject: [PATCH 2/2] object_types is disabled when editing point --- admin/app/controllers/settings/datasource/point.controller.js | 4 ++-- admin/views/settings/datasource/point.model.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/admin/app/controllers/settings/datasource/point.controller.js b/admin/app/controllers/settings/datasource/point.controller.js index f31d8db1..e8753b58 100644 --- a/admin/app/controllers/settings/datasource/point.controller.js +++ b/admin/app/controllers/settings/datasource/point.controller.js @@ -186,13 +186,13 @@ app.controller('ModalAddPointCtrl', function($scope, $uibModalInstance) { $scope.$watch("point.object_type",function () { $scope.point.is_virtual = false; - }) + }); }); app.controller('ModalEditPointCtrl', function($scope, $uibModalInstance, params) { $scope.operation = "SETTING.EDIT_POINT"; $scope.point = params.point; - + $scope.is_edit = true; $scope.ok = function() { $uibModalInstance.close($scope.point); }; diff --git a/admin/views/settings/datasource/point.model.html b/admin/views/settings/datasource/point.model.html index 4d135b36..3093bc8f 100644 --- a/admin/views/settings/datasource/point.model.html +++ b/admin/views/settings/datasource/point.model.html @@ -16,7 +16,7 @@
-