Merge branch 'dev'

saqqdy · Apr 7, 2022 · 748f9b0 · 748f9b0
2 parents 9dd8fbd + ab05703
commit 748f9b0
Show file tree

Hide file tree

Showing 123 changed files with 701 additions and 744 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,24 +1,16 @@
-const { simpleTs: config } = require('eslint-config-sets')
-const { extend } = require('js-cool')
-
-module.exports = extend(true, config, {
-    // plugins: [...(config.plugins || []), 'prettier'],
+module.exports = {
+    extends: ['@eslint-sets/vue3-ts'],
+    rules: {
+        camelcase: 1,
+        'no-labels': 1,
+        indent: [2, 4, { SwitchCase: 1 }]
+    },
     globals: {
         __DEV_MODEL__: true,
         __DEV__: true,
         __QA__: true,
         __YZ__: true,
         __DEMO__: true,
         __PROD__: true
-    },
-    rules: {
-        'no-unused-vars': 0,
-        '@typescript-eslint/no-unused-vars': [
-            1,
-            {
-                argsIgnorePattern: '^h$',
-                varsIgnorePattern: '^h$'
-            }
-        ]
     }
-})
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -2,12 +2,14 @@
     "cSpell.words": [
         "addr",
         "apollo",
+        "applypatch",
         "argv",
         "axios",
         "bak",
         "btns",
         "bugfix",
         "calc",
+        "camelcase",
         "cdup",
         "cfg",
         "chdir",
@@ -77,6 +79,7 @@
         "req",
         "resize",
         "saqqdy",
+        "sendemail",
         "sep",
         "stderr",
         "stdout",

diff --git a/bin/conf/admin.ts b/bin/conf/admin.ts
@@ -312,13 +312,12 @@ import type { GitmarsMultiOptionType } from '../../typings'
     }
 
     /* istanbul ignore next */
-    if (typeof exports === 'object' && typeof module === 'object')
+    if (typeof exports === 'object' && typeof module === 'object') {
         module.exports = cmdConfig
-    // else if (typeof define === 'function' && define.amd) define(['cmdConfig'], () => cmdConfig)
-    else if (typeof exports === 'object') exports['cmdConfig'] = cmdConfig
+    } else if (typeof exports === 'object') exports.cmdConfig = cmdConfig
     else {
         if (!root.gitmarsCmdConfig) root.gitmarsCmdConfig = {}
-        root.gitmarsCmdConfig['admin'] = cmdConfig
+        root.gitmarsCmdConfig.admin = cmdConfig
     }
-    //@ts-ignore
+    // @ts-ignore
 })(typeof window !== 'undefined' ? window : global)
diff --git a/bin/conf/alias.ts b/bin/conf/alias.ts
@@ -31,13 +31,12 @@ import type { GitmarsOptionType } from '../../typings'
     }
 
     /* istanbul ignore next */
-    if (typeof exports === 'object' && typeof module === 'object')
+    if (typeof exports === 'object' && typeof module === 'object') {
         module.exports = cmdConfig
-    // else if (typeof define === 'function' && define.amd) define(['cmdConfig'], () => cmdConfig)
-    else if (typeof exports === 'object') exports['cmdConfig'] = cmdConfig
+    } else if (typeof exports === 'object') exports.cmdConfig = cmdConfig
     else {
         if (!root.gitmarsCmdConfig) root.gitmarsCmdConfig = {}
-        root.gitmarsCmdConfig['alias'] = cmdConfig
+        root.gitmarsCmdConfig.alias = cmdConfig
     }
-    //@ts-ignore
+    // @ts-ignore
 })(typeof window !== 'undefined' ? window : global)
diff --git a/bin/conf/approve.ts b/bin/conf/approve.ts
@@ -52,13 +52,12 @@ import type { GitmarsOptionType } from '../../typings'
     }
 
     /* istanbul ignore next */
