@electerm/electerm-react 2.3.198 → 2.4.16

package/client/store/setting.js

@@ -2,9 +2,7 @@
  * setting modal
  */
 
-import {
-  message
-} from 'antd'
+import message from '../components/common/message'
 import copy from 'json-deep-copy'
 import {
   settingMap,

package/client/store/store.js

@@ -234,7 +234,8 @@ class Store {
         colorSuccess: themeConf.success,
         colorWarning: themeConf.warn,
         colorTextBase: themeConf.text,
-        colorLink: themeConf['text-light']
+        colorLink: themeConf['text-light'],
+        motion: false
       },
       algorithm: isColorDark(themeConf.main) ? theme.darkAlgorithm : theme.defaultAlgorithm
     }

package/client/store/sync.js

@@ -80,6 +80,10 @@ export default (Store) => {
     return get(window.store.config, 'syncSetting.' + type + 'GistId')
   }
 
+  Store.prototype.getSyncProxy = function (type) {
+    return get(window.store.config, 'syncSetting.' + type + 'Proxy')
+  }
+
   Store.prototype.testSyncToken = async function (type) {
     const { store } = window
     store.isSyncingSetting = true
@@ -89,12 +93,14 @@ export default (Store) => {
       'test',
       [],
       token,
-      store.getProxySetting()
-    ).catch(
-      log.error
+      store.getSyncProxy(type)
     )
+      .catch(err => {
+        console.error(err)
+        return err
+      })
     store.isSyncingSetting = false
-    return !!gist
+    return gist
   }
 
   Store.prototype.createGist = async function (type) {
@@ -111,7 +117,7 @@ export default (Store) => {
       public: false
     }
     const res = await fetchData(
-      type, 'create', [data], token, store.getProxySetting()
+      type, 'create', [data], token, store.getSyncProxy(type)
     ).catch(
       store.onError
     )
@@ -184,7 +190,7 @@ export default (Store) => {
       'getOne',
       [gistId],
       token,
-      store.getProxySetting()
+      store.getSyncProxy(type)
     )
     updateSyncServerStatusFromGist(store, gist, type)
   }
@@ -254,7 +260,7 @@ export default (Store) => {
       'update',
       [gistId, gistData],
       token,
-      store.getProxySetting()
+      store.getSyncProxy(type)
     )
     if (res) {
       store.updateSyncSetting({
@@ -290,7 +296,7 @@ export default (Store) => {
       'getOne',
       [gistId],
       token,
-      store.getProxySetting()
+      store.getSyncProxy(type)
     )
     if (gist) {
       updateSyncServerStatusFromGist(store, gist, type)

package/client/store/system-menu.js

@@ -2,7 +2,7 @@
  * system menu functions
  */
 
-import { Modal } from 'antd'
+import Modal from '../components/common/modal'
 import { isString } from 'lodash-es'
 import getInitItem from '../common/init-setting-item'
 import {
@@ -64,6 +64,7 @@ export default Store => {
   Store.prototype.confirmExit = function (type) {
     const { store } = window
     let mod = null
+    console.log('confirmExit called')
     mod = Modal.confirm({
       onCancel: () => mod.destroy(),
       onOk: store.doExit,

package/client/store/tab.js

@@ -10,7 +10,7 @@ import {
   maxHistory
 } from '../common/constants'
 import { refs, refsTabs } from '../components/common/ref'
-import { message } from 'antd'
+import message from '../components/common/message'
 import * as ls from '../common/safe-local-storage'
 import deepCopy from 'json-deep-copy'
 import generate from '../common/id-with-stamp'

package/client/store/widgets.js

@@ -2,9 +2,7 @@
  * widgets related functions
  */
 
-import {
-  message
-} from 'antd'
+import message from '../components/common/message'
 import {
   settingMap
 } from '../common/constants'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@electerm/electerm-react",
-  "version": "2.3.198",
+  "version": "2.4.16",
   "description": "react components src for electerm",
   "main": "./client/components/main/main.jsx",
   "license": "MIT",

package/client/common/track.js

@@ -1,7 +0,0 @@
-export default (eventName, value) => {
-  if (!window.gtag) {
-    return
-  }
-  log.debug('track data', eventName, value)
-  window.gtag('event', eventName, value)
-}

package/client/components/batch-op/batch-op-entry.jsx

@@ -1,13 +0,0 @@
-import { lazy, Suspense } from 'react'
-
-// Lazy load BatchOp
-export const BatchOp = lazy(() => import('./batch-op'))
-
-// Wrap BatchOp with Suspense
-export default function BatchOpEntry (props) {
-  return (
-    <Suspense fallback={<>Loading...</>}>
-      <BatchOp {...props} />
-    </Suspense>
-  )
-}