Merge branch 'dev' into poc/bpic

src/assets/sass/renderSass/table.scss

@@ -60,6 +60,14 @@
   }
 }
 
+.el-table {
+  & .el-button {
+    &.is-disabled {
+      background: unset;
+      color: #cecece;
+    }
+  }
+}
 //.el-pagination.is-background .el-pager li:not(.disabled).active {
 //
 //}

src/components/RenderTable/component/TooltipScope/index.vue

@@ -6,7 +6,15 @@ export default {
     let { scope, item } = this
     return scope.row[item.prop] ? (
       <div class="toolBox">
-        <el-tooltip content={scope.row[item.prop] && scope.row[item.prop] != '' ? scope.row[item.prop] : '2'} placement="right" effect="dark">
+        <el-tooltip
+          content={
+            scope.row[item.prop] && scope.row[item.prop] != ''
+              ? scope.row[item.prop]
+              : '2'
+          }
+          placement="right"
+          effect="dark"
+        >
           <div class="ellipsis">{scope.row[item.prop]}</div>
         </el-tooltip>
       </div>

src/components/RenderTable/component/bodySlot/index.vue

@@ -61,33 +61,33 @@ const RenderSlot = {
     if (params.column.isRedraw) {
       let content = data.props.render(h, params)
       let contentDiv = content.children
-      if (contentDiv.length > 2) {
+      // if (contentDiv.length > 2) {
-        // 切割掉第一个div
+      // 切割掉第一个div
-        const first = contentDiv.splice(0, 1)
+      //   const first = contentDiv.splice(0, 1)
-        const other = contentDiv.splice(0, contentDiv.length)
+      //   const other = contentDiv.splice(0, contentDiv.length)
-        first[0].data.class = 'normal-button'
+      //   first[0].data.class = 'normal-button'
-        first[0].data.props.type = null
+      //   first[0].data.props.type = null
-        first[0].data.props.size = null
+      //   first[0].data.props.size = null
-        other.forEach(item => {
+      //   other.forEach(item => {
-          // item.data.class = 'normal-button '
+      //     // item.data.class = 'normal-button '
-          item.data.class = 'normal-button popver-button'
+      //     item.data.class = 'normal-button popver-button'
-        })
+      //   })
+      //
+      //   content.children = [renderTooltip(first), renderPopver(other)]
+      //   // content.children = [renderTooltip(first), ...other]
+      //   return content
+      // } else {
+      // const first = contentDiv.splice(0, contentDiv)
 
-        content.children = [renderTooltip(first), renderPopver(other)]
+      contentDiv = contentDiv.map(item => {
-        // content.children = [renderTooltip(first), ...other]
+        item.data.class = 'normal-button'
-        return content
+        item.data.props.type = null
-      } else {
+        item.data.props.size = null
-        // const first = contentDiv.splice(0, contentDiv)
+        return renderTooltip([item])
-
+      })
-        contentDiv = contentDiv.map(item => {
+      content.children = contentDiv
-          item.data.class = 'normal-button'
+      return content
-          item.data.props.type = null
+      // }
-          item.data.props.size = null
-          return renderTooltip([item])
-        })
-        content.children = contentDiv
-        return content
-      }
       // let div =
     } else {
       return data.props.render(h, params)

src/icons/svg/miner.svg

@@ -0,0 +1 @@
+<svg t="1747209708697" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="16490" width="20" height="20"><path d="M128 0h768C966.69696 0 1024 57.30304 1024 128v768c0 70.69696-57.30304 128-128 128h-768C57.30304 1024 0 966.69696 0 896v-768C0 57.30304 57.30304 0 128 0zM481.28 194.56v50.2784h169.5744a721.70496 721.70496 0 0 1-13.74208 82.7904H509.5424V675.84h51.94752V374.94784H782.2336V675.84h51.94752V327.6288h-144.384c6.12352-26.61376 11.4688-53.9648 15.28832-82.80064H860.16V194.56H481.28z m239.3088 471.04L686.08 698.51136C743.85408 744.59136 789.62688 788.48 822.64064 829.44L860.16 792.87296C822.64064 750.44864 776.12032 708.02432 720.5888 665.6z m-87.4496-256v131.65568C631.64416 604.16 617.2672 654.6432 591.5648 694.12864 562.81088 732.16 512.14336 762.15296 440.32 784.82432L469.8112 829.44c74.8544-24.87296 128.55296-58.51136 161.82272-101.67296 34.02752-46.08 52.1728-108.24704 54.44608-186.51136V409.6h-52.9408zM246.1696 286.40256l-40.77568 24.05376c41.54368 37.90848 77.70112 74.3424 107.70432 107.8784H163.84v48.8448h110.78656v292.28032c0 17.50016-8.46848 26.24512-23.8592 26.24512-21.53472 0-43.84768-1.45408-66.92864-3.64544L194.6112 829.44h73.86112c38.46144 0 58.4704-19.68128 58.4704-57.57952V467.16928h81.54112c-10.77248 39.36256-23.84896 72.16128-37.69344 99.86048l45.38368 16.76288c16.92672-32.07168 32.31744-76.53376 44.62592-133.38624v-32.07168h-87.7056a1096.2432 1096.2432 0 0 0-37.69344-43.7248c36.92544-38.64576 71.54688-84.56192 103.08608-138.50624V194.56H185.38496v48.8448h193.86368c-23.08096 36.43392-48.46592 69.24288-76.16512 97.66912-16.91648-17.50016-36.1472-35.71712-56.9344-54.67136z" fill="#4f47f5" p-id="16491"></path></svg>

src/views/app/Home.vue

@@ -393,7 +393,7 @@ export default {
 
     async getKnowledgeList() {
       let { content } = await docManageDataset({ nameLike: this.nameLike })
-      if (content.content && content.length > 0) {
+      if (content.content && content.content.length > 0) {
         this.dataset = content.content[0]
         this.datasetList = content.content
       }

src/views/knowledge/detail/index.vue

@@ -62,6 +62,7 @@
           size="medium"
           icon="el-icon-plus"
           class="primary-button"
+          disbaled
           @click="jumpAddKnowledge"
           >上传知识
         </el-button>
@@ -91,7 +92,7 @@
         </el-button>
         <el-button
           type="primary"
-          icon="el-icon-edit-outline"
+          icon="el-icon-help"
           size="medium"
           class="line-button"
           @click="handleMetaData"
@@ -482,7 +483,12 @@ export default {
       querys.datasetId = datasetId
       querys.documentId = params.row.id
       if (params.row.optStatus === 0) {
-        querys.activeLevel = 1
+        if (params.row.useMineru === 1) {
+          querys.activeLevel = 0
+          querys.isMd = true
+        } else {
+          querys.activeLevel = 1
+        }
       } else {
         querys.activeLevel = params.row.optStatus - 1
         querys.isMd = true
@@ -632,7 +638,26 @@ export default {
             let text = documentSourceOptions.find(
               item => item.value === String(params.row.documentSource)
             ).label
-            return h('div', [h('span', text)])
+            return h(
+              'div',
+              {
+                class: 'flex align-items-c'
+              },
+              [
+                h('svg-icon', {
+                  props: {
+                    iconClass: params.row.useMineru === 1 ? 'miner' : 'none'
+                  },
+                  class: 'mr5',
+                  style: {
+                    // display: params.row.useMineru === 1 ? '' : 'none',
+                    width: '15px',
+                    fontSize: '15px'
+                  }
+                }),
+                h('span', {}, text)
+              ]
+            )
           }
         },
         {
@@ -699,8 +724,8 @@ export default {
                   on: {
                     click: () => this.deleteKnowledge(params.row)
                   }
-                },
+                }
-                '删除'
+                // '删除'
               ),
               // h(
               //   'el-button',
@@ -725,15 +750,15 @@ export default {
                   props: {
                     type: 'primary',
                     size: 'mini',
-                    icon: 'el-icon-tickets',
+                    icon: 'el-icon-help',
                     title: '添加元数据',
                     disabled: params.row.documentStatus !== 1
                   },
                   on: {
                     click: () => this.handleAddMetadata(params.row)
                   }
-                },
+                }
-                '标注元数据'
+                // '标注元数据'
               ),
               params.row.optStatus < 4
                 ? h(
@@ -743,14 +768,14 @@ export default {
                       props: {
                         type: 'primary',
                         size: 'mini',
-                        icon: 'el-icon-tickets',
+                        icon: 'el-icon-video-play',
-                        title: '添加元数据'
+                        title: '继续处理'
                       },
                       on: {
                         click: () => this.jumpToUpload(params)
                       }
-                    },
+                    }
-                    '文件拆分处理'
+                    // '文件拆分处理'
                   )
                 : ''
             ])

src/views/knowledge/detail/reviewKnowledge.vue

@@ -243,8 +243,8 @@ export default {
         removeExtraSpaces: true,
         removeUrlsEmails: false,
         separator: '\\n\\n',
-        maxTokens: 1000,
+        maxTokens: 4000,
-        chunkOverlap: 50
+        chunkOverlap: 400
       },
 
       form: {
@@ -252,8 +252,8 @@ export default {
         removeExtraSpaces: true,
         removeUrlsEmails: false,
         separator: '\\n\\n',
-        maxTokens: 1000,
+        maxTokens: 4000,
-        chunkOverlap: 50
+        chunkOverlap: 400
       },
       datasetDetail: {},
       documentDetail: {},

src/views/rules/Index.vue

@@ -54,8 +54,8 @@ export default {
                     },
                     class: 'normal-button',
                     on: { click: () => this.handleEdit(params.row) }
-                  },
+                  }
-                  '修改'
+                  // '修改'
                 ),
                 h(
                   'el-button',
@@ -70,8 +70,8 @@ export default {
                     on: {
                       click: () => this.handleDelete(params.row, params.index)
                     }
-                  },
+                  }
-                  '删除'
+                  // '删除'
                 )
               ])
             }

