@electerm/electerm-react 3.9.15 → 3.11.0

package/client/components/text-editor/text-editor-entry.jsx

@@ -0,0 +1,11 @@
+import { lazy, Suspense } from 'react'
+
+const TextEditor = lazy(() => import('./text-editor'))
+
+export default function TextEditorEntry (props) {
+  return (
+    <Suspense fallback={null}>
+      <TextEditor {...props} />
+    </Suspense>
+  )
+}

package/client/components/widgets/widget-form.jsx

@@ -2,9 +2,10 @@
  * Widget form component
  */
 import React, { useState, useEffect } from 'react'
-import { Form, Input, InputNumber, Switch, Select, Button, Tooltip, Alert } from 'antd'
+import { Form, Input, InputNumber, Switch, Select, Button, Tooltip, Alert, Space } from 'antd'
 import { formItemLayout, tailFormItemLayout } from '../../common/form-layout'
 import HelpIcon from '../common/help-icon'
+import { nanoid } from 'nanoid'
 import BatchOpEditor from '../batch-op/batch-op-editor'
 
 export default function WidgetForm ({ widget, onSubmit, loading, hasRunningInstance }) {
@@ -43,12 +44,39 @@ export default function WidgetForm ({ widget, onSubmit, loading, hasRunningInsta
   }
 
   const renderFormItem = (config) => {
-    const { name, type, description, choices } = config
+    const { name, type, description, choices, showGenerator } = config
     let control = null
 
     switch (type) {
       case 'string':
         control = <Input placeholder={description} />
+        if (showGenerator) {
+          return (
+            <Form.Item
+              key={name}
+              {...formItemLayout}
+              label={name}
+              tooltip={description}
+            >
+              <Space.Compact style={{ width: '100%' }}>
+                <Form.Item
+                  noStyle
+                  name={name}
+                >
+                  <Input placeholder={description} />
+                </Form.Item>
+                <Button
+                  onClick={() => form.setFieldValue(name, 'ett_' + nanoid())}
+                >
+                  Generate
+                </Button>
+              </Space.Compact>
+            </Form.Item>
+          )
+        }
+        break
+      case 'textarea':
+        control = <Input.TextArea autoSize={{ minRows: 3 }} placeholder={description} />
         break
       case 'number':
         control = <InputNumber style={{ width: '100%' }} placeholder={description} />

package/client/entry/worker.js

@@ -114,7 +114,10 @@ async function onMsg (e) {
   } else if (action === 'addEventListener') {
     const ws = self.insts[wsId]
     if (ws) {
-      ws.cb = (e) => {
+      if (!ws.cbs) {
+        ws.cbs = {}
+      }
+      const cb = (e) => {
         send({
           wsId,
           id,
@@ -123,13 +126,14 @@ async function onMsg (e) {
           }
         })
       }
-      ws.addEventListener(type, ws.cb)
+      ws.cbs[id] = cb
+      ws.addEventListener(type, cb)
     }
   } else if (action === 'removeEventListener') {
     const ws = self.insts[wsId]
-    if (ws) {
-      ws.removeEventListener(type, ws.cb)
-      delete ws.cb
+    if (ws && ws.cbs && ws.cbs[id]) {
+      ws.removeEventListener(type, ws.cbs[id])
+      delete ws.cbs[id]
     }
   }
 }

package/package.json

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