diff --git a/cmd b/cmd index d27d4214..ded6b995 100755 --- a/cmd +++ b/cmd @@ -33,12 +33,12 @@ supervisorctl_restart() { } check_docker() { - docker -v &> /dev/null + docker --help &> /dev/null if [ $? -ne 0 ]; then echo -e "${Error} ${RedBG} 未安装 Docker!${Font}" exit 1 fi - docker-compose -v &> /dev/null + docker-compose --help &> /dev/null if [ $? -ne 0 ]; then echo -e "${Error} ${RedBG} 未安装 Docker-compose!${Font}" exit 1 @@ -46,7 +46,7 @@ check_docker() { } check_node() { - npm -v > /dev/null + npm --help &> /dev/null if [ $? -ne 0 ]; then echo -e "${Error} ${RedBG} 未安装nodejs!${Font}" exit 1 diff --git a/resources/assets/js/components/AutoTip.vue b/resources/assets/js/components/AutoTip.vue index c8d40c8d..48f5891d 100644 --- a/resources/assets/js/components/AutoTip.vue +++ b/resources/assets/js/components/AutoTip.vue @@ -7,7 +7,7 @@ :disabled="!showTooltip" :max-width="tooltipMaxWidth" transfer> - + @@ -87,6 +87,9 @@ this.showTooltip = Math.floor(rangeWidth) > Math.floor($content.offsetWidth); range = null; }, + onClick(e) { + this.$emit("on-click", e) + } } } diff --git a/resources/assets/js/components/QuickEdit.vue b/resources/assets/js/components/QuickEdit.vue index 0d2b61c1..12f5f080 100644 --- a/resources/assets/js/components/QuickEdit.vue +++ b/resources/assets/js/components/QuickEdit.vue @@ -54,7 +54,7 @@ export default { this.isEdit = true; this.$nextTick(() => { this.$refs.input.focus({ - cursor: 'all' + cursor: 'all' }); }) }, @@ -68,6 +68,9 @@ export default { this.isEdit = false; return; } + if (this.isLoad) { + return; + } this.isLoad = true; this.$emit("input", this.content); this.$emit("on-update", this.content, () => {