@electerm/electerm-react 3.15.66 → 3.15.69

package/client/common/constants.js

@@ -212,7 +212,7 @@ export const syncTokenCreateUrls = {
   gitee: 'https://gitee.com/github-zxdong262/electerm/wikis/Create%20personal%20access%20token?sort_id=3028409',
   github: 'https://github.com/electerm/electerm/wiki/Create-personal-access-token',
   custom: 'https://github.com/electerm/electerm/wiki/Custom-sync-server',
-  cloud: 'https://electerm-cloud.html5beta.com',
+  cloud: 'https://sync.electerm.org',
   webdav: 'https://github.com/electerm/electerm/wiki/WebDAV-sync'
 }
 export const settingSyncId = 'setting-sync'

package/client/common/download-mirrors.js

@@ -1,6 +1,6 @@
 export default [
   {
     name: 'homepage',
-    url: 'https://electerm.html5beta.com'
+    url: 'https://electerm.org'
   }
 ]

package/client/components/main/error-wrapper.jsx

@@ -119,7 +119,7 @@ export default class ErrorBoundary extends React.PureComponent {
         </div>
         <div className='pd3y'>
           <img
-            src='https://electerm.html5beta.com/electerm-wechat-group-qr.jpg'
+            src='https://electerm.org/electerm-wechat-group-qr.jpg'
             className='mwm-100'
           />
         </div>

package/client/components/setting-panel/setting-modal.jsx

@@ -70,7 +70,8 @@ export default auto(function SettingModalWrap (props) {
         'config',
         'checkedKeys',
         'expandedKeys',
-        'leftSidebarWidth'
+        'leftSidebarWidth',
+        'initLoadingData'
       ])
     }
     const items = [

package/client/components/setting-sync/setting-sync-form.jsx

@@ -66,7 +66,7 @@ export default function SyncForm (props) {
     if (res.apiUrl) {
       up[syncType + 'ApiUrl'] = res.apiUrl
     } else if (syncType === syncTypes.cloud) {
-      up[syncType + 'ApiUrl'] = 'https://electerm-cloud.html5beta.com/api/sync'
+      up[syncType + 'ApiUrl'] = 'https://sync.electerm.org/api/sync'
       // up[syncType + 'ApiUrl'] = 'http://127.0.0.1:5678/api/sync'
     }
     if (res.proxy) {
@@ -187,8 +187,8 @@ export default function SyncForm (props) {
     if (syncType === syncTypes.cloud) {
       return (
         <p>
-          <Link to='https://electerm-cloud.html5beta.com'>
-            https://electerm-cloud.html5beta.com[Beta]
+          <Link to='https://sync.electerm.org'>
+            https://sync.electerm.org[Beta]
           </Link>
         </p>
       )

package/client/components/sidebar/bookmark-select.jsx

@@ -13,7 +13,8 @@ export default auto(function BookmarkSelect (props) {
     leftSidebarWidth,
     expandedKeys,
     bookmarks,
-    bookmarksMap
+    bookmarksMap,
+    initLoadingData
   } = store
   if (from === 'sidebar' && openedSideBar !== 'bookmarks') {
     return null
@@ -39,7 +40,8 @@ export default auto(function BookmarkSelect (props) {
     expandedKeys,
     leftSidebarWidth,
     bookmarkGroupTree: store.bookmarkGroupTree,
-    autoFocus
+    autoFocus,
+    initLoadingData
   }
   return (
     <TreeList

package/client/components/tree-list/tree-list.jsx

@@ -854,7 +854,7 @@ export default class ItemListTree extends Component {
 
   render () {
     const { ready } = this.state
-    if (!ready) {
+    if (!ready || this.props.initLoadingData) {
       return (
         <div className='pd3 aligncenter'>
           <LoadingOutlined />

package/client/store/init-state.js

@@ -48,6 +48,7 @@ export default () => {
     // common
     wsInited: false,
     configLoaded: false,
+    initLoadingData: false,
     loadTime: 0,
     lastDataUpdateTime: 0,
     tabs: [],

package/client/store/load-data.js

@@ -182,55 +182,62 @@ export default (Store) => {
   }
   Store.prototype.initData = async function () {
     const { store } = window
-    await store.initApp()
-    const ext = {}
-    const all = dbNames.map(async name => {
-      const data = await fetchInitData(name)
-      return {
-        name,
-        data
-      }
-    })
-    await Promise.all(all)
-      .then(arr => {
-        for (const { name, data } of arr) {
-          const dt = JSON.parse(data || '[]')
-          refsStatic.add('oldState-' + name, dt)
-          if (name === 'bookmarks') {
-            ext.bookmarksMap = new Map(
-              dt.map(d => [d.id, d])
-            )
-          }
-          ext[name] = dt
+    store.initLoadingData = true
+    try {
+      await store.initApp()
+      const ext = {}
+      const all = dbNames.map(async name => {
+        const data = await fetchInitData(name)
+        return {
+          name,
+          data
         }
       })
-    ext.lastDataUpdateTime = await getData('lastDataUpdateTime') || 0
-    Object.assign(store, ext)
-    store.loadFontList()
-    store.fetchItermThemes()
-    store.openInitSessions()
-    store.fetchSshConfigItems()
-    store.initCommandLine().catch(store.onError)
-    initWatch(store)
-    setTimeout(
-      () => {
-        store.fixProfiles()
-        store.fixBookmarkGroups()
-      },
-      1000
-    )
-    setTimeout(
-      () => {
-        store.autoSyncReady = true
-      },
-      2000
-    )
-    if (store.config.checkUpdateOnStart) {
-      store.onCheckUpdate(false)
+      await Promise.all(all)
+        .then(arr => {
+          for (const { name, data } of arr) {
+            const dt = JSON.parse(data || '[]')
+            refsStatic.add('oldState-' + name, dt)
+            if (name === 'bookmarks') {
+              ext.bookmarksMap = new Map(
+                dt.map(d => [d.id, d])
+              )
+            }
+            ext[name] = dt
+          }
+        })
+      ext.lastDataUpdateTime = await getData('lastDataUpdateTime') || 0
+      ext.initLoadingData = false
+      Object.assign(store, ext)
+      store.loadFontList()
+      store.fetchItermThemes()
+      store.openInitSessions()
+      store.fetchSshConfigItems()
+      store.initCommandLine().catch(store.onError)
+      initWatch(store)
+      setTimeout(
+        () => {
+          store.fixProfiles()
+          store.fixBookmarkGroups()
+        },
+        1000
+      )
+      setTimeout(
+        () => {
+          store.autoSyncReady = true
+        },
+        2000
+      )
+      if (store.config.checkUpdateOnStart) {
+        store.onCheckUpdate(false)
+      }
+      store.startAutoRunWidgets().catch(err => {
+        console.error('Failed to start autorun widgets:', err)
+      })
+    } catch (err) {
+      store.initLoadingData = false
+      store.onError(err)
     }
-    store.startAutoRunWidgets().catch(err => {
-      console.error('Failed to start autorun widgets:', err)
-    })
   }
   Store.prototype.initCommandLine = async function () {
     const opts = await window.pre.runGlobalAsync('initCommandLine')

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@electerm/electerm-react",
-  "version": "3.15.66",
+  "version": "3.15.69",
   "description": "react components src for electerm",
   "main": "./client/components/main/main.jsx",
   "license": "MIT",
   "langugeRepo": "https://github.com/electerm/electerm-locales",
   "privacyNoticeLink": "https://github.com/electerm/electerm/wiki/privacy-notice",
   "knownIssuesLink": "https://github.com/electerm/electerm/wiki/Know-issues",
-  "sponsorLink": "https://electerm.html5beta.com/sponsor-electerm.html",
+  "sponsorLink": "https://electerm.org/sponsor-electerm.html",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/electerm/electerm.git"
@@ -20,7 +20,7 @@
   "bugs": {
     "url": "https://github.com/electerm/electerm/issues"
   },
-  "homepage": "https://electerm.html5beta.com",
+  "homepage": "https://electerm.org",
   "releases": "https://github.com/electerm/electerm/releases",
   "engines": {
     "node": ">=18.0.0"