diff --git a/.eslintrc.cjs b/.eslintrc.cjs index 10c01d36..9c7553a0 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -1,39 +1,42 @@ module.exports = { - root: true, - parser: "vue-eslint-parser", - parserOptions: { - "project": "./tsconfig.json" - }, - ignorePatterns: ['*.test.ts', '.eslintrc.cjs', 'webpack.config.cjs', '*.js'], - overrides: [{ - files: ['*.ts', '*.tsx', "*.vue"], - }], - plugins: [ - "@typescript-eslint", + root: true, + parser: "vue-eslint-parser", + "env": { + "browser": true, + "es2021": true + }, + ignorePatterns: ['*.test.ts', '.eslintrc.cjs', 'webpack.config.cjs', '*.js'], + overrides: [{ + files: ['*.ts', '*.tsx', "*.vue"], + }], + plugins: [ + "@typescript-eslint" + ], - ], - extends: [ - "eslint:recommended", - 'plugin:vue/essential', - '@vue/typescript', - "plugin:@typescript-eslint/eslint-recommended", - "plugin:@typescript-eslint/recommended" - ], - rules: { - '@typescript-eslint/no-floating-promises': 'error', - "vue/no-multiple-template-root": "off", - "vue/no-v-for-template-key": "off", - "vue/multi-word-component-names": "off",//TODO: 삭제 - }, - settings: { - 'import/resolver': { - alias: { - map: [ - ['@', './hwe/ts'], - ['@util', './hwe/ts/util'], - ['@scss', './hwe/scss'], - ] - } - } - }, -} \ No newline at end of file + extends: [ + "eslint:recommended", + "plugin:vue/vue3-essential", + "plugin:@typescript-eslint/recommended" + ], + parserOptions: { + "sourceType": "module", + "project": "./tsconfig.json", + "ecmaVersion": 2021, + "parser": "@typescript-eslint/parser", + extraFileExtensions: ['.vue'] + }, + rules: { + '@typescript-eslint/no-floating-promises': 'error', + }, + settings: { + 'import/resolver': { + alias: { + map: [ + ['@', './hwe/ts'], + ['@util', './hwe/ts/util'], + ['@scss', './hwe/scss'], + ] + } + } + }, +}; diff --git a/hwe/b_dipcenter.php b/hwe/b_dipcenter.php index 03df6d72..2300cf45 100644 --- a/hwe/b_dipcenter.php +++ b/hwe/b_dipcenter.php @@ -54,17 +54,15 @@ $nationStor->cacheValues(['notice', 'scout_msg', 'available_war_setting_cnt']); <?= UniqueConst::$serverName ?>: 내무부 - + ($me['officer_level'] >= 5 || $permission == 4), + 'nationMsg' => $nationStor->notice ?? '', + 'scoutMsg' => $nationStor->scout_msg ?? '', + ]) ?> - + @@ -170,51 +168,12 @@ $nationStor->cacheValues(['notice', 'scout_msg', 'available_war_setting_cnt']); } ?> - +
+ +
+
- - - - - - - - - - - - diff --git a/hwe/scss/dipcenter.scss b/hwe/scss/dipcenter.scss index 407ba7c3..a6c65219 100644 --- a/hwe/scss/dipcenter.scss +++ b/hwe/scss/dipcenter.scss @@ -1,6 +1,4 @@ @import '@scss/common/bootstrap5.scss'; -@import 'summernote/dist/summernote-bs5.css'; - #scoutMsgForm .viewer{ max-height:200px; diff --git a/hwe/ts/Board.vue b/hwe/ts/PageBoard.vue similarity index 99% rename from hwe/ts/Board.vue rename to hwe/ts/PageBoard.vue index aea26b97..4f8a9e20 100644 --- a/hwe/ts/Board.vue +++ b/hwe/ts/PageBoard.vue @@ -102,7 +102,7 @@ export type BoardCommentItem = { }; export default defineComponent({ - name: "Board", + name: "PageBoard", components: { TopBackBar, BoardArticle, diff --git a/hwe/ts/inheritPoint.vue b/hwe/ts/PageInheritPoint.vue similarity index 98% rename from hwe/ts/inheritPoint.vue rename to hwe/ts/PageInheritPoint.vue index 6a9f47ed..7bdc19e1 100644 --- a/hwe/ts/inheritPoint.vue +++ b/hwe/ts/PageInheritPoint.vue @@ -246,13 +246,12 @@
-
- [{{log.date}}] +
+ [{{ log.date }}]
- {{log.text}} + {{ log.text }}
-
@@ -273,7 +272,7 @@ type InheritanceType = | "max_belong" | "max_domestic_critical" | "active_action" -// | "snipe_combat" + // | "snipe_combat" | "combat" | "sabotage" | "unifier" @@ -284,11 +283,11 @@ type InheritanceType = type InheritanceViewType = InheritanceType | "sum" | "new"; declare const lastInheritPointLogs: { - server_id: string, - year: number, - month: number, - date: string, - text: string, + server_id: string; + year: number; + month: number; + date: string; + text: string; }[]; declare const items: Record; @@ -323,9 +322,9 @@ const inheritanceViewText: Record< }, active_action: { title: "능동 행동 수", - info: "장수 동향에 본인의 이름이 직접 나타난 수입니다.
일부 사령턴은 제외됩니다." + info: "장수 동향에 본인의 이름이 직접 나타난 수입니다.
일부 사령턴은 제외됩니다.", }, -/* snipe_combat: { + /* snipe_combat: { title: "병종 상성 우위 횟수", info: "유리한 상성을 가지고 전투했습니다.", },*/ @@ -440,7 +439,7 @@ declare const availableUnique: Record< >; export default defineComponent({ - name: "InheritPoint", + name: "PageInheritPoint", data() { const inheritBuff = {} as Record; for (const buffKey of Object.keys( @@ -701,7 +700,7 @@ export default defineComponent({ text-align: right; } -.tnum{ - font-feature-settings: 'tnum'; +.tnum { + font-feature-settings: "tnum"; } \ No newline at end of file diff --git a/hwe/ts/Join.vue b/hwe/ts/PageJoin.vue similarity index 99% rename from hwe/ts/Join.vue rename to hwe/ts/PageJoin.vue index 85c39fa5..f8f351e5 100644 --- a/hwe/ts/Join.vue +++ b/hwe/ts/PageJoin.vue @@ -389,7 +389,7 @@ type APIArgs = { }; export default defineComponent({ - name: "Join", + name: "PageJoin", components: { TopBackBar, CTable, diff --git a/hwe/ts/NPCControl.vue b/hwe/ts/PageNPCControl.vue similarity index 99% rename from hwe/ts/NPCControl.vue rename to hwe/ts/PageNPCControl.vue index 1cedfde6..345cbc10 100644 --- a/hwe/ts/NPCControl.vue +++ b/hwe/ts/PageNPCControl.vue @@ -511,7 +511,7 @@ declare const lastSetters: { }; export default defineComponent({ - name: "NPCControl", + name: "PageNPCControl", components: { TopBackBar, NumberInputWithInfo, diff --git a/hwe/ts/PartialDipcenter.vue b/hwe/ts/PartialDipcenter.vue new file mode 100644 index 00000000..7982792d --- /dev/null +++ b/hwe/ts/PartialDipcenter.vue @@ -0,0 +1,53 @@ + + \ No newline at end of file diff --git a/hwe/ts/ReservedCommand.vue b/hwe/ts/PartialReservedCommand.vue similarity index 99% rename from hwe/ts/ReservedCommand.vue rename to hwe/ts/PartialReservedCommand.vue index 32da8014..35dab1eb 100644 --- a/hwe/ts/ReservedCommand.vue +++ b/hwe/ts/PartialReservedCommand.vue @@ -287,7 +287,7 @@ function isDropdownChildren(e?: Event): boolean { const searchModeKey = `sammo_${serverID}_searchMode`; export default defineComponent({ - name: "ReservedCommand", + name: "PartialReservedCommand", methods: { updateNow() { diff --git a/hwe/ts/build_exports.json b/hwe/ts/build_exports.json index ead7fb94..d681655e 100644 --- a/hwe/ts/build_exports.json +++ b/hwe/ts/build_exports.json @@ -13,7 +13,6 @@ "bossInfo": "bossInfo.ts", "myPage": "myPage.ts", "extExpandCity": "extExpandCity.ts", - "dipcenter": "dipcenter.ts", "diplomacy": "diplomacy.ts", "currentCity": "currentCity.ts", "hallOfFame": "hallOfFame.ts", @@ -27,6 +26,8 @@ "v_board": "v_board.ts", "v_NPCControl": "v_NPCControl.ts", "v_join": "v_join.ts", - "v_main": "v_main.ts" + "v_main": "v_main.ts", + "v_dipcenter": "v_dipcenter.ts" + } } \ No newline at end of file diff --git a/hwe/ts/components/BoardArticle.vue b/hwe/ts/components/BoardArticle.vue index 56b6bb14..1ce03eb8 100644 --- a/hwe/ts/components/BoardArticle.vue +++ b/hwe/ts/components/BoardArticle.vue @@ -50,7 +50,7 @@
국 가 방 침 & 임관 권유 메시지
-
-
-
- 국가 방침 -
-
- -
-
- -
-
-
-
-
-
- 임관 권유 -
-
- -
-
-
870px x 200px를 넘어서는 내용은 표시되지 않습니다.
- -
-
-
-
- -
예 산 & 정 책