src/views/system/role/index.vue

@@ -179,8 +179,8 @@ export default {
                     },
                     class: 'normal-button',
                     on: { click: () => this.handleDelete(params.row) }
-                  },
+                  }
-                  '删除'
+                  // '删除'
                 ),
                 h(
                   'el-button',
@@ -195,8 +195,8 @@ export default {
                     on: {
                       click: () => this.handlePermissionVisible(params.row)
                     }
-                  },
+                  }
-                  '设置权限'
+                  // '设置权限'
                 )
               ])
             }

src/views/system/user/index.vue

@@ -177,43 +177,42 @@ export default {
                     props: {
                       type: 'text',
                       size: 'mini',
-                      icon: 'el-icon-remove-outline',
+                      icon:
-                      style:
                         params.row.status === 0
-                          ? 'color: #F56C6C'
+                          ? 'el-icon-remove-outline'
-                          : 'color: #67C23A'
+                          : 'el-icon-circle-check',
+                      title: params.row.status === 0 ? '停用' : '启用'
                     },
+                    // style:
+                    //   params.row.status === 0
+                    //     ? 'color: #F56C6C'
+                    //     : 'color: #67C23A',
+
                     on: { click: () => this.handleToggleStatus(params.row) }
-                  },
+                  }
-                  params.row.status === 0 ? '停用' : '启用'
+                  // params.row.status === 0 ? '停用' : '启用'
                 ),