-    if (typeof exports === 'object' && typeof module === 'object')
+    if (typeof exports === 'object' && typeof module === 'object') {
         module.exports = cmdConfig
-    // else if (typeof define === 'function' && define.amd) define(['cmdConfig'], () => cmdConfig)
-    else if (typeof exports === 'object') exports['cmdConfig'] = cmdConfig
+    } else if (typeof exports === 'object') exports.cmdConfig = cmdConfig
     else {
         if (!root.gitmarsCmdConfig) root.gitmarsCmdConfig = {}
-        root.gitmarsCmdConfig['approve'] = cmdConfig
+        root.gitmarsCmdConfig.approve = cmdConfig
     }
-    //@ts-ignore
+    // @ts-ignore
 })(typeof window !== 'undefined' ? window : global)
diff --git a/bin/conf/branch.ts b/bin/conf/branch.ts
@@ -148,13 +148,12 @@ import type { GitmarsOptionType } from '../../typings'
     }
 
     /* istanbul ignore next */
-    if (typeof exports === 'object' && typeof module === 'object')
+    if (typeof exports === 'object' && typeof module === 'object') {
         module.exports = cmdConfig
-    // else if (typeof define === 'function' && define.amd) define(['cmdConfig'], () => cmdConfig)
-    else if (typeof exports === 'object') exports['cmdConfig'] = cmdConfig
+    } else if (typeof exports === 'object') exports.cmdConfig = cmdConfig
     else {
         if (!root.gitmarsCmdConfig) root.gitmarsCmdConfig = {}
-        root.gitmarsCmdConfig['branch'] = cmdConfig
+        root.gitmarsCmdConfig.branch = cmdConfig
     }
-    //@ts-ignore
+    // @ts-ignore
 })(typeof window !== 'undefined' ? window : global)
diff --git a/bin/conf/build.ts b/bin/conf/build.ts
@@ -45,13 +45,12 @@ import type { GitmarsOptionType } from '../../typings'
     }
 
     /* istanbul ignore next */
-    if (typeof exports === 'object' && typeof module === 'object')
+    if (typeof exports === 'object' && typeof module === 'object') {
         module.exports = cmdConfig
-    // else if (typeof define === 'function' && define.amd) define(['cmdConfig'], () => cmdConfig)
-    else if (typeof exports === 'object') exports['cmdConfig'] = cmdConfig
+    } else if (typeof exports === 'object') exports.cmdConfig = cmdConfig
     else {
         if (!root.gitmarsCmdConfig) root.gitmarsCmdConfig = {}
-        root.gitmarsCmdConfig['build'] = cmdConfig
+        root.gitmarsCmdConfig.build = cmdConfig
     }
-    //@ts-ignore
+    // @ts-ignore
 })(typeof window !== 'undefined' ? window : global)
diff --git a/bin/conf/clean.ts b/bin/conf/clean.ts
@@ -37,13 +37,12 @@ import type { GitmarsOptionType } from '../../typings'
     }
 
     /* istanbul ignore next */
-    if (typeof exports === 'object' && typeof module === 'object')
+    if (typeof exports === 'object' && typeof module === 'object') {
         module.exports = cmdConfig
-    // else if (typeof define === 'function' && define.amd) define(['cmdConfig'], () => cmdConfig)
-    else if (typeof exports === 'object') exports['cmdConfig'] = cmdConfig
+    } else if (typeof exports === 'object') exports.cmdConfig = cmdConfig
     else {
         if (!root.gitmarsCmdConfig) root.gitmarsCmdConfig = {}
-        root.gitmarsCmdConfig['clean'] = cmdConfig
+        root.gitmarsCmdConfig.clean = cmdConfig
     }
-    //@ts-ignore
+    // @ts-ignore
 })(typeof window !== 'undefined' ? window : global)
diff --git a/bin/conf/cleanbranch.ts b/bin/conf/cleanbranch.ts
@@ -152,13 +152,12 @@ import type { GitmarsOptionType } from '../../typings'
     }
 
     /* istanbul ignore next */
-    if (typeof exports === 'object' && typeof module === 'object')
+    if (typeof exports === 'object' && typeof module === 'object') {
         module.exports = cmdConfig
-    // else if (typeof define === 'function' && define.amd) define(['cmdConfig'], () => cmdConfig)
-    else if (typeof exports === 'object') exports['cmdConfig'] = cmdConfig
+    } else if (typeof exports === 'object') exports.cmdConfig = cmdConfig
     else {
         if (!root.gitmarsCmdConfig) root.gitmarsCmdConfig = {}
-        root.gitmarsCmdConfig['cleanbranch'] = cmdConfig
+        root.gitmarsCmdConfig.cleanbranch = cmdConfig
     }
