@electerm/electerm-react 1.38.42 → 1.38.50

package/client/components/sidebar/info-modal.jsx

@@ -56,6 +56,10 @@ export default class InfoModal extends Component {
     )
   }
 
+  formatJSON = (jsonStr) => {
+    return JSON.stringify(JSON.parse(jsonStr), null, 2)
+  }
+
   render () {
     const { store } = this.props
     const {
@@ -216,7 +220,11 @@ export default class InfoModal extends Component {
             <div className='pd1b' key={i + '_os_' + k}>
               <b className='bold'>{k}</b>:
               <span className='mg1l'>
-                {v}
+                {
+                  v.length > 30
+                    ? <pre>{this.formatJSON(v)}</pre>
+                    : v
+                }
               </span>
             </div>
           )

package/client/store/sync.js

@@ -162,16 +162,24 @@ export default (Store) => {
     const pass = store.getSyncPassword(type)
     const objs = {}
     for (const n of names) {
-      let str = JSON.stringify(store.getItems(n))
+      let str = store.getItems(n)
+      const order = await getData(`${n}:order`)
+      if (order && order.length) {
+        str.sort((a, b) => {
+          const ai = findIndex(order, r => r === a.id)
+          const bi = findIndex(order, r => r === b.id)
+          return ai - bi
+        })
+      }
+      str = JSON.stringify(str)
       if (n === settingMap.bookmarks && pass) {
         str = await window.pre.runGlobalAsync('encryptAsync', str, pass)
       }
       objs[`${n}.json`] = {
         content: str
       }
-      const order = await getData(`${n}:order`)
       objs[`${n}.order.json`] = {
-        content: JSON.stringify(order)
+        content: 'empty'
       }
     }
     const res = await fetchData(type, 'update', [gistId, {
@@ -240,7 +248,7 @@ export default (Store) => {
         arr = fixBookmarks(arr)
       }
       let strOrder = get(gist, `files["${n}.order.json"].content`)
-      if (strOrder) {
+      if (isJSON(strOrder)) {
         strOrder = JSON.parse(strOrder)
         arr.sort((a, b) => {
           const ai = findIndex(strOrder, r => r === a.id)
@@ -313,11 +321,19 @@ export default (Store) => {
     update('lastDataUpdateTime', store.lastDataUpdateTime)
   }, 1000)
 
-  Store.prototype.handleExportAllData = function () {
+  Store.prototype.handleExportAllData = async function () {
     const { store } = window
     const objs = {}
     for (const n of names) {
       objs[n] = store.getItems(n)
+      const order = await getData(`${n}:order`)
+      if (order && order.length) {
+        objs[n].sort((a, b) => {
+          const ai = findIndex(order, r => r === a.id)
+          const bi = findIndex(order, r => r === b.id)
+          return ai - bi
+        })
+      }
     }
     objs.config = pick(store.config, [
       'theme',

package/package.json

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