From ffabe96b15e890c632285f8632d2ba32ce0f29af Mon Sep 17 00:00:00 2001 From: hide_d Date: Thu, 23 Dec 2021 03:03:43 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20processing=20=EA=B2=80=EC=83=89=20?= =?UTF-8?q?=EC=BC=AC/=EB=81=94=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/ts/components/TopBackBar.vue | 32 +++++- hwe/ts/jquery-toast.d.ts | 15 --- hwe/ts/processing/General/che_등용.vue | 5 +- hwe/ts/processing/General/che_선양.vue | 5 +- hwe/ts/processing/General/che_임관.vue | 11 +- hwe/ts/processing/General/che_장비매매.vue | 9 +- .../processing/General/che_장수대상임관.vue | 5 +- hwe/ts/processing/Nation/che_물자원조.vue | 7 +- hwe/ts/processing/Nation/che_발령.vue | 7 +- hwe/ts/processing/Nation/che_불가침제의.vue | 7 +- hwe/ts/processing/Nation/che_피장파장.vue | 7 +- hwe/ts/processing/ProcessCity.vue | 6 +- hwe/ts/processing/ProcessGeneralAmount.vue | 5 +- hwe/ts/processing/ProcessNation.vue | 7 +- hwe/ts/processing/SelectCity.vue | 8 +- hwe/ts/processing/SelectGeneral.vue | 8 +- hwe/ts/processing/SelectNation.vue | 8 +- hwe/ts/processing/processingRes.ts | 15 ++- hwe/ts/recruitCrewForm.ts | 103 ------------------ hwe/ts/v_processing.ts | 5 +- 20 files changed, 117 insertions(+), 158 deletions(-) delete mode 100644 hwe/ts/jquery-toast.d.ts delete mode 100644 hwe/ts/recruitCrewForm.ts diff --git a/hwe/ts/components/TopBackBar.vue b/hwe/ts/components/TopBackBar.vue index 6cb9ff2f..16587d75 100644 --- a/hwe/ts/components/TopBackBar.vue +++ b/hwe/ts/components/TopBackBar.vue @@ -2,8 +2,16 @@
+ {{ toggleSearch ? "검색 켜짐" : "검색 꺼짐" }}

{{ title }}

+
@@ -25,6 +33,17 @@ export default defineComponent({ } }, }, + data() { + return { + toggleSearch: this.searchable, + }; + }, + emits: ["update:searchable"], + watch: { + toggleSearch(val: boolean) { + this.$emit("update:searchable", val); + }, + }, props: { title: { type: String, @@ -35,6 +54,11 @@ export default defineComponent({ default: "normal", required: false, }, + searchable: { + type: Boolean, + default: undefined, + required: false, + }, }, }); @@ -55,6 +79,12 @@ export default defineComponent({ height: 24pt; } +.btn-toggle-zoom{ + position: absolute; + height: 24pt; + right: 0; +} + .title { text-align: center; line-height: 24pt; diff --git a/hwe/ts/jquery-toast.d.ts b/hwe/ts/jquery-toast.d.ts deleted file mode 100644 index bed348a5..00000000 --- a/hwe/ts/jquery-toast.d.ts +++ /dev/null @@ -1,15 +0,0 @@ -type JQueryBootstrapToast = { - container?: JQuery, - position?: 'top-right' | 'top-left' | 'top-center' | 'bottom-right' | 'bottom-left' | 'bottom-center', - title?: string, - subtitle?: string, - content?: string, - type?: 'info'|'success'|'warning'|'danger'|'error', - delay?: number, - img?: string, - pause_on_hover?: boolean, -} - -interface JQueryStatic { - toast(opt: JQueryBootstrapToast): void; -} \ No newline at end of file diff --git a/hwe/ts/processing/General/che_등용.vue b/hwe/ts/processing/General/che_등용.vue index 9a22ff35..b805ff20 100644 --- a/hwe/ts/processing/General/che_등용.vue +++ b/hwe/ts/processing/General/che_등용.vue @@ -1,5 +1,5 @@