-    //@ts-ignore
+    // @ts-ignore
 })(typeof window !== 'undefined' ? window : global)
diff --git a/bin/conf/combine.ts b/bin/conf/combine.ts
@@ -153,13 +153,12 @@ import type { GitmarsOptionType } from '../../typings'
     }
 
     /* istanbul ignore next */
-    if (typeof exports === 'object' && typeof module === 'object')
+    if (typeof exports === 'object' && typeof module === 'object') {
         module.exports = cmdConfig
-    // else if (typeof define === 'function' && define.amd) define(['cmdConfig'], () => cmdConfig)
-    else if (typeof exports === 'object') exports['cmdConfig'] = cmdConfig
+    } else if (typeof exports === 'object') exports.cmdConfig = cmdConfig
     else {
         if (!root.gitmarsCmdConfig) root.gitmarsCmdConfig = {}
-        root.gitmarsCmdConfig['combine'] = cmdConfig
+        root.gitmarsCmdConfig.combine = cmdConfig
     }
-    //@ts-ignore
+    // @ts-ignore
 })(typeof window !== 'undefined' ? window : global)
diff --git a/bin/conf/continue.ts b/bin/conf/continue.ts
@@ -21,13 +21,12 @@ import type { GitmarsOptionType } from '../../typings'
     }
 
     /* istanbul ignore next */
-    if (typeof exports === 'object' && typeof module === 'object')
+    if (typeof exports === 'object' && typeof module === 'object') {
         module.exports = cmdConfig
-    // else if (typeof define === 'function' && define.amd) define(['cmdConfig'], () => cmdConfig)
-    else if (typeof exports === 'object') exports['cmdConfig'] = cmdConfig
+    } else if (typeof exports === 'object') exports.cmdConfig = cmdConfig
     else {
         if (!root.gitmarsCmdConfig) root.gitmarsCmdConfig = {}
-        root.gitmarsCmdConfig['continue'] = cmdConfig
+        root.gitmarsCmdConfig.continue = cmdConfig
     }
-    //@ts-ignore
+    // @ts-ignore
 })(typeof window !== 'undefined' ? window : global)
diff --git a/bin/conf/copy.ts b/bin/conf/copy.ts
@@ -72,13 +72,12 @@ import type { GitmarsOptionType } from '../../typings'
     }
 
     /* istanbul ignore next */
-    if (typeof exports === 'object' && typeof module === 'object')
+    if (typeof exports === 'object' && typeof module === 'object') {
         module.exports = cmdConfig
-    // else if (typeof define === 'function' && define.amd) define(['cmdConfig'], () => cmdConfig)
-    else if (typeof exports === 'object') exports['cmdConfig'] = cmdConfig
+    } else if (typeof exports === 'object') exports.cmdConfig = cmdConfig
     else {
         if (!root.gitmarsCmdConfig) root.gitmarsCmdConfig = {}
-        root.gitmarsCmdConfig['copy'] = cmdConfig
+        root.gitmarsCmdConfig.copy = cmdConfig
     }
-    //@ts-ignore
+    // @ts-ignore
 })(typeof window !== 'undefined' ? window : global)
diff --git a/bin/conf/end.ts b/bin/conf/end.ts
@@ -75,13 +75,12 @@ import type { GitmarsOptionType } from '../../typings'
     }
 
     /* istanbul ignore next */
-    if (typeof exports === 'object' && typeof module === 'object')
+    if (typeof exports === 'object' && typeof module === 'object') {
         module.exports = cmdConfig
-    // else if (typeof define === 'function' && define.amd) define(['cmdConfig'], () => cmdConfig)
-    else if (typeof exports === 'object') exports['cmdConfig'] = cmdConfig
+    } else if (typeof exports === 'object') exports.cmdConfig = cmdConfig
     else {
         if (!root.gitmarsCmdConfig) root.gitmarsCmdConfig = {}
-        root.gitmarsCmdConfig['end'] = cmdConfig
+        root.gitmarsCmdConfig.end = cmdConfig
     }
