Merge pull request #31 from humpback/develop-0.0.1

Develop 0.0.1

Author: skyler-yang

Dockerfile

@@ -2,7 +2,7 @@ FROM alpine:latest
 
 LABEL maintainer="skyler.w.yang"
 
-RUN mkdir -p /workspace/config
+RUN mkdir -p /workspace/config && mkdir -p /workspace/data
 
 COPY ./backend/config/*.yaml /workspace/config
 
@@ -12,6 +12,4 @@ COPY ./backend/humpback /workspace/
 
 WORKDIR /workspace
 
-RUN mkdir data
-
 CMD ["./humpback"]

backend/common/locales/zh_cn.go

@@ -113,8 +113,8 @@ var zhCnMsg = map[string]string{
 	CodeServicePlacementLabelNotEmpty:            "约束标签不能为空。",
 	CodeServicePlacementValueNotEmpty:            "约束值不能为空。",
 	CodeServiceScheduleCronNotEmpty:              "调度计划cron不能为空。",
-	CodeServiceScheduleCronInvalid:               "执行计划cron无效。",
-	CodeServiceScheduleTimeoutInvalid:            "执行计划超时控制时间无效。",
+	CodeServiceScheduleCronInvalid:               "定时任务cron无效。",
+	CodeServiceScheduleTimeoutInvalid:            "定时任务超时控制时间无效。",
 	CodeServiceProtocolInvalid:                   "协议无效，仅支持TCP、UDP。",
 	CodeServiceOperateInvalid:                    "无效的操作。",
 	CodeServiceIsNotEnable:                       "服务未启用。",

deploy/deploy.md

@@ -5,7 +5,7 @@ docker run -d \
 --net=host \
 --restart=always \
 -v /etc/localtime:/etc/localtime \
--v /var/lib/humpback/humpback.db:/workspace/data/humpback.db \
+-v /var/lib/humpback:/workspace/data \
 -e LOCATION=dev \
 -e SITE_PORT=8300 \
 -e BACKEND_PORT=8301 \

front/pnpm-lock.yaml

@@ -63,7 +63,6 @@ declare module 'vue' {
     IconMdiAlphaPCircleOutline: typeof import('~icons/mdi/alpha-p-circle-outline')['default']
     IconMdiAppleKeyboardCommand: typeof import('~icons/mdi/apple-keyboard-command')['default']
     IconMdiArrowExpandAll: typeof import('~icons/mdi/arrow-expand-all')['default']
-    IconMdiCheckboxMultipleBlank: typeof import('~icons/mdi/checkbox-multiple-blank')['default']
     IconMdiCheckboxMultipleBlankOutline: typeof import('~icons/mdi/checkbox-multiple-blank-outline')['default']
     IconMdiChevronDown: typeof import('~icons/mdi/chevron-down')['default']
     IconMdiClockTimeFourOutline: typeof import('~icons/mdi/clock-time-four-outline')['default']

front/projects/web/components.d.ts

@@ -1,68 +1,60 @@
 <script lang="ts" setup>
-const props = defineProps<{ keywords?: string; showAddBtn?: boolean; keywordsPlaceholder?: string }>()
+const props = defineProps<{ addLabel?: string; inputLabel?: string; placeholder?: string }>()
 const emits = defineEmits<{
-  (e: "update:keywords", keywords: string): void
   (e: "search"): void
   (e: "add"): void
 }>()
 
 const { t } = useI18n()
 const slots = useSlots()
 
-function handleKeywordsChange(v: string) {
-  emits("update:keywords", v)
-}
-
-function search() {
-  emits("search")
-}
-
-function add() {
-  emits("add")
-}
+const keywords = defineModel<string>()
 </script>
 
 <template>
-  <el-form @submit.prevent="search">
-    <el-form-item class="search">
+  <el-form @submit.prevent="emits('search')">
+    <el-form-item>
       <div class="d-flex w-100 flex-wrap gap-3">
         <slot v-if="!!slots.prefix" name="prefix" />
+
         <slot v-if="!!slots.input" name="input" />
-        <v-input v-else :model-value="props.keywords" :placeholder="props.keywordsPlaceholder" class="search-input" @update:model-value="handleKeywordsChange">
-          <template #prepend>
-            <slot v-if="!!slots.keywordsPrepend" name="keywordsPrepend"></slot>
-            <span v-else style="color: var(--el-text-color-regular)">
-              {{ t("label.keywords") }}
-            </span>
-          </template>
-        </v-input>
-        <el-button native-type="submit" type="primary">
-          <el-icon :size="16">
-            <IconMdiSearch />
-          </el-icon>
-          {{ t("btn.search") }}
-        </el-button>
-        <slot v-if="!!slots.append" name="append" />
-        <el-button v-if="props.showAddBtn" type="primary" @click="add()">
-          <el-icon :size="18">
-            <IconMdiAdd />
-          </el-icon>
-          {{ t("btn.add") }}
-        </el-button>
+        <div v-else class="search-input">
+          <v-input v-model="keywords" :placeholder="props.placeholder">
+            <template #prepend>
+              <slot v-if="!!slots.inputPrepend" name="inputPrepend"></slot>
+              <span v-else style="color: var(--el-text-color-regular)">
+                {{ props.inputLabel || t("label.keywords") }}
+              </span>
+            </template>
+          </v-input>
+        </div>
+
+        <div>
+          <el-button native-type="submit" type="primary">
+            <template #icon>
+              <el-icon :size="20">
+                <IconMdiSearch />
+              </el-icon>
+            </template>
+            {{ t("btn.search") }}
+          </el-button>
+          <el-button v-if="props.addLabel" plain type="primary" @click="emits('add')">
+            <template #icon>
+              <el-icon :size="20">
+                <IconMdiAdd />
+              </el-icon>
+            </template>
+            {{ props.addLabel }}
+          </el-button>
+        </div>
       </div>
     </el-form-item>
   </el-form>
 </template>
 
 <style lang="scss" scoped>
-.search {
-  .search-input {
-    flex: 1;
-    min-width: 200px;
-  }
-
-  .el-button {
-    margin: 0;
-  }
+.search-input {
+  flex: 1;
+  min-width: 300px;
 }
 </style>

front/projects/web/src/components/business/v-search/VSearch.vue

@@ -3,7 +3,6 @@ import screenfull from "screenfull"
 import * as monaco from "monaco-editor"
 import EditorWorker from "monaco-editor/esm/vs/editor/editor.worker?worker"
 import JsonWorker from "monaco-editor/esm/vs/language/json/json.worker?worker"
-import CssWorker from "monaco-editor/esm/vs/language/css/css.worker?worker"
 import HtmlWorker from "monaco-editor/esm/vs/language/html/html.worker?worker"
 import TSWorker from "monaco-editor/esm/vs/language/typescript/ts.worker?worker"
 import YamlWorker from "./yaml.worker.js?worker"
@@ -38,10 +37,6 @@ self.MonacoEnvironment = {
     switch (label) {
       case "json":
         return new JsonWorker()
-      case "css":
-      case "scss":
-      case "less":
-        return new CssWorker()
       case "html":
       case "handlebars":
       case "razor":

front/projects/web/src/components/common/v-monaco/VMonacoEdit.vue

@@ -94,6 +94,7 @@ defineExpose({ clearSelection, toggleRowExpansion })
     <el-table
       ref="tableRef"
       class-name="v-table"
+      style="min-height: 396px"
       v-bind="tableAttrs"
       @select="selectionChangeEvent"
       @sort-change="sortChangeEvent"
@@ -106,7 +107,7 @@ defineExpose({ clearSelection, toggleRowExpansion })
       </template>
       <template #empty>
         <slot v-if="!!slots.empty" name="empty" />
-        <el-empty v-else :image-size="200" />
+        <el-empty v-else :image-size="180" />
       </template>
     </el-table>
     <div v-if="props.pageInfo" class="mt-5 pagination">

front/projects/web/src/components/common/v-table/VTable.vue

@@ -48,7 +48,7 @@ export default {
     "addEnvironment": "添加环境变量",
     "addOption": "添加选项",
     "addPlacementConstraint": "添加约束",
-    "addSchedule": "添加执行计划",
+    "addSchedule": "添加定时任务",
     "viewMonitor": "查看性能指标"
   }
 }

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

@@ -32,7 +32,7 @@ export default {
     "addService": "添加服务",
     "deleteService": "删除服务",
     "cloneService": "克隆服务",
-    "addSchedule": "添加执行计划",
-    "editSchedule": "编辑执行计划"
+    "addSchedule": "添加定时任务",
+    "editSchedule": "编辑定时任务"
   }
 }