可以在集群中指定节点时区

internal/web/actions/default/clusters/cluster/settings/index.go

@@ -4,6 +4,7 @@ import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/grants/grantutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
@@ -21,6 +22,7 @@ func (this *IndexAction) Init() {
 func (this *IndexAction) RunGet(params struct {
 	ClusterId int64
 }) {
+	// 基本信息
 	clusterResp, err := this.RPC().NodeClusterRPC().FindEnabledNodeCluster(this.AdminContext(), &pb.FindEnabledNodeClusterRequest{NodeClusterId: params.ClusterId})
 	if err != nil {
 		this.ErrorPage(err)
@@ -53,10 +55,20 @@ func (this *IndexAction) RunGet(params struct {
 	}
 	this.Data["grant"] = grantMap
 
+	// 时区
+	this.Data["timeZoneGroups"] = nodeconfigs.FindAllTimeZoneGroups()
+	this.Data["timeZoneLocations"] = nodeconfigs.FindAllTimeZoneLocations()
+
+	if len(cluster.TimeZone) == 0 {
+		cluster.TimeZone = nodeconfigs.DefaultTimeZoneLocation
+	}
+	this.Data["timeZoneLocation"] = nodeconfigs.FindTimeZoneLocation(cluster.TimeZone)
+
 	this.Data["cluster"] = maps.Map{
 		"id":         cluster.Id,
 		"name":       cluster.Name,
 		"installDir": cluster.InstallDir,
+		"timeZone":   cluster.TimeZone,
 	}
 
 	this.Show()
@@ -68,6 +80,7 @@ func (this *IndexAction) RunPost(params struct {
 	Name       string
 	GrantId    int64
 	InstallDir string
+	TimeZone   string
 
 	Must *actions.Must
 }) {
@@ -83,6 +96,7 @@ func (this *IndexAction) RunPost(params struct {
 		Name:          params.Name,
 		NodeGrantId:   params.GrantId,
 		InstallDir:    params.InstallDir,
+		TimeZone:      params.TimeZone,
 	})
 	if err != nil {
 		this.ErrorPage(err)

web/views/@default/clusters/cluster/settings/index.html

@@ -2,7 +2,6 @@
 {$template "/left_menu"}
 
 <div class="right-box">
-	<h3>基础设置</h3>
 	<form method="post" class="ui form" data-tea-action="$" data-tea-success="success">
 		<input type="hidden" name="clusterId" :value="cluster.id"/>
 		<table class="ui table selectable definition">
@@ -24,6 +23,23 @@
 					<p class="comment">当节点没有单独设置安装目录时，默认使用此设置。如果集群和节点都没有设置安装目录，则使用<span class="ui label tiny">/$登录用户/edge-node</span> 目录。</p>
 				</td>
 			</tr>
+            <tr>
+                <td>时区</td>
+                <td>
+                    <div class="ui fields inline">
+                        <div class="ui field">
+                            <select class="ui dropdown" v-model="timeZoneGroupCode">
+                                <option v-for="timeZoneGroup in timeZoneGroups" :value="timeZoneGroup.code">{{timeZoneGroup.name}}</option>
+                            </select>
+                        </div>
+                        <div class="ui field">
+                            <select class="ui dropdown" name="timeZone" v-model="cluster.timeZone">
+                                <option v-for="timeZoneLocation in timeZoneLocations" :value="timeZoneLocation.name" v-if="timeZoneLocation.group == timeZoneGroupCode">{{timeZoneLocation.name}} ({{timeZoneLocation.offset}})</option>
+                            </select>
+                        </div>
+                    </div>
+                </td>
+            </tr>
 		</table>
 		<submit-btn></submit-btn>
 	</form>

web/views/@default/clusters/cluster/settings/index.js

@@ -1,3 +1,25 @@
 Tea.context(function () {
 	this.success = NotifyReloadSuccess("保存成功")
+
+	this.timeZoneGroupCode = "asia"
+	if (this.timeZoneLocation != null) {
+		this.timeZoneGroupCode = this.timeZoneLocation.group
+	}
+
+	this.$delay(function () {
+		this.$watch("timeZoneGroupCode", function (groupCode) {
+			let firstLocation = null
+			this.timeZoneLocations.forEach(function (v) {
+				if (firstLocation != null) {
+					return
+				}
+				if (v.group == groupCode) {
+					firstLocation = v
+				}
+			})
+			if (firstLocation != null) {
+				this.cluster.timeZone = firstLocation.name
+			}
+		})
+	})
 })