-    //@ts-ignore
+    // @ts-ignore
 })(typeof window !== 'undefined' ? window : global)
diff --git a/bin/conf/get.ts b/bin/conf/get.ts
@@ -60,13 +60,12 @@ import type { GitmarsOptionType } from '../../typings'
     }
 
     /* istanbul ignore next */
-    if (typeof exports === 'object' && typeof module === 'object')
+    if (typeof exports === 'object' && typeof module === 'object') {
         module.exports = cmdConfig
-    // else if (typeof define === 'function' && define.amd) define(['cmdConfig'], () => cmdConfig)
-    else if (typeof exports === 'object') exports['cmdConfig'] = cmdConfig
+    } else if (typeof exports === 'object') exports.cmdConfig = cmdConfig
     else {
         if (!root.gitmarsCmdConfig) root.gitmarsCmdConfig = {}
-        root.gitmarsCmdConfig['get'] = cmdConfig
+        root.gitmarsCmdConfig.get = cmdConfig
     }
-    //@ts-ignore
+    // @ts-ignore
 })(typeof window !== 'undefined' ? window : global)
diff --git a/bin/conf/go.ts b/bin/conf/go.ts
@@ -39,13 +39,12 @@ import type { GitmarsOptionType } from '../../typings'
     }
 
     /* istanbul ignore next */
-    if (typeof exports === 'object' && typeof module === 'object')
+    if (typeof exports === 'object' && typeof module === 'object') {
         module.exports = cmdConfig
-    // else if (typeof define === 'function' && define.amd) define(['cmdConfig'], () => cmdConfig)
-    else if (typeof exports === 'object') exports['cmdConfig'] = cmdConfig
+    } else if (typeof exports === 'object') exports.cmdConfig = cmdConfig
     else {
         if (!root.gitmarsCmdConfig) root.gitmarsCmdConfig = {}
-        root.gitmarsCmdConfig['go'] = cmdConfig
+        root.gitmarsCmdConfig.go = cmdConfig
     }
-    //@ts-ignore
+    // @ts-ignore
 })(typeof window !== 'undefined' ? window : global)
diff --git a/bin/conf/hook.ts b/bin/conf/hook.ts
@@ -80,13 +80,12 @@ import type { GitmarsOptionType } from '../../typings'
     }
 
     /* istanbul ignore next */
-    if (typeof exports === 'object' && typeof module === 'object')
+    if (typeof exports === 'object' && typeof module === 'object') {
         module.exports = cmdConfig
-    // else if (typeof define === 'function' && define.amd) define(['cmdConfig'], () => cmdConfig)
-    else if (typeof exports === 'object') exports['cmdConfig'] = cmdConfig
+    } else if (typeof exports === 'object') exports.cmdConfig = cmdConfig
     else {
         if (!root.gitmarsCmdConfig) root.gitmarsCmdConfig = {}
-        root.gitmarsCmdConfig['hook'] = cmdConfig
+        root.gitmarsCmdConfig.hook = cmdConfig
     }
-    //@ts-ignore
+    // @ts-ignore
 })(typeof window !== 'undefined' ? window : global)
diff --git a/bin/conf/link.ts b/bin/conf/link.ts
@@ -37,13 +37,12 @@ import type { GitmarsOptionType } from '../../typings'
     }
 
     /* istanbul ignore next */
-    if (typeof exports === 'object' && typeof module === 'object')
+    if (typeof exports === 'object' && typeof module === 'object') {
         module.exports = cmdConfig
-    // else if (typeof define === 'function' && define.amd) define(['cmdConfig'], () => cmdConfig)
-    else if (typeof exports === 'object') exports['cmdConfig'] = cmdConfig
+    } else if (typeof exports === 'object') exports.cmdConfig = cmdConfig
     else {
         if (!root.gitmarsCmdConfig) root.gitmarsCmdConfig = {}
-        root.gitmarsCmdConfig['link'] = cmdConfig
+        root.gitmarsCmdConfig.link = cmdConfig
     }
