diff --git a/build_release.sh b/build_release.sh index 693ab962..b2aa0791 100755 --- a/build_release.sh +++ b/build_release.sh @@ -56,7 +56,7 @@ function build() { if [ "${os}" == "windows" ];then execFileName="${execFileName}.exe" fi - CGO_ENABLE=0 GOOS=${os} GOARCH=${arch} go build -o ${execFileName} main.go + CGO_ENABLE=0 GOOS=${os} GOARCH=${arch} go build -ldflags=-w -o ${execFileName} main.go if [ -d ${toFolder} ] ; then echo_green "目标文件夹已存在,清空文件夹" diff --git a/mayfly_go_web/package.json b/mayfly_go_web/package.json index 13949b14..016b117e 100644 --- a/mayfly_go_web/package.json +++ b/mayfly_go_web/package.json @@ -33,7 +33,7 @@ "splitpanes": "^3.1.5", "sql-formatter": "^15.0.2", "uuid": "^9.0.1", - "vue": "^3.4.13", + "vue": "^3.4.14", "vue-router": "^4.2.5", "xterm": "^5.3.0", "xterm-addon-fit": "^0.8.0", @@ -48,7 +48,7 @@ "@typescript-eslint/eslint-plugin": "^6.7.4", "@typescript-eslint/parser": "^6.7.4", "@vitejs/plugin-vue": "^5.0.3", - "@vue/compiler-sfc": "^3.4.13", + "@vue/compiler-sfc": "^3.4.14", "dotenv": "^16.3.1", "eslint": "^8.35.0", "eslint-plugin-vue": "^9.19.2", diff --git a/mayfly_go_web/src/components/crontab/Crontab.vue b/mayfly_go_web/src/components/crontab/Crontab.vue new file mode 100644 index 00000000..ca84bc19 --- /dev/null +++ b/mayfly_go_web/src/components/crontab/Crontab.vue @@ -0,0 +1,287 @@ + + + + + diff --git a/mayfly_go_web/src/components/crontab/CrontabDay.vue b/mayfly_go_web/src/components/crontab/CrontabDay.vue new file mode 100644 index 00000000..d490ae74 --- /dev/null +++ b/mayfly_go_web/src/components/crontab/CrontabDay.vue @@ -0,0 +1,216 @@ + + + diff --git a/mayfly_go_web/src/components/crontab/CrontabHour.vue b/mayfly_go_web/src/components/crontab/CrontabHour.vue new file mode 100644 index 00000000..46bac8d0 --- /dev/null +++ b/mayfly_go_web/src/components/crontab/CrontabHour.vue @@ -0,0 +1,156 @@ + + + diff --git a/mayfly_go_web/src/components/crontab/CrontabInput.vue b/mayfly_go_web/src/components/crontab/CrontabInput.vue new file mode 100644 index 00000000..9d8cb555 --- /dev/null +++ b/mayfly_go_web/src/components/crontab/CrontabInput.vue @@ -0,0 +1,19 @@ + + + diff --git a/mayfly_go_web/src/components/crontab/CrontabMin.vue b/mayfly_go_web/src/components/crontab/CrontabMin.vue new file mode 100644 index 00000000..24f491b4 --- /dev/null +++ b/mayfly_go_web/src/components/crontab/CrontabMin.vue @@ -0,0 +1,152 @@ + + + diff --git a/mayfly_go_web/src/components/crontab/CrontabMouth.vue b/mayfly_go_web/src/components/crontab/CrontabMouth.vue new file mode 100644 index 00000000..500170e1 --- /dev/null +++ b/mayfly_go_web/src/components/crontab/CrontabMouth.vue @@ -0,0 +1,172 @@ + + + diff --git a/mayfly_go_web/src/components/crontab/CrontabResult.vue b/mayfly_go_web/src/components/crontab/CrontabResult.vue new file mode 100644 index 00000000..75608895 --- /dev/null +++ b/mayfly_go_web/src/components/crontab/CrontabResult.vue @@ -0,0 +1,588 @@ + + + diff --git a/mayfly_go_web/src/components/crontab/CrontabSecond.vue b/mayfly_go_web/src/components/crontab/CrontabSecond.vue new file mode 100644 index 00000000..4015f2d0 --- /dev/null +++ b/mayfly_go_web/src/components/crontab/CrontabSecond.vue @@ -0,0 +1,149 @@ + + + diff --git a/mayfly_go_web/src/components/crontab/CrontabWeek.vue b/mayfly_go_web/src/components/crontab/CrontabWeek.vue new file mode 100644 index 00000000..67b1ff26 --- /dev/null +++ b/mayfly_go_web/src/components/crontab/CrontabWeek.vue @@ -0,0 +1,205 @@ + + + diff --git a/mayfly_go_web/src/components/crontab/CrontabYear.vue b/mayfly_go_web/src/components/crontab/CrontabYear.vue new file mode 100644 index 00000000..526f9c6c --- /dev/null +++ b/mayfly_go_web/src/components/crontab/CrontabYear.vue @@ -0,0 +1,168 @@ + + + diff --git a/mayfly_go_web/src/components/crontab/index.ts b/mayfly_go_web/src/components/crontab/index.ts new file mode 100644 index 00000000..8a2429ab --- /dev/null +++ b/mayfly_go_web/src/components/crontab/index.ts @@ -0,0 +1,21 @@ +// 表单选项的子组件校验数字格式 +export function checkNumber(value: any, minLimit: number, maxLimit: number) { + //检查必须为整数 + value = Math.floor(value); + if (value < minLimit) { + value = minLimit; + } else if (value > maxLimit) { + value = maxLimit; + } + return value; +} + +export interface CrontabValueObj { + second: string; + min: string; + hour: string; + day: string; + mouth: string; + week: string; + year: string; +} diff --git a/mayfly_go_web/src/views/ops/db/SyncTaskEdit.vue b/mayfly_go_web/src/views/ops/db/SyncTaskEdit.vue index 1541ebeb..45d78cce 100644 --- a/mayfly_go_web/src/views/ops/db/SyncTaskEdit.vue +++ b/mayfly_go_web/src/views/ops/db/SyncTaskEdit.vue @@ -22,16 +22,7 @@ - - - + @@ -191,6 +182,7 @@ import DbSelectTree from '@/views/ops/db/component/DbSelectTree.vue'; import MonacoEditor from '@/components/monaco/MonacoEditor.vue'; import { DbInst, registerDbCompletionItemProvider } from '@/views/ops/db/db'; import { getDbDialect } from '@/views/ops/db/dialect'; +import CrontabInput from '@/components/crontab/CrontabInput.vue'; const props = defineProps({ data: { @@ -232,7 +224,7 @@ const sqlPreviewTab = 'sqlPreview'; type FormData = { id?: number; taskName?: string; - taskCron?: string; + taskCron: string; srcDbId?: number; srcDbName?: string; srcTagPath?: string; diff --git a/mayfly_go_web/src/views/ops/machine/cronjob/CronJobEdit.vue b/mayfly_go_web/src/views/ops/machine/cronjob/CronJobEdit.vue index c4bb8126..b29cc2a9 100644 --- a/mayfly_go_web/src/views/ops/machine/cronjob/CronJobEdit.vue +++ b/mayfly_go_web/src/views/ops/machine/cronjob/CronJobEdit.vue @@ -15,7 +15,7 @@ - + @@ -66,6 +66,7 @@ import { cronJobApi, machineApi } from '../api'; import { CronJobStatusEnum, CronJobSaveExecResTypeEnum } from '../enums'; import { notEmpty } from '@/common/assert'; import MonacoEditor from '@/components/monaco/MonacoEditor.vue'; +import CrontabInput from '@/components/crontab/CrontabInput.vue'; const props = defineProps({ visible: { @@ -82,6 +83,7 @@ const props = defineProps({ const emit = defineEmits(['update:visible', 'cancel', 'submitSuccess']); const formRef: any = ref(null); + const rules = { name: [ { diff --git a/mayfly_go_web/src/views/ops/machine/cronjob/CronJobExecList.vue b/mayfly_go_web/src/views/ops/machine/cronjob/CronJobExecList.vue index 4e5fdd75..ea81941e 100644 --- a/mayfly_go_web/src/views/ops/machine/cronjob/CronJobExecList.vue +++ b/mayfly_go_web/src/views/ops/machine/cronjob/CronJobExecList.vue @@ -1,7 +1,6 @@