V4.6.9-first commit (#899)

* perf: insert mongo dataset data session

* perf: dataset data index

* remove delay

* rename bill schema

* rename bill record

* perf: bill table

* perf: prompt

* perf: sub plan

* change the usage count

* feat: usage bill

* publish usages

* doc

* 新增团队聊天功能 (#20)

* perf: doc

* feat 添加标签部分

feat 信息团队标签配置

feat 新增团队同步管理

feat team分享页面

feat 完成team分享页面

feat 实现模糊搜索

style 格式化

fix 修复迷糊匹配

style 样式修改

fix 团队标签功能修复

* fix 修复鉴权功能

* merge 合并代码

* fix 修复引用错误

* fix 修复pr问题

* fix 修复ts格式问题

---------

Co-authored-by: archer <545436317@qq.com>
Co-authored-by: liuxingwan <liuxingwan.lxw@alibaba-inc.com>

* update extra plan

* fix: ts

* format

* perf: bill field

* feat: standard plan

* fix: ts

* feat 个人账号页面修改 (#22)

* feat 添加标签部分

feat 信息团队标签配置

feat 新增团队同步管理

feat team分享页面

feat 完成team分享页面

feat 实现模糊搜索

style 格式化

fix 修复迷糊匹配

style 样式修改

fix 团队标签功能修复

* fix 修复鉴权功能

* merge 合并代码

* fix 修复引用错误

* fix 修复pr问题

* fix 修复ts格式问题

* feat 修改个人账号页

---------

Co-authored-by: liuxingwan <liuxingwan.lxw@alibaba-inc.com>

* sub plan page (#23)

* fix chunk index; error page text

* feat: dataset process Integral prediction

* feat: stand plan field

* feat: sub plan limit

* perf: index

* query extension

* perf: share link push app name

* perf: plan point unit

* perf: get sub plan

* perf: account page

* feat 新增套餐详情弹窗代码 (#24)

* merge 合并代码

* fix 新增套餐详情弹框

* fix 修复pr问题

* feat: change http node input to prompt editor (#21)

* feat: change http node input to prompt editor

* fix

* split PromptEditor to HttpInput

* Team plans (#25)

* perf: pay check

* perf: team plan test

* plan limit check

* replace sensitive text

* perf: fix some null

* collection null check

* perf: plans modal

* perf: http module

* pacakge (#26)

* individuation page and pay modal amount (#27)

* feat: individuation page

* team chat config

* pay modal

* plan count and replace invalid chars (#29)

* fix: user oneapi

* fix: training queue

* fix: qa queue

* perf: remove space chars

* replace invalid chars

* change httpinput dropdown menu (#28)

* perf: http

* reseet free plan

* perf: plan code to packages

* remove llm config to package

* perf: code

* perf: faq

* fix: get team plan

---------

Co-authored-by: yst <77910600+yu-and-liu@users.noreply.github.com>
Co-authored-by: liuxingwan <liuxingwan.lxw@alibaba-inc.com>
Co-authored-by: heheer <71265218+newfish-cmyk@users.noreply.github.com>

projects/app/src/pages/dataset/detail/components/InputDataModal.tsx

@@ -19,7 +19,6 @@ import { useRequest } from '@/web/common/hooks/useRequest';
 import { countPromptTokens } from '@fastgpt/global/common/string/tiktoken';
 import { useConfirm } from '@/web/common/hooks/useConfirm';
 import { getDefaultIndex } from '@fastgpt/global/core/dataset/utils';
-import { DatasetDataIndexTypeEnum } from '@fastgpt/global/core/dataset/constants';
 import { DatasetDataIndexItemType } from '@fastgpt/global/core/dataset/type';
 import SideTabs from '@/components/SideTabs';
 import DeleteIcon from '@fastgpt/web/components/common/Icon/delete';
@@ -118,8 +117,7 @@ const InputDataModal = ({
         } else if (defaultValue) {
           reset({
             q: defaultValue.q,
-            a: defaultValue.a,
-            indexes: [getDefaultIndex({ dataId: `${Date.now()}` })]
+            a: defaultValue.a
           });
         }
       },
@@ -149,10 +147,7 @@ const InputDataModal = ({
         return Promise.reject(t('dataset.data.input is empty'));
       }
       if (countPromptTokens(e.q) >= maxToken) {
-        return toast({
-          title: t('core.dataset.data.Too Long'),
-          status: 'warning'
-        });
+        return Promise.reject(t('core.dataset.data.Too Long'));
       }
 
       const data = { ...e };
@@ -162,9 +157,11 @@ const InputDataModal = ({
         q: e.q,
         a: e.a,
         // remove dataId
-        indexes: e.indexes.map((index) =>
-          index.defaultIndex ? getDefaultIndex({ q: e.q, a: e.a }) : index
-        )
+        indexes:
+          e.indexes?.map((index) => ({
+            ...index,
+            dataId: undefined
+          })) || []
       });
 
       return {
@@ -178,7 +175,7 @@ const InputDataModal = ({
         ...e,
         q: '',
         a: '',
-        indexes: [getDefaultIndex({ q: e.q, a: e.a, dataId: `${Date.now()}` })]
+        indexes: []
       });
 
       onSuccess(e);
@@ -194,9 +191,10 @@ const InputDataModal = ({
       await putDatasetDataById({
         id: dataId,
         ...e,
-        indexes: e.indexes.map((index) =>
-          index.defaultIndex ? getDefaultIndex({ q: e.q, a: e.a }) : index
-        )
+        indexes:
+          e.indexes?.map((index) =>
+            index.defaultIndex ? getDefaultIndex({ q: e.q, a: e.a, dataId: index.dataId }) : index
+          ) || []
       });
 
       return {
@@ -269,7 +267,7 @@ const InputDataModal = ({
             {currentTab === TabEnum.content && <InputTab maxToken={maxToken} register={register} />}
             {currentTab === TabEnum.index && (
               <Grid gridTemplateColumns={['1fr', '1fr 1fr']} gridGap={4}>
-                {indexes.map((index, i) => (
+                {indexes?.map((index, i) => (
                   <Box
                     key={index.dataId || i}
                     p={3}
@@ -278,7 +276,7 @@ const InputDataModal = ({
                     bg={i % 2 !== 0 ? 'myWhite.400' : ''}
                     _hover={{
                       '& .delete': {
-                        display: index.defaultIndex && indexes.length === 1 ? 'none' : 'block'
+                        display: index.defaultIndex ? 'none' : 'block'
                       }
                     }}
                   >
@@ -331,7 +329,6 @@ const InputDataModal = ({
                   onClick={() =>
                     appendIndexes({
                       defaultIndex: false,
-                      type: DatasetDataIndexTypeEnum.chunk,
                       text: '',
                       dataId: `${Date.now()}`
                     })
@@ -383,45 +380,47 @@ const InputTab = ({
   const [inputType, setInputType] = useState(InputTypeEnum.q);
 
   return (
-    <Box>
-      <RowTabs
-        list={[
-          {
-            label: (
-              <Flex alignItems={'center'}>
-                <Box as="span" color={'red.600'}>
-                  *
-                </Box>
-                {t('core.dataset.data.Main Content')}
-                <MyTooltip label={t('core.dataset.data.Data Content Tip')}>
-                  <QuestionOutlineIcon ml={1} />
-                </MyTooltip>
-              </Flex>
-            ),
-            value: InputTypeEnum.q
-          },
-          {
-            label: (
-              <Flex alignItems={'center'}>
-                {t('core.dataset.data.Auxiliary Data')}
-                <MyTooltip label={t('core.dataset.data.Auxiliary Data Tip')}>
-                  <QuestionOutlineIcon ml={1} />
-                </MyTooltip>
-              </Flex>
-            ),
-            value: InputTypeEnum.a
-          }
-        ]}
-        value={inputType}
-        onChange={(e) => setInputType(e as InputTypeEnum)}
-      />
+    <Flex flexDirection={'column'} h={'100%'}>
+      <Box>
+        <RowTabs
+          list={[
+            {
+              label: (
+                <Flex alignItems={'center'}>
+                  <Box as="span" color={'red.600'}>
+                    *
+                  </Box>
+                  {t('core.dataset.data.Main Content')}
+                  <MyTooltip label={t('core.dataset.data.Data Content Tip')}>
+                    <QuestionOutlineIcon ml={1} />
+                  </MyTooltip>
+                </Flex>
+              ),
+              value: InputTypeEnum.q
+            },
+            {
+              label: (
+                <Flex alignItems={'center'}>
+                  {t('core.dataset.data.Auxiliary Data')}
+                  <MyTooltip label={t('core.dataset.data.Auxiliary Data Tip')}>
+                    <QuestionOutlineIcon ml={1} />
+                  </MyTooltip>
+                </Flex>
+              ),
+              value: InputTypeEnum.a
+            }
+          ]}
+          value={inputType}
+          onChange={(e) => setInputType(e as InputTypeEnum)}
+        />
+      </Box>
 
-      <Box mt={3}>
+      <Box mt={3} flex={'1 0 0'}>
         {inputType === InputTypeEnum.q && (
           <Textarea
             placeholder={t('core.dataset.data.Data Content Placeholder', { maxToken })}
             maxLength={maxToken}
-            rows={isPc ? 24 : 12}
+            h={'100%'}
             bg={'myWhite.400'}
             {...register(`q`, {
               required: true
@@ -433,6 +432,7 @@ const InputTab = ({
             placeholder={t('core.dataset.data.Auxiliary Data Placeholder', {
               maxToken: maxToken * 1.5
             })}
+            h={'100%'}
             bg={'myWhite.400'}
             rows={isPc ? 24 : 12}
             maxLength={maxToken * 1.5}
@@ -440,6 +440,6 @@ const InputTab = ({
           />
         )}
       </Box>
-    </Box>
+    </Flex>
   );
 };