-    //@ts-ignore
+    // @ts-ignore
 })(typeof window !== 'undefined' ? window : global)
diff --git a/bin/conf/log.ts b/bin/conf/log.ts
@@ -64,13 +64,12 @@ import type { GitmarsOptionType } from '../../typings'
     }
 
     /* istanbul ignore next */
-    if (typeof exports === 'object' && typeof module === 'object')
+    if (typeof exports === 'object' && typeof module === 'object') {
         module.exports = cmdConfig
-    // else if (typeof define === 'function' && define.amd) define(['cmdConfig'], () => cmdConfig)
-    else if (typeof exports === 'object') exports['cmdConfig'] = cmdConfig
+    } else if (typeof exports === 'object') exports.cmdConfig = cmdConfig
     else {
         if (!root.gitmarsCmdConfig) root.gitmarsCmdConfig = {}
-        root.gitmarsCmdConfig['log'] = cmdConfig
+        root.gitmarsCmdConfig.log = cmdConfig
     }
-    //@ts-ignore
+    // @ts-ignore
 })(typeof window !== 'undefined' ? window : global)
diff --git a/bin/conf/postmsg.ts b/bin/conf/postmsg.ts
@@ -43,13 +43,12 @@ import type { GitmarsOptionType } from '../../typings'
     }
 
     /* istanbul ignore next */
-    if (typeof exports === 'object' && typeof module === 'object')
+    if (typeof exports === 'object' && typeof module === 'object') {
         module.exports = cmdConfig
-    // else if (typeof define === 'function' && define.amd) define(['cmdConfig'], () => cmdConfig)
-    else if (typeof exports === 'object') exports['cmdConfig'] = cmdConfig
+    } else if (typeof exports === 'object') exports.cmdConfig = cmdConfig
     else {
         if (!root.gitmarsCmdConfig) root.gitmarsCmdConfig = {}
-        root.gitmarsCmdConfig['postmsg'] = cmdConfig
+        root.gitmarsCmdConfig.postmsg = cmdConfig
     }
-    //@ts-ignore
+    // @ts-ignore
 })(typeof window !== 'undefined' ? window : global)
diff --git a/bin/conf/redo.ts b/bin/conf/redo.ts
@@ -51,13 +51,12 @@ import type { GitmarsOptionType } from '../../typings'
     }
 
     /* istanbul ignore next */
-    if (typeof exports === 'object' && typeof module === 'object')
+    if (typeof exports === 'object' && typeof module === 'object') {
         module.exports = cmdConfig
-    // else if (typeof define === 'function' && define.amd) define(['cmdConfig'], () => cmdConfig)
-    else if (typeof exports === 'object') exports['cmdConfig'] = cmdConfig
+    } else if (typeof exports === 'object') exports.cmdConfig = cmdConfig
     else {
         if (!root.gitmarsCmdConfig) root.gitmarsCmdConfig = {}
-        root.gitmarsCmdConfig['redo'] = cmdConfig
+        root.gitmarsCmdConfig.redo = cmdConfig
     }
-    //@ts-ignore
+    // @ts-ignore
 })(typeof window !== 'undefined' ? window : global)
diff --git a/bin/conf/revert.ts b/bin/conf/revert.ts
@@ -63,13 +63,12 @@ import type { GitmarsOptionType } from '../../typings'
     }
 
     /* istanbul ignore next */
-    if (typeof exports === 'object' && typeof module === 'object')
+    if (typeof exports === 'object' && typeof module === 'object') {
         module.exports = cmdConfig
-    // else if (typeof define === 'function' && define.amd) define(['cmdConfig'], () => cmdConfig)
-    else if (typeof exports === 'object') exports['cmdConfig'] = cmdConfig
+    } else if (typeof exports === 'object') exports.cmdConfig = cmdConfig
     else {
         if (!root.gitmarsCmdConfig) root.gitmarsCmdConfig = {}
-        root.gitmarsCmdConfig['revert'] = cmdConfig
+        root.gitmarsCmdConfig.revert = cmdConfig
     }
-    //@ts-ignore
+    // @ts-ignore
 })(typeof window !== 'undefined' ? window : global)