@electerm/electerm-react 1.91.8 → 1.91.16

package/client/components/ai/ai-chat-history-item.jsx

@@ -7,17 +7,31 @@ import {
 import {
   UserOutlined,
   CopyOutlined,
-  CloseOutlined
+  CloseOutlined,
+  CaretDownOutlined,
+  CaretRightOutlined
 } from '@ant-design/icons'
 import { copy } from '../../common/clipboard'
+import { useState } from 'react'
 
 export default function AIChatHistoryItem ({ item }) {
+  const [showOutput, setShowOutput] = useState(true)
   const {
     prompt
   } = item
+
+  function toggleOutput () {
+    setShowOutput(!showOutput)
+  }
+
   const alertProps = {
     message: (
-      <><UserOutlined />: {prompt}</>
+      <>
+        <span className='pointer mg1r' onClick={toggleOutput}>
+          {showOutput ? <CaretDownOutlined /> : <CaretRightOutlined />}
+        </span>
+        <UserOutlined />: {prompt}
+      </>
     ),
     type: 'info'
   }
@@ -63,7 +77,7 @@ export default function AIChatHistoryItem ({ item }) {
           <Alert {...alertProps} />
         </Tooltip>
       </div>
-      <AIOutput item={item} />
+      {showOutput && <AIOutput item={item} />}
     </div>
   )
 }

package/client/components/ai/ai-output.jsx

@@ -1,15 +1,13 @@
-import { useState, useMemo } from 'react'
 import ReactMarkdown from 'react-markdown'
 import { copy } from '../../common/clipboard'
 import Link from '../common/external-link'
 import { Tag } from 'antd'
-import { CopyOutlined, PlayCircleOutlined, DownCircleOutlined } from '@ant-design/icons'
+import { CopyOutlined, PlayCircleOutlined } from '@ant-design/icons'
 import getBrand from './get-brand'
 
 const e = window.translate
 
 export default function AIOutput ({ item }) {
-  const [showFull, setShowFull] = useState(false)
   const {
     response,
     baseURLAI
@@ -20,18 +18,6 @@ export default function AIOutput ({ item }) {
 
   const { brand, brandUrl } = getBrand(baseURLAI)
 
-  const truncatedResponse = useMemo(() => {
-    if (!response) return ''
-    const codeBlockRegex = /```[\s\S]*?```/
-    const match = response.match(codeBlockRegex)
-    if (match) {
-      const index = match.index + match[0].length
-      return response.slice(0, index) + '\n\n... ...'
-    }
-    // If no code block found, show first 5 lines
-    return response.split('\n').slice(0, 5).join('\n') + '\n\n... ...'
-  }, [response])
-
   const renderCode = (props) => {
     const { node, className = '', children, ...rest } = props
     const code = String(children).replace(/\n$/, '')
@@ -87,22 +73,8 @@ export default function AIOutput ({ item }) {
     )
   }
 
-  function renderShowMore () {
-    if (showFull) {
-      return null
-    }
-    return (
-      <span
-        onClick={() => setShowFull(true)}
-        className='mg1t pointer'
-      >
-        <DownCircleOutlined /> {e('fullContent')}
-      </span>
-    )
-  }
-
   const mdProps = {
-    children: showFull ? response : truncatedResponse,
+    children: response,
     components: {
       code: renderCode
     }
@@ -112,7 +84,6 @@ export default function AIOutput ({ item }) {
     <div className='pd1'>
       {renderBrand()}
       <ReactMarkdown {...mdProps} />
-      {renderShowMore()}
     </div>
   )
 }

package/client/components/sys-menu/sys-menu.jsx

@@ -77,9 +77,12 @@ export default class ContextMenu extends PureComponent {
     if (type === 'hr') {
       return <hr />
     }
-    const baseCls = 'context-item'
+    let baseCls = 'context-item'
     if (module && this.modules[module]) {
       const Mod = this.modules[module]
+      if (module === 'Zoom') {
+        baseCls = 'context-item zoom-item'
+      }
       return (
         <div className={baseCls}>
           <Mod {...this.props} />

package/client/components/sys-menu/sys-menu.styl

@@ -20,6 +20,11 @@
       color #777
       background #333
       cursor not-allowed
+  &.zoom-item
+    height 36px
+    line-height 36px
+    &:hover
+      background transparent
 
 .context-sub-text
   position absolute

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

@@ -385,6 +385,7 @@ export default class ItemListTree extends Component {
     if (tar) {
       target = tar
     }
+    console.log('tar', target, tar)
     const dataDragged = e.dataTransfer.getData('idDragged')
     const [idDragged, pidDrags, isGroupDragged] = dataDragged.split('@')
     const isGroupDrag = isGroupDragged === 'true'
@@ -395,7 +396,6 @@ export default class ItemListTree extends Component {
     const pidDrops = target.getAttribute('data-parent-id') || ''
     const pidDropsArr = pidDrops.split('#')
     const pidDrop = pidDropsArr[pidDropsArr.length - 1]
-
     // can not drag item to its own children
     if (
       (idDragged === 'default' &&
@@ -404,7 +404,8 @@ export default class ItemListTree extends Component {
         pidDrop &&
         pidDrags !== pidDrops &&
         pidDrops.includes(idDragged)
-      )
+      ) ||
+      idDragged === idDrop
     ) {
       return
     }

package/package.json

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