-                h(
+                h('el-button', {
-                  'el-button',
+                  props: {
-                  {
+                    type: 'text',
-                    props: {
+                    size: 'mini',
-                      type: 'text',
+                    style: 'color: #409EFF',
-                      size: 'mini',
+                    icon: 'el-icon-refresh-right',
-                      style: 'color: #409EFF',
+                    title: '重置密码'
-                      icon: 'el-icon-refresh-right'
-                    },
-                    class: 'normal-button',
-                    on: { click: () => this.handleResetPassword(params.row) }
                   },
-                  '重置密码'
+                  class: 'normal-button',
-                ),
+                  on: { click: () => this.handleResetPassword(params.row) }
-                h(
+                }),
-                  'el-button',
+                h('el-button', {
-                  {
+                  props: {
-                    props: {
+                    type: 'text',
-                      type: 'text',
+                    size: 'mini',
-                      size: 'mini',
+                    style: 'color: #F56C6C',
-                      style: 'color: #F56C6C',
+                    icon: 'el-icon-delete',
-                      icon: 'el-icon-delete'
+                    title: '删除'
-                    },
-                    on: { click: () => this.handleDelete(params.row) }
                   },
-                  '删除'
+                  on: { click: () => this.handleDelete(params.row) }
-                )
+                })
               ])
             }
           }