NEZ-3174 feat：notebook 页面开发

nezha-fronted/src/assets/css/components/common/rightBox/chartRightBox/chartRightBox.scss

@@ -18,6 +18,14 @@
     background: $--color-primary;
     border: none;
   }
+  .notebook-datasource-tab{
+    .el-tabs__nav{
+      width: 100%;
+      > div{
+        width: 33.33%;
+      }
+    }
+  }
 }
 .right-box__container{
   .chart-config{

nezha-fronted/src/assets/css/components/page/notebook/notebook.scss

@@ -108,13 +108,14 @@
       box-sizing: border-box;
       height: 100%;
       padding: 10px;
+      padding-top: 0;
       .markdownEditor {
         height: 100% !important;
       }
       .notebook-editor-btn{
         height: 41px;
         position: absolute;
-        top: 10px;
+        top: 0px;
         right: 20px;
         display: flex;
         align-items: center;

nezha-fronted/src/components/chart/chart/chartText.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="mt-10 rich-text-container" v-cloak style="height: 100%;width: 100%;">
     <div class="notebook-editor" v-if="from==='notebook'&&chartInfo.param.isEdit" >
-      <markdownEditor :edit-data="chartInfo.param.text" @textChange="textChange"></markdownEditor>
+      <markdownEditor :edit-data="text" @textChange="textChange"></markdownEditor>
       <div class="notebook-editor-btn">
         <button class="nz-btn nz-btn-size-normal nz-btn-style-light margin-r-10" @click="cancel">
           <span>{{$t('overall.cancel')}}</span>
@@ -37,19 +37,24 @@ export default {
       text: ''
     }
   },
+  created () {
+    if (this.from === 'notebook') {
+      this.chartInfo.param.oldText = this.text
+    }
+  },
   methods: {
     save () {
+      this.chartInfo.param.oldText = this.chartInfo.param.text
       this.chartInfo.param.isEdit = false
     },
     cancel () {
+      this.chartInfo.param.text = this.chartInfo.param.oldText
       this.chartInfo.param.isEdit = false
     },
     textChange (val) {
-      console.log(val)
+      this.chartInfo.param.text = val
     },
-    resize () {
+    resize () {}
-
-    }
   },
   watch: {
     chartInfo: {

nezha-fronted/src/components/chart/chartHeaderMixin.js

@@ -1,3 +1,4 @@
+import bus from '@/libs/bus'
 export default {
   props: {
     chartInfo: Object,
@@ -51,6 +52,10 @@ export default {
       this.$emit('refresh')
     },
     editChart () {
+      if (this.chartInfo.type === 'text' && this.from === 'notebook') {
+        this.$set(this.chartInfo.param, 'isEdit', true)
+        return
+      }
       // this.$emit('edit-chart', this.chartInfo)
       this.$store.dispatch('dispatchEditChart', {
         chart: this.chartInfo,
@@ -66,6 +71,10 @@ export default {
       this.dropdownMenuShow = false
     },
     duplicate () {
+      if (this.chartInfo.type === 'text' && this.from === 'notebook') {
+        bus.$emit('copyChartText', this.chartInfo)
+        return
+      }
       const obj = this.$lodash.cloneDeep(this.chartInfo)
       obj.elements = obj.oldElements
       delete obj.oldElements

nezha-fronted/src/components/common/bottomBox/tabs/notebookTab.vue

@@ -20,18 +20,18 @@
           <span>{{$t('notebook.done')}}</span>
         </button>
         <pick-time ref="pickTime" v-model="searchTime" :refresh-data-func="dateChange" :show-locked="true" :use-chart-unit="false" :sign="'notebook' + obj.id"></pick-time>
-        <el-dropdown v-has="['dashboard_view']" trigger="click" size="medium" class="nz-el-dropdown">
+        <el-dropdown v-has="['notebook_view']" trigger="click" size="medium" class="nz-el-dropdown">
           <button class="top-tool-btn" :title="$t('overall.download')">
             <i class="nz-icon nz-icon-download1"></i>
           </button>
           <el-dropdown-menu slot="dropdown" class="right-box-select-top right-public-box-dropdown-top nz-el-dropdown-menu">
-            <el-dropdown-item v-has="'dashboard_view'">
+            <el-dropdown-item v-has="'notebook_view'">
               <div @click="download('pdf')">{{$t('notebook.downloadAs',{format:'PDF'})}}</div>
             </el-dropdown-item>
-            <el-dropdown-item v-has="'dashboard_view'">
+            <el-dropdown-item v-has="'notebook_view'">
               <div @click="download('html')">{{$t('notebook.downloadAs',{format:'markdown'})}}</div>
             </el-dropdown-item>
-            <el-dropdown-item v-has="'dashboard_view'">
+            <el-dropdown-item v-has="'notebook_view'">
               <div @click="downloadJson()">{{$t('notebook.downloadNotebook')}} JSON</div>
             </el-dropdown-item>
           </el-dropdown-menu>
@@ -93,6 +93,7 @@
 </template>
 
 <script>
+import Vue from 'vue'
 import axios from 'axios'
 import bus from '../../../../libs/bus'
 import subDataListMixin from '@/components/common/mixin/subDataList'
@@ -168,6 +169,12 @@ export default {
   },
   methods: {
     done () {
+      this.$refs.notebookList.copyDataList.forEach(item => {
+        if (item.type === 'text') {
+          Vue.delete(item.param, 'isEdit')
+          Vue.delete(item.param, 'oldText')
+        }
+      })
       let charts = this.$lodash.cloneDeep(this.$refs.notebookList.copyDataList)
       charts = charts.filter(item => item.name !== 'groupTemp')
       const params = {
@@ -216,6 +223,14 @@ export default {
     addNotebook (position) {
       this.addChartBefore({ type: 'line', datasource: 'metrics', position })
     },
+    copyChartText (data) {
+      const chart = JSON.parse(JSON.stringify(data))
+      chart.y = chart.y + 0.01
+      chart.id = this.getMaxId(this.$refs.notebookList.copyDataList) + 1
+      chart.param.isEdit = false
+      this.$refs.notebookList.copyDataList.push(chart)
+      this.$refs.notebookList.onScroll(this.scrollbarWrap.scrollTop)
+    },
     // 编辑图表信息,打开编辑弹窗
     editChart (data, copy) {
       if (copy) {
@@ -282,8 +297,10 @@ export default {
       })
     },
     addText () {
+      const timestamp = Math.floor(new Date().getTime() / 1000)
+      const name = `text-[${timestamp}]`
       const chart = {
-        name: '',
+        name,
         type: 'text',
         unit: 2,
         datasource: 'misc',
@@ -473,10 +490,10 @@ export default {
       return param
     },
     addChartBefore (chart) {
-      // if (chart.type === 'text') {
+      if (chart.type === 'text') {
-      //   this.addText()
+        this.addText()
-      //   return false
+        return false
-      // }
+      }
       this.$store.dispatch('dispatchEditChart', {
         chart: chart,
         type: 'add'
@@ -617,6 +634,7 @@ export default {
     this.scrollbarWrap = this.$refs.scrollbar
     this.scrollbarWrap.addEventListener('scroll', this.onScroll)
     bus.$on('addNotebook', this.addNotebook)
+    bus.$on('copyChartText', this.copyChartText)
   },
   beforeDestroy () {
     this.$store.dispatch('dispatchPanelTime', {
@@ -627,6 +645,7 @@ export default {
       this.scrollbarWrap.removeEventListener('scroll', this.onScroll)
     }
     bus.$off('addNotebook', this.addNotebook)
+    bus.$off('copyChartText', this.copyChartText)
   },
   watch: {
     obj: {
@@ -647,6 +666,7 @@ export default {
       immediate: false,
       deep: true,
       handler (n) {
+        console.log(n)
         if (n) {
           this.disposeChart()
         } else {

nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue

@@ -141,6 +141,7 @@
             value-key="chartType"
             @change="chartTypeChange">
             <el-option
+              v-show="from!=='notebook'||item.id!=='log'"
               v-for="item in chartTypeList"
               :key="item.id"
               :disabled="item.id==='group' && chartConfig.isGroup"

nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue

@@ -72,17 +72,17 @@
         <div class="form__sub-title">
           <span>{{$t('dashboard.dashboard.chartForm.dataConfig')}}</span>
         </div>
-        <el-tabs v-model="editChart.datasource" @tab-click="datasourceChange" type="card">
+        <el-tabs v-model="editChart.datasource" @tab-click="datasourceChange" type="card" :class="{'notebook-datasource-tab':from==='notebook'}">
           <el-tab-pane :label="$t('overall.metrics')" name="metrics">
             <chart-config :from="from" :variables="variables" ref="childrenFrommetrics" :type="'metrics'" v-if="editChart.datasource == 'metrics'" :params.sync="editChart" @change="editChartChange"/>
           </el-tab-pane>
-          <el-tab-pane :label="$t('overall.logs')" name="logs" :disabled="from==='notebook'">
+          <el-tab-pane :label="$t('overall.logs')" name="logs">
             <chart-config :from="from" :variables="variables" ref="childrenFromlogs" :type="'log'" v-if="editChart.datasource == 'logs'" :params.sync="editChart" @change="editChartChange" class="datasource-log"/>
           </el-tab-pane>
           <el-tab-pane :label="$t('overall.system')" name="system">
             <system-chart-config :from="from" :variables="variables" ref="childrenFromsystem" v-if="editChart.datasource == 'system'" :params.sync="editChart" @change="editChartChange"/>
           </el-tab-pane>
-          <el-tab-pane :label="$t('overall.misc')" name="misc">
+          <el-tab-pane :label="$t('overall.misc')" name="misc" v-if="from!=='notebook'">
             <other-chart-config :from="from" :variables="variables" ref="childrenFrommisc" v-if="editChart.datasource == 'misc'" :params.sync="editChart" @change="editChartChange"/>
           </el-tab-pane>
         </el-tabs>
@@ -424,29 +424,73 @@ export default {
         }
       }
       if (this.editChart.datasource == 'logs') {
-        this.editChart = {
+        if (this.from === 'notebook') {
-          ...this.editChart,
+          this.editChart = {
-          span: 6,
+            ...this.editChart,
-          height: 2,
+            span: 6,
-          unit: 2,
+            height: 2,
-          type: 'log',
+            unit: 2,
-          elements: [{ expression: '', legend: '', type: 'expert', id: '', name: 'A', state: 1, step: undefined }],
+            type: 'line',
-          param: {
+            elements: [{ expression: '', legend: '', type: 'expert', id: '', name: 'A', state: 1, step: undefined }],
-            enable: {
+            param: {
-              thresholds: false,
+              stack: 0,
-              legend: true,
+              nullType: 'null',
-              valueMapping: false,
+              legend: { placement: 'bottom', values: [] },
-              visibility: false
+              enable: {
-            },
+                thresholds: false,
-            limit: 100,
+                legend: true,
-            showHeader: this.editChart.param.showHeader,
+                valueMapping: false,
-            visibility: {
+                visibility: false
-              varName: '',
+              },
-              operator: 'equal',
+              thresholds: [{ id: s8(), value: undefined, color: '#eeeeeeff' }],
-              varValue: '',
+              showHeader: this.editChart.param.showHeader,
-              result: 'show'
+              visibility: {
-            },
+                varName: '',
-            dataLink: []
+                operator: 'equal',
+                varValue: '',
+                result: 'show'
+              },
+              rightYAxis: {
+                elementNames: [],
+                style: 'line',
+                unit: 2,
+                label: '',
+                min: undefined,
+                max: undefined
+              },
+              dataLink: [],
+              tooltip: {
+                mode: 'all',
+                sort: 'none'
+              },
+              option: this.lineOption
+            }
+          }
+        } else {
+          this.editChart = {
+            ...this.editChart,
+            span: 6,
+            height: 2,
+            unit: 2,
+            type: 'log',
+            elements: [{ expression: '', legend: '', type: 'expert', id: '', name: 'A', state: 1, step: undefined }],
+            param: {
+              enable: {
+                thresholds: false,
+                legend: true,
+                valueMapping: false,
+                visibility: false
+              },
+              limit: 100,
+              showHeader: this.editChart.param.showHeader,
+              visibility: {
+                varName: '',
+                operator: 'equal',
+                varValue: '',
+                result: 'show'
+              },
+              dataLink: []
+            }
           }
         }
       }
@@ -493,30 +537,7 @@ export default {
         }
         delete this.editChart.elements
       }
-      if (this.editChart.datasource == 'misc' && this.from === 'notebook') {
+      if (this.editChart.datasource == 'misc') {
-        this.editChart = {
-          ...this.editChart,
-          span: 12,
-          height: 4,
-          type: 'text',
-          param: {
-            text: '',
-            enable: {
-              visibility: false
-            },
-            showHeader: this.editChart.param.showHeader,
-            visibility: {
-              varName: '',
-              operator: 'equal',
-              varValue: '',
-              result: 'show'
-            },
-            editorType: 'markdown',
-            isEdit: true
-          }
-        }
-        delete this.editChart.elements
-      } else if (this.editChart.datasource == 'misc') {
         this.editChart = {
           ...this.editChart,
           span: 6,

nezha-fronted/src/components/common/rightBox/chart/otherChartConfig.vue

@@ -30,7 +30,6 @@
             value-key="chartType"
             @change="chartTypeChange">
             <el-option
-              v-show="from!=='notebook'||item.id==='text'"
               v-for="item in chartTypeList"
               :key="item.id"
               :disabled="item.id==='group' && !!chartConfig.groupId"
@@ -63,7 +62,6 @@
             popper-class="right-box-select-top prevent-clickoutside"
             size="small"
             @change="editorTypeChange"
-            :disabled="from==='notebook'"
           >
             <el-option :label="$t('dashboard.dashboard.chartForm.richText')" value="richText"></el-option>
             <el-option :label="$t('dashboard.dashboard.chartForm.markDown')" value="markdown"></el-option>
@@ -98,7 +96,7 @@
         </el-form-item>
       </div>
       <!--content-->
-      <div v-if="contentShow(chartConfig.type)&&from!=='notebook'" class="form__sub-title">
+      <div v-if="contentShow(chartConfig.type)" class="form__sub-title">
         <span>{{$t('dashboard.dashboard.chartForm.content')}}</span>
         <span style="cursor: pointer" v-if="isDiagram(chartConfig.type)"><i class="nz-icon nz-icon-edit" @click="topologyDialogChange(true)"></i></span>
       </div>
@@ -130,7 +128,7 @@
         :isChart="true"
       />
       <!--text-->
-      <el-form-item v-if="isText(chartConfig.type)&&from!=='notebook'" :rules="{ required: true,  message: $t('validate.required'), trigger: 'change' }" prop="param.text">
+      <el-form-item v-if="isText(chartConfig.type)" :rules="{ required: true,  message: $t('validate.required'), trigger: 'change' }" prop="param.text">
         <markdownEditor v-if="chartConfig.param.editorType==='markdown'" :edit-data="chartConfig.param.text" @textChange="textChange"></markdownEditor>
         <rich-text-editor v-else ref="richTextEditor" :edit-data="chartConfig.param.text" @textChange="textChange"></rich-text-editor>
       </el-form-item>

nezha-fronted/src/components/common/table/settings/notebookTable.vue

@@ -56,14 +56,14 @@
       <div slot="header" class="table-operation-title">{{$t('overall.option')}}</div>
       <div slot-scope="scope" class="table-operation-items">
         <button class="table-operation-item" @click="showBottomBox('notebookTab', scope.row)" :title="$t('overall.view')"><i class="nz-icon nz-icon-view1"></i></button>
-        <el-dropdown size="medium" v-has="['role_add','role_edit','role_delete']" trigger="click" @command="tableOperation">
+        <el-dropdown size="medium" v-has="['notebook_add','notebook_edit','notebook_delete']" trigger="click" @command="tableOperation">
           <div class="table-operation-item table-operation-item--more" :title="$t('overall.moreOperations')">
             <i class="nz-icon nz-icon-more3"></i>
           </div>
           <el-dropdown-menu slot="dropdown" class="right-box-select-top right-public-box-dropdown-top">
-            <el-dropdown-item v-has="'role_edit'" :command="['notebookTab', scope.row]"><i class="nz-icon nz-icon-edit"></i><span class="operation-dropdown-text">{{$t('overall.edit')}}</span></el-dropdown-item>
+            <el-dropdown-item v-has="'notebook_edit'" :command="['notebookTab', scope.row]"><i class="nz-icon nz-icon-edit"></i><span class="operation-dropdown-text">{{$t('overall.edit')}}</span></el-dropdown-item>
-            <el-dropdown-item v-has="'role_add'" :command="['copy', scope.row]"><i class="nz-icon nz-icon-override"></i><span class="operation-dropdown-text">{{$t('overall.duplicate')}}</span></el-dropdown-item>
+            <el-dropdown-item v-has="'notebook_add'" :command="['copy', scope.row]"><i class="nz-icon nz-icon-override"></i><span class="operation-dropdown-text">{{$t('overall.duplicate')}}</span></el-dropdown-item>
-            <el-dropdown-item v-has="'role_delete'" :command="['delete-rel', scope.row, {forceDeleteShow:false, single:true,from:'notebook'}]"><i class="nz-icon nz-icon-delete"></i><span class="operation-dropdown-text">{{$t('overall.delete')}}</span></el-dropdown-item>
+            <el-dropdown-item v-has="'notebook_delete'" :command="['delete-rel', scope.row, {forceDeleteShow:false, single:true,from:'notebook'}]"><i class="nz-icon nz-icon-delete"></i><span class="operation-dropdown-text">{{$t('overall.delete')}}</span></el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
       </div>

nezha-fronted/src/components/page/notebook/notebook.vue

@@ -18,7 +18,7 @@
       <template v-slot:top-tool-left>
       </template>
       <template v-slot:top-tool-right>
-        <button id="asset-create-asset" v-has="'role_add'" :title="$t('asset.createAsset')" class="top-tool-btn" @click.stop="add">
+        <button id="asset-create-asset" v-has="'notebook_add'" :title="$t('asset.createAsset')" class="top-tool-btn" @click.stop="add">
           <i class="nz-icon nz-icon-create-square"></i>
         </button>
        <top-tool-more-options
@@ -37,7 +37,7 @@
           import-url="/visual/notebook/import"
           :only-json="true"
           @afterImport="getTableData"
-          v-has="['role_add','role_edit']"
+          v-has="['notebook_add','notebook_edit']"
         >
         </top-tool-more-options>
       </template>
@@ -86,7 +86,7 @@
       @getTableData="getTableData"
     >
       <template v-slot:top-tool-right>
-        <button v-has="'role_add'" :title="$t('overall.createDatacenter')" class="top-tool-btn margin-r-10" type="button" @click="add">
+        <button v-has="'notebook_add'" :title="$t('overall.createDatacenter')" class="top-tool-btn margin-r-10" type="button" @click="add">
           <i class="nz-icon-create-square nz-icon"></i>
         </button>
        <top-tool-more-options
@@ -104,7 +104,7 @@
           import-url="/visual/notebook/import"
           :only-json="true"
           @afterImport="getTableData"
-          v-has="['role_add','role_edit','role_delete']"
+          v-has="['notebook_add','notebook_edit','notebook_delete']"
         >
           <template v-slot:before>
             <div>
@@ -118,7 +118,7 @@
                   :type="'link'"
                   :title="$t('overall.batchDel')"
                   id="account-list-batch-delete"
-                  v-has="'role_delete'"
+                  v-has="'notebook_delete'"
                   :delete-objs="batchDeleteObjs"
                   api="visual/notebook"
                   @after="getTableData"

nezha-fronted/src/permission.js

@@ -8,7 +8,7 @@ import VueResource from 'vue-resource'
 import bus from '@/libs/bus'
 Vue.use(VueResource)
 
-const loginWhiteList = ['/setup', '/sys/license/upload', '/sys/license/state', '/sys/appearance', '/i18n', '/terminal', '/notebook'] // 免登陆白名单
+const loginWhiteList = ['/setup', '/sys/license/upload', '/sys/license/state', '/sys/appearance', '/i18n', '/terminal'] // 免登陆白名单
 export const permissionWhiteList = ['/profile', '/menu', ...loginWhiteList] // 权限白名单
 router.beforeEach((to, from, next) => {
   if (window.entrance) {