chore: 前端构建任务升级 TencentBlueKing#2042

hLinx · May 11, 2023 · 135671e · 135671e
1 parent 3e979b5
commit 135671e
Show file tree

Hide file tree

Showing 108 changed files with 223 additions and 216 deletions.
diff --git a/src/frontend/.eslintrc.js b/src/frontend/.eslintrc.js
@@ -65,6 +65,7 @@ module.exports = {
         ['^@views'],
         ['^@components'],
         ['^@\\w'],
+        ['^@/'],
         ['^\\.\\.'],
         ['^\\.'],
       ],

diff --git a/src/frontend/src/App.vue b/src/frontend/src/App.vue
@@ -126,10 +126,10 @@
   import RouterBack from '@components/router-back';
   import SystemLog from '@components/system-log';
 
-  import Layout from './layout-new';
-
   import I18n, { setLocale } from '@/i18n';
 
+  import Layout from './layout-new';
+
   export default {
     name: 'App',
     components: {

diff --git a/src/frontend/src/components/ace-editor/index.vue b/src/frontend/src/components/ace-editor/index.vue
@@ -152,6 +152,8 @@
   import Empty from '@components/empty';
   import ScrollFaker from '@components/scroll-faker';
 
+  import I18n from '@/i18n';
+
   import DefaultScript from './default-script';
 
   import 'ace/mode-sh';
@@ -171,7 +173,6 @@
   import 'ace/ext-language_tools';
   import 'ace/ext-keybinding_menu';
   import 'ace/ext-elastic_tabstops_lite';
-  import I18n from '@/i18n';
 
   export const builtInScript = Object.keys(DefaultScript).reduce((result, item) => {
     result[item] = Base64.encode(DefaultScript[item]);

diff --git a/src/frontend/src/components/apply-permission/apply-dialog.vue b/src/frontend/src/components/apply-permission/apply-dialog.vue
@@ -63,10 +63,10 @@
 <script>
   import PermissionCheckService from '@service/permission-check';
 
-  import AskPermission from './index';
-
   import I18n from '@/i18n';
 
+  import AskPermission from './index';
+
   export default {
     components: {
       AskPermission,

diff --git a/src/frontend/src/components/apply-permission/apply-page.vue b/src/frontend/src/components/apply-permission/apply-page.vue
@@ -48,10 +48,10 @@
   </div>
 </template>
 <script>
-  import AskPermission from './index';
-
   import I18n from '@/i18n';
 
+  import AskPermission from './index';
+
   export default {
     components: {
       AskPermission,

diff --git a/src/frontend/src/components/apply-permission/apply-section.vue b/src/frontend/src/components/apply-permission/apply-section.vue
@@ -55,10 +55,10 @@
 <script>
   import EventBus from '@utils/event-bus';
 
-  import AskPermission from './index';
-
   import I18n from '@/i18n';
 
+  import AskPermission from './index';
+
   export default {
     components: {
       AskPermission,

diff --git a/src/frontend/src/components/auth/component.js b/src/frontend/src/components/auth/component.js
@@ -25,11 +25,12 @@
 
 import PermissionCheckService from '@service/permission-check';
 
-import './style.css';
 import {
   permissionDialog,
 } from '@/common/bkmagic';
 
+import './style.css';
+
 export default {
   props: {
     permission: {

diff --git a/src/frontend/src/components/choose-ip/index.vue b/src/frontend/src/components/choose-ip/index.vue
@@ -152,6 +152,8 @@
 
   import TaskHostNodeModel from '@model/task-host-node';
 
+  import I18n from '@/i18n';
+
   import PreviewGroup from './components/preview-group';
   import RenderBusinessTopology from './components/render-business-topology';
   import RenderDynamicBusinessTopology from './components/render-dynamic-business-topology';
@@ -166,8 +168,6 @@
   } from './components/utils';
   import Preview from './preview';
 
-  import I18n from '@/i18n';
-
   const DIALOG_FOOTER_HEIGHT = 58;
   const CONTENT_TAB_HEIGHT = 42;
 

diff --git a/src/frontend/src/components/choose-ip/preview.vue b/src/frontend/src/components/choose-ip/preview.vue
@@ -63,10 +63,10 @@
 /**
      * 预览已选主机数据
     */
-  import ServerPanel from './server-panel';
-
   import I18n from '@/i18n';
 
+  import ServerPanel from './server-panel';
+
   export default {
     name: '',
     components: {

diff --git a/src/frontend/src/components/choose-ip/view/group.vue b/src/frontend/src/components/choose-ip/view/group.vue
@@ -130,15 +130,15 @@
 
   import JbCollapseItem from '@components/jb-collapse-item';
 
+  import I18n from '@/i18n';
+
   import ActionExtend from '../components/action-extend';
   import HostTable from '../components/host-table';
   import StatisticsText from '../components/statistics-text';
   import {
     statisticsHost,
   } from '../components/utils';
 
-  import I18n from '@/i18n';
-
   export default {
     name: 'ViewGroup',
     components: {

diff --git a/src/frontend/src/components/choose-ip/view/host-search.vue b/src/frontend/src/components/choose-ip/view/host-search.vue
@@ -66,15 +66,15 @@
   </div>
 </template>
 <script>
+  import I18n from '@/i18n';
+
   import ActionExtend from '../components/action-extend';
   import HostTable from '../components/host-table';
   import {
     sortHost,
     statisticsHost,
   } from '../components/utils';
 
-  import I18n from '@/i18n';
-
   export default {
     name: '',
     components: {

diff --git a/src/frontend/src/components/choose-ip/view/host.vue b/src/frontend/src/components/choose-ip/view/host.vue
@@ -120,15 +120,15 @@
 
   import JbCollapseItem from '@components/jb-collapse-item';
 
+  import I18n from '@/i18n';
+
   import ActionExtend from '../components/action-extend';
   import HostTable from '../components/host-table';
   import {
     sortHost,
     statisticsHost,
   } from '../components/utils';
 
-  import I18n from '@/i18n';
-
   export default {
     name: 'ViewHost',
     components: {

diff --git a/src/frontend/src/components/choose-ip/view/node.vue b/src/frontend/src/components/choose-ip/view/node.vue
@@ -145,15 +145,15 @@
 
   import JbCollapseItem from '@components/jb-collapse-item';
 
+  import I18n from '@/i18n';
+
   import ActionExtend from '../components/action-extend';
   import HostTable from '../components/host-table';
   import StatisticsText from '../components/statistics-text';
   import {
     statisticsHost,
   } from '../components/utils';
 
-  import I18n from '@/i18n';
-
   const genNodeKey = ({ objectId, instanceId }) => `#${objectId}#${instanceId}`;
 
   export default {

diff --git a/src/frontend/src/components/task-step/common/execute-target/index.vue b/src/frontend/src/components/task-step/common/execute-target/index.vue
@@ -163,12 +163,12 @@
 
   import ComposeFormItem from '@components/compose-form-item';
 
+  import I18n from '@/i18n';
+
   import DropdownMenu from './components/dropdown-menu';
   import DropdownMenuGroup from './components/dropdown-menu/group';
   import DropdownMenuItem from './components/dropdown-menu/item';
 
-  import I18n from '@/i18n';
-
   export default {
     components: {
       ComposeFormItem,

diff --git a/src/frontend/src/components/task-step/common/rolling/index.vue b/src/frontend/src/components/task-step/common/rolling/index.vue
@@ -99,10 +99,10 @@
 
   import rollingExprParse from '@utils/rolling-expr-parse';
 
-  import Guide from './guide';
-
   import I18n from '@/i18n';
 
+  import Guide from './guide';
+
   export default {
     name: '',
     components: {

diff --git a/src/frontend/src/components/task-step/common/source-file/index.vue b/src/frontend/src/components/task-step/common/source-file/index.vue
@@ -95,10 +95,10 @@
 
   import QuertGlobalSettingService from '@service/query-global-setting';
 
-  import ViewFile from './view';
-
   import I18n from '@/i18n';
 
+  import ViewFile from './view';
+
   export default {
     name: 'SourceFileBase',
     components: {

diff --git a/src/frontend/src/domain/service/dangerous-rule.js b/src/frontend/src/domain/service/dangerous-rule.js
@@ -26,10 +26,10 @@
 /* eslint-disable no-param-reassign */
 import DangerousRuleModel from '@model/dangerous-rule';
 
-import DangerousRuleSource from '../source/dangerous-rule';
-
 import I18n from '@/i18n';
 
+import DangerousRuleSource from '../source/dangerous-rule';
+
 export default {
   fetchList(params = {}, payload = {}) {
     return DangerousRuleSource.getData(params, payload)

diff --git a/src/frontend/src/main.js b/src/frontend/src/main.js
@@ -31,19 +31,20 @@ import TaskExecuteService from '@service/task-execute';
 import TaskPlanService from '@service/task-plan';
 
 import { getURLSearchParams } from '@utils/assist';
+import { scopeCache } from '@utils/cache-helper';
+import EntryTask from '@utils/entry-task';
 
-import '@/common/bkmagic';
-import '@/css/reset.css';
-import '@/css/app.css';
-import '@bk-icon/style.css';
-import '@bk-icon/iconcool.js';
 import App from '@/App';
 import i18n from '@/i18n';
 import IframeApp from '@/iframe-app';
 import createRouter from '@/router';
 import store from '@/store';
-import { scopeCache } from '@/utils/cache-helper';
-import EntryTask from '@/utils/entry-task';
+
+import '@/common/bkmagic';
+import '@/css/reset.css';
+import '@/css/app.css';
+import '@bk-icon/style.css';
+import '@bk-icon/iconcool.js';
 
 /**
  * @desc 启动打印当前系统信息

diff --git a/src/frontend/src/utils/request/middleware/response.js b/src/frontend/src/utils/request/middleware/response.js
@@ -27,14 +27,14 @@ import AuthResultModel from '@model/auth-result';
 
 import EventBus from '@utils/event-bus';
 
-import RequestError from '../lib/request-error';
-
 import {
   loginDialog,
   messageError,
   permissionDialog,
 } from '@/common/bkmagic';
 
+import RequestError from '../lib/request-error';
+
 // 标记已经登录过状态
 // 第一次登录跳转登录页面，之后弹框登录
 let hasLogined = false;

diff --git a/src/frontend/src/utils/rolling-expr-parse.js b/src/frontend/src/utils/rolling-expr-parse.js
@@ -128,6 +128,7 @@ const translateCN = (value) => {
   };
   const result = [];
   value.forEach((atoms, index) => {
+    // eslint-disable-next-line prefer-spread
     result.push.apply(result, parse(atoms, index + 1));
   });
   return result.join('，');
@@ -230,6 +231,7 @@ const translateEN = (value) => {
   };
   const result = [];
   value.forEach((atoms, index) => {
+    // eslint-disable-next-line prefer-spread
     result.push.apply(result, parse(atoms, index + 1));
   });
   return result.join(', ');

diff --git a/src/frontend/src/views/account-manage/index.vue b/src/frontend/src/views/account-manage/index.vue
@@ -29,12 +29,12 @@
   <jb-router-view />
 </template>
 <script>
-  import Local from './local';
-
   import {
     loadLanguage,
   } from '@/i18n';
 
+  import Local from './local';
+
   loadLanguage(Local);
 
   export default {};

diff --git a/src/frontend/src/views/account-manage/index/components/operation.vue b/src/frontend/src/views/account-manage/index/components/operation.vue
@@ -76,11 +76,11 @@
   import AccountSelect from '@components/account-select';
   import JbInput from '@components/jb-input';
 
+  import I18n from '@/i18n';
+
   import AccountDatabase from './account-strategy/database-account';
   import AccountOS from './account-strategy/os-account';
 
-  import I18n from '@/i18n';
-
   const generatorDefault = () => ({
     id: '',
     account: '',

diff --git a/src/frontend/src/views/account-manage/index/index.vue b/src/frontend/src/views/account-manage/index/index.vue
@@ -201,10 +201,10 @@
   import ListActionLayout from '@components/list-action-layout';
   import RenderList from '@components/render-list';
 
-  import Operation from './components/operation';
-
   import I18n from '@/i18n';
 
+  import Operation from './components/operation';
+
   const TABLE_COLUMN_CACHE = 'account_manage_columns';
 
   export default {

diff --git a/src/frontend/src/views/cron-job/index.vue b/src/frontend/src/views/cron-job/index.vue
@@ -29,12 +29,12 @@
   <jb-router-view />
 </template>
 <script>
-  import Local from './local';
-
   import {
     loadLanguage,
   } from '@/i18n';
 
+  import Local from './local';
+
   loadLanguage(Local);
 
   export default {};

diff --git a/src/frontend/src/views/cron-job/list/components/operation/index.vue b/src/frontend/src/views/cron-job/list/components/operation/index.vue
@@ -200,13 +200,13 @@
   import ToggleDisplay from '@components/global-variable/toggle-display';
   import JbInput from '@components/jb-input';
 
+  import I18n from '@/i18n';
+
   import RenderInfoDetail from '../render-info-detail';
 
   import CronJob from './cron-job';
   import FormItemFactory from './form-item-strategy';
 
-  import I18n from '@/i18n';
-
   const onceItemList = [
     'executeBeforeNotify',
   ];

diff --git a/src/frontend/src/views/cron-job/list/index.vue b/src/frontend/src/views/cron-job/list/index.vue
@@ -357,12 +357,12 @@
   import ListActionLayout from '@components/list-action-layout';
   import RenderList from '@components/render-list';
 
+  import I18n from '@/i18n';
+
   import TaskDetail from './components/detail';
   import HistoryRecord from './components/history-record';
   import TaskOperation from './components/operation';
 
-  import I18n from '@/i18n';
-
   const TABLE_COLUMN_CACHE = 'cron_list_columns';
 
   export default {