Merge pull request #27 from humpback/develop-0.0.1

update multiple

Author: skyler-yang

front/projects/web/src/components/business/v-memo/VMemo.vue

@@ -5,7 +5,7 @@ const { t } = useI18n()
 </script>
 
 <template>
-  <v-tooltip v-if="props?.onlyIcon && props?.memo" :content="t(`err.${props?.memo}`)">
+  <v-tooltip v-if="props?.onlyIcon && props?.memo" :content="t(`err.${props?.memo}`)" effect="dark">
     <el-button link type="danger">
       <el-icon :size="props.iconSize">
         <IconMdiWarningCircleOutline />

front/projects/web/src/components/business/v-service/VServiceScheduleQuerySelect.vue

@@ -18,7 +18,7 @@ const { t } = useI18n()
 const schedule = computed({
   get: () => props.modelValue || "",
   set: (v: string) => {
-    emits("update:modelValue", v)
+    emits("update:modelValue", v || "")
   }
 })
 
@@ -38,10 +38,10 @@ function change() {
     :clearable="props.clearable"
     :out-label="t('label.schedule')"
     :placeholder="props.placeholder"
-    out-label-width="80px"
+    out-label-width="100px"
     show-out-label
     @change="change()">
-    <el-option :label="t('label.all')" :value="0" />
+    <el-option :label="t('label.all')" value="" />
     <el-option v-for="item in options" :key="item.value" :label="t(item.label)" :value="item.value" />
   </v-select>
 </template>

front/projects/web/src/components/business/v-service/VServiceStatusQuerySelect.vue

@@ -20,7 +20,7 @@ const { t } = useI18n()
 const status = computed({
   get: () => props.modelValue || "",
   set: (v: string) => {
-    emits("update:modelValue", v)
+    emits("update:modelValue", v || "")
   }
 })
 
@@ -51,7 +51,7 @@ function change() {
     out-label-width="80px"
     show-out-label
     @change="change()">
-    <el-option :label="t('label.all')" :value="0" />
+    <el-option :label="t('label.all')" value="" />
     <el-option v-for="item in options" :key="item.value" :label="t(item.label)" :value="item.value">
       <el-text :type="item.type">{{ t(item.label) }}</el-text>
     </el-option>

front/projects/web/src/locales/en-US/enum.ts

@@ -2,8 +2,7 @@ export default {
   role: {
     "admin": "Administrator",
     "user": "User",
-    "supperAdmin": "Supper Administrator",
-    "owner": "Owner"
+    "supperAdmin": "Supper Administrator"
   },
   containerStatus: {
     created: "Created",

front/projects/web/src/locales/en-US/label.ts

@@ -25,8 +25,8 @@ export default {
     "static": "Static",
     "volume": "Volume",
     "team": "Team",
+    "teamName": "Team Name",
     "user": "User",
-    "config": "Config",
     "registry": "Registry",
     "url": "Url",
     "isDefault": "Is Default",
@@ -53,15 +53,15 @@ export default {
     "uninstall": "Uninstall",
     "labelKey": "Label Key",
     "labelValue": "Label Value",
-    "group": "Group",
+    "groupName": "Group Name",
     "nodes": "Nodes",
     "services": "Services",
     "selectedNodes": "Selected Nodes",
     "image": "Image",
     "ports": "Ports",
     "deployMode": "Deploy Mode",
     "instanceName": "Instance Name",
-    "service": "Service",
+    "serviceName": "Service Name",
     "running": "Running",
     "failed": "Failed",
     "schedule": "Schedule",
@@ -154,6 +154,7 @@ export default {
     "rx": "RX",
     "tx": "TX",
     "wrapLines": "Wrap lines",
-    "groups": "Groups"
+    "groups": "Groups",
+    "currentUser": "Current User"
   }
 }

front/projects/web/src/locales/zh-CN/enum.ts

@@ -1,9 +1,8 @@
 export default {
   role: {
     "admin": "管理员",
-    "user": "User",
-    "supperAdmin": "超级管理员",
-    "owner": "Owner"
+    "user": "普通用户",
+    "supperAdmin": "超级管理员"
   },
   containerStatus: {
     created: "已创建",

front/projects/web/src/locales/zh-CN/label.ts

@@ -19,18 +19,18 @@ export default {
     "totalTeams": "{total}个团队",
     "totalUsers": "{total}个用户",
     "totalNumber": "总计 {total}",
-    "totalNodes": "{total}个节点",
+    "totalNodes": "{total}个机器",
     "type": "类型",
     "value": "值",
     "static": "静态",
     "volume": "卷",
     "team": "团队",
+    "teamName": "团队名",
     "user": "用户",
-    "config": "配置",
     "registry": "仓库",
     "url": "仓库地址",
-    "isDefault": "默认",
-    "default": "默认",
+    "isDefault": "设为默认仓库",
+    "default": "默认仓库",
     "authentication": "认证信息",
     "ip": "IP",
     "ipAddress": "IP地址",
@@ -53,15 +53,15 @@ export default {
     "uninstall": "卸载",
     "labelKey": "标签名称",
     "labelValue": "标签值",
-    "group": "分组",
+    "groupName": "分组名称",
     "nodes": "机器",
     "services": "服务",
-    "selectedNodes": "已选节点",
+    "selectedNodes": "已选机器",
     "image": "镜像",
     "ports": "端口",
     "deployMode": "部署模式",
     "instanceName": "实例名称",
-    "service": "服务",
+    "serviceName": "服务名称",
     "running": "正在运行",
     "failed": "失败",
     "schedule": "执行计划",
@@ -114,7 +114,7 @@ export default {
     "dispatchMode": "调度模式",
     "global": "全局模式",
     "replicated": "复制模式",
-    "instanceNum": "实例编号",
+    "instanceNum": "实例数",
     "placementConstraints": "约束",
     "schedulesInfo": "执行计划信息",
     "enableTimeout": "启用超时控制",
@@ -154,6 +154,7 @@ export default {
     "rx": "接受",
     "tx": "发送",
     "wrapLines": "超长换行",
-    "groups": "分组"
+    "groups": "分组",
+    "currentUser": "当前用户"
   }
 }

front/projects/web/src/locales/zh-CN/message.ts

@@ -31,7 +31,7 @@ export default {
     "delete": "您确定要删除吗？",
     "removeNodeFromGroup": "您确定要从分组中移除机器吗？",
     "enterKeywordsContinue": "请输入<span class='keywords-danger'>{ name }</span>以继续。",
-    "enableNode": "您确定要启用机器吗<span class='keywords-warning'>{ ip }</span>？",
-    "disableNode": "您确定要停用机器吗<span class='keywords-warning'>{ ip }</span>？"
+    "enableNode": "您确定要启用机器<span class='keywords-warning'>{ ip }</span>吗？",
+    "disableNode": "您确定要停用机器<span class='keywords-warning'>{ ip }</span>吗？"
   }
 }

front/projects/web/src/views/administration/user-related/team/team-edit.vue

@@ -88,7 +88,7 @@ defineExpose({ open })
     <template #header>{{ dialogInfo.info.teamId ? t("header.editTeam") : t("header.addTeam") }}</template>
     <div class="my-3">
       <el-form ref="formRef" v-loading="isLoading" :model="dialogInfo.info" :rules="rules" label-position="top" label-width="auto">
-        <el-form-item :label="t('label.name')" prop="name">
+        <el-form-item :label="t('label.teamName')" prop="name">
           <v-input v-model="dialogInfo.info.name" :maxlength="RuleLength.TeamName.Max" clearable show-word-limit />
         </el-form-item>
         <el-form-item :label="t('label.description')" prop="description">

front/projects/web/src/views/administration/user-related/team/teams.vue

@@ -90,7 +90,7 @@ onMounted(() => search())
     :total="tableList.total"
     @page-change="search"
     @sort-change="search">
-    <el-table-column :label="t('label.team')" fixed="left" min-width="140" prop="name" sortable="custom" />
+    <el-table-column :label="t('label.teamName')" fixed="left" min-width="140" prop="name" sortable="custom" />
     <el-table-column :label="t('label.description')" min-width="140" prop="description">
       <template #default="scope">
         <v-table-column-none :text="scope.row.description" />