diff --git a/webapp/.gitignore b/webapp/.gitignore index 679cdeb79..0102f4656 100644 --- a/webapp/.gitignore +++ b/webapp/.gitignore @@ -19,6 +19,7 @@ supersonic-webapp.tar.gz package-lock.json yarn.lock +pnpm-lock.yaml # misc .DS_Store diff --git a/webapp/lerna.json b/webapp/lerna.json deleted file mode 100644 index a2bb50ba7..000000000 --- a/webapp/lerna.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "packages": [ - "packages/*" - ], - "version": "independent" -} diff --git a/webapp/package.json b/webapp/package.json deleted file mode 100644 index 9a4df0508..000000000 --- a/webapp/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "root", - "private": true, - "devDependencies": { - "lerna": "^4.0.0" - } -} diff --git a/webapp/packages/chat-sdk/.gitignore b/webapp/packages/chat-sdk/.gitignore index bea504c15..149d63661 100644 --- a/webapp/packages/chat-sdk/.gitignore +++ b/webapp/packages/chat-sdk/.gitignore @@ -13,6 +13,8 @@ /dist +pnpm-lock.yaml + # misc .DS_Store .env.local diff --git a/webapp/packages/chat-sdk/package.json b/webapp/packages/chat-sdk/package.json index fb518ac74..c1e217529 100644 --- a/webapp/packages/chat-sdk/package.json +++ b/webapp/packages/chat-sdk/package.json @@ -1,6 +1,6 @@ { "name": "supersonic-chat-sdk", - "version": "0.5.28", + "version": "0.0.0", "main": "dist/index.es.js", "module": "dist/index.es.js", "unpkg": "dist/index.umd.js", @@ -11,6 +11,7 @@ "axios": "^1.4.0", "classnames": "^2.3.2", "echarts": "^5.4.2", + "lodash": "^4.17.11", "moment": "^2.29.4", "react-spinners": "^0.13.8", "tslib": "^2.5.2" @@ -115,6 +116,7 @@ "react-refresh": "^0.11.0", "resolve": "^1.20.0", "resolve-url-loader": "^4.0.0", + "rimraf": "^5.0.1", "rollup": "^3.22.1", "rollup-plugin-exclude-dependencies-from-bundle": "^1.1.23", "rollup-plugin-less": "^1.1.3", @@ -192,4 +194,4 @@ "engines": { "node": ">=14.18.0" } -} +} \ No newline at end of file diff --git a/webapp/packages/chat-sdk/src/components/ChatItem/ExecuteItem.tsx b/webapp/packages/chat-sdk/src/components/ChatItem/ExecuteItem.tsx index 02eed4ac5..9851bbbf9 100644 --- a/webapp/packages/chat-sdk/src/components/ChatItem/ExecuteItem.tsx +++ b/webapp/packages/chat-sdk/src/components/ChatItem/ExecuteItem.tsx @@ -62,6 +62,9 @@ const ExecuteItem: React.FC = ({
+ {data.queryAuthorization?.message && ( +
提示:{data.queryAuthorization.message}
+ )} {data?.queryMode === 'WEB_PAGE' ? ( ) : ( diff --git a/webapp/packages/chat-sdk/src/components/ChatItem/FilterItem.tsx b/webapp/packages/chat-sdk/src/components/ChatItem/FilterItem.tsx index 4af91b23d..fb02f03f5 100644 --- a/webapp/packages/chat-sdk/src/components/ChatItem/FilterItem.tsx +++ b/webapp/packages/chat-sdk/src/components/ChatItem/FilterItem.tsx @@ -31,7 +31,7 @@ const FilterItem: React.FC = ({ modelId, filters, filter, onFiltersChange }; useEffect(() => { - if (typeof filter.value === 'string' && options.length === 0) { + if ((typeof filter.value === 'string' || isArray(filter.value)) && options.length === 0) { initData(); } }, []); diff --git a/webapp/packages/chat-sdk/src/components/ChatItem/ParseTip.tsx b/webapp/packages/chat-sdk/src/components/ChatItem/ParseTip.tsx index f4e0e6000..4255f215f 100644 --- a/webapp/packages/chat-sdk/src/components/ChatItem/ParseTip.tsx +++ b/webapp/packages/chat-sdk/src/components/ChatItem/ParseTip.tsx @@ -228,10 +228,14 @@ const ParseTip: React.FC = ({ const entityDimensions = entityInfo?.dimensions?.filter( item => - !['zyqk_song_id', 'song_name', 'singer_id'].includes(item.bizName) && + !['zyqk_song_id', 'song_name', 'singer_id', 'zyqk_cmpny_id'].includes(item.bizName) && !( entityInfo?.dimensions?.some(dimension => dimension.bizName === 'singer_id') && item.bizName === 'singer_name' + ) && + !( + entityInfo?.dimensions?.some(dimension => dimension.bizName === 'zyqk_cmpny_id') && + item.bizName === 'cmpny_name' ) ); diff --git a/webapp/packages/chat-sdk/src/components/ChatItem/style.less b/webapp/packages/chat-sdk/src/components/ChatItem/style.less index 8e6279558..5879adf79 100644 --- a/webapp/packages/chat-sdk/src/components/ChatItem/style.less +++ b/webapp/packages/chat-sdk/src/components/ChatItem/style.less @@ -113,6 +113,13 @@ padding-bottom: 10px; } + &-auth-tip { + font-size: 13px; + color: var(--text-color-secondary); + margin-bottom: 12px; + line-height: 20px; + } + &-switch-entity-tip { display: flex; align-items: center; diff --git a/webapp/packages/chat-sdk/src/components/ChatMsg/Text/index.tsx b/webapp/packages/chat-sdk/src/components/ChatMsg/Text/index.tsx new file mode 100644 index 000000000..bd3f184b6 --- /dev/null +++ b/webapp/packages/chat-sdk/src/components/ChatMsg/Text/index.tsx @@ -0,0 +1,98 @@ +import { useEffect, useState } from 'react'; +import { UpOutlined, DownOutlined } from '@ant-design/icons'; +import { CLS_PREFIX } from '../../../common/constants'; +import { ColumnType } from '../../../common/type'; + +type Props = { + columns: ColumnType[]; + referenceColumn?: ColumnType; + dataSource: any[]; +}; + +const Text: React.FC = ({ columns, referenceColumn, dataSource }) => { + const [text, setText] = useState(); + const [htmlCode, setHtmlCode] = useState(); + const [referenceExpanded, setRederenceExpanded] = useState(false); + const [referenceData, setReferenceData] = useState([]); + + const prefixCls = `${CLS_PREFIX}-text`; + + const initData = () => { + let textValue = dataSource[0][columns[0].nameEn]; + let htmlCodeValue: string; + const match = textValue.match(/```html([\s\S]*?)```/); + htmlCodeValue = match && match[1].trim(); + if (htmlCodeValue) { + textValue = textValue.replace(/```html([\s\S]*?)```/, ''); + } + let scriptCode: string; + let scriptSrc: string; + if (htmlCodeValue) { + scriptSrc = htmlCodeValue.match(/