From fdca998cee887501aa7ab95c41e361384835bbe2 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 30 Jul 2024 11:30:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF?=
 =?UTF-8?q?=E3=80=81=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E6=96=B0=E5=BB=BA=E4=BF=9D=E5=AD=98=E6=97=B6=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=88=87=E6=8D=A2=E6=A3=80=E6=9F=A5=EF=BC=8C=E5=A6=82?=
 =?UTF-8?q?=E6=9E=9C=E5=90=8C=E6=96=B0=E5=BB=BA=E6=97=B6=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E4=B8=8D=E4=B8=80=E8=87=B4=EF=BC=8C=E5=88=99=E7=A6=81=E6=AD=A2?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/dashboard/DbToolbar.vue      | 15 +++++++++++++++
 .../components/data-visualization/DvToolbar.vue | 17 ++++++++++++++++-
 .../rich-text/DeRichTextView.vue                |  9 +++++++++
 3 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/core/core-frontend/src/components/dashboard/DbToolbar.vue b/core/core-frontend/src/components/dashboard/DbToolbar.vue
index 6ab9a5a0f6..7e444e83c7 100644
--- a/core/core-frontend/src/components/dashboard/DbToolbar.vue
+++ b/core/core-frontend/src/components/dashboard/DbToolbar.vue
@@ -31,6 +31,7 @@ import DbMoreComGroup from '@/custom-component/component-group/DbMoreComGroup.vu
 import { useCache } from '@/hooks/web/useCache'
 import DeFullscreen from '@/components/visualization/common/DeFullscreen.vue'
 import DeAppApply from '@/views/common/DeAppApply.vue'
+import {useUserStoreWithOut} from "@/store/modules/user";
 const { t } = useI18n()
 const dvMainStore = dvMainStoreWithOut()
 const snapshotStore = snapshotStoreWithOut()
@@ -62,6 +63,7 @@ const state = reactive({
 const resourceGroupOpt = ref(null)
 const outerParamsSetRef = ref(null)
 const { wsCache } = useCache('localStorage')
+const userStore = useUserStoreWithOut()
 
 const props = defineProps({
   createType: {
@@ -155,6 +157,19 @@ const resourceOptFinish = param => {
 }
 
 const saveCanvasWithCheck = () => {
+  if (userStore.getOid && wsCache.get('user.oid') && userStore.getOid !== wsCache.get('user.oid')) {
+    ElMessageBox.confirm('已切换至新组织，无权保存其他组织的资源', {
+      confirmButtonType: 'primary',
+      type: 'warning',
+      confirmButtonText: '关闭页面',
+      cancelButtonText: '取消',
+      autofocus: false,
+      showClose: false
+    }).then(() => {
+      window.close()
+    })
+    return
+  }
   if (dvInfo.value.dataState === 'prepare') {
     if (appData.value) {
       // 应用保存
diff --git a/core/core-frontend/src/components/data-visualization/DvToolbar.vue b/core/core-frontend/src/components/data-visualization/DvToolbar.vue
index 74acf3cb4d..c594b1ad20 100644
--- a/core/core-frontend/src/components/data-visualization/DvToolbar.vue
+++ b/core/core-frontend/src/components/data-visualization/DvToolbar.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { ElMessage, ElMessageBox } from 'element-plus-secondary'
 import eventBus from '@/utils/eventBus'
-import { ref, nextTick, computed, toRefs } from 'vue'
+import { ref, nextTick, computed, toRefs, onMounted } from 'vue'
 import { useEmbedded } from '@/store/modules/embedded'
 import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'
 import { snapshotStoreWithOut } from '@/store/modules/data-visualization/snapshot'
@@ -27,6 +27,7 @@ import ComponentButtonLabel from '@/components/visualization/ComponentButtonLabe
 import DeFullscreen from '@/components/visualization/common/DeFullscreen.vue'
 import DeAppApply from '@/views/common/DeAppApply.vue'
 import { useEmitt } from '@/hooks/web/useEmitt'
+import { useUserStoreWithOut } from '@/store/modules/user'
 let nameEdit = ref(false)
 let inputName = ref('')
 let nameInput = ref(null)
@@ -43,6 +44,7 @@ const { wsCache } = useCache('localStorage')
 const dvModel = 'dataV'
 const outerParamsSetRef = ref(null)
 const fullScreeRef = ref(null)
+const userStore = useUserStoreWithOut()
 
 const props = defineProps({
   createType: {
@@ -103,6 +105,19 @@ const resourceOptFinish = param => {
 }
 
 const saveCanvasWithCheck = () => {
+  if (userStore.getOid && wsCache.get('user.oid') && userStore.getOid !== wsCache.get('user.oid')) {
+    ElMessageBox.confirm('已切换至新组织，无权保存其他组织的资源', {
+      confirmButtonType: 'primary',
+      type: 'warning',
+      confirmButtonText: '关闭页面',
+      cancelButtonText: '取消',
+      autofocus: false,
+      showClose: false
+    }).then(() => {
+      window.close()
+    })
+    return
+  }
   if (dvInfo.value.dataState === 'prepare') {
     if (appData.value) {
       // 应用保存
diff --git a/core/core-frontend/src/custom-component/rich-text/DeRichTextView.vue b/core/core-frontend/src/custom-component/rich-text/DeRichTextView.vue
index f8846e202a..13371fd59e 100644
--- a/core/core-frontend/src/custom-component/rich-text/DeRichTextView.vue
+++ b/core/core-frontend/src/custom-component/rich-text/DeRichTextView.vue
@@ -349,6 +349,15 @@ const editCursor = () => {
     if (myDiv.focus) {
       myDiv.focus()
     }
+    tinymce.init({
+      selector: tinymceId,
+      plugins: 'table',
+      setup: function (editor) {
+        editor.on('init', function () {
+          console.log('====init====')
+        })
+      }
+    })
   }, 100)
 }
 

From 970863f07f134faf536b14065c9ed9c41a3b5fcd Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 30 Jul 2024 11:55:08 +0800
Subject: [PATCH 2/2] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF?=
 =?UTF-8?q?=E3=80=81=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):=20=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=9B=86=E9=80=89=E6=8B=A9=E6=97=B6=E5=A6=82=E6=9E=9C?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E7=BB=84=E7=BB=87=E5=88=99=E7=A6=81=E6=AD=A2?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../editor/dataset-select/DatasetSelect.vue   | 33 +++++++++++++++++--
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/editor/dataset-select/DatasetSelect.vue b/core/core-frontend/src/views/chart/components/editor/dataset-select/DatasetSelect.vue
index 119ae966ba..fc64608a80 100644
--- a/core/core-frontend/src/views/chart/components/editor/dataset-select/DatasetSelect.vue
+++ b/core/core-frontend/src/views/chart/components/editor/dataset-select/DatasetSelect.vue
@@ -8,6 +8,11 @@ import _ from 'lodash'
 import { getDatasetTree, getDatasourceList } from '@/api/dataset'
 import { ElFormItem, FormInstance } from 'element-plus-secondary'
 import { useEmitt } from '@/hooks/web/useEmitt'
+import { useCache } from '@/hooks/web/useCache'
+import { useUserStoreWithOut } from '@/store/modules/user'
+
+const { wsCache } = useCache('localStorage')
+const userStore = useUserStoreWithOut()
 
 const props = withDefaults(
   defineProps<{
@@ -28,6 +33,8 @@ const datasetSelector = ref(null)
 
 const loadingDatasetTree = ref(false)
 
+const orgCheck = ref(true)
+
 const datasetTree = ref<Tree[]>([])
 const toolTip = computed(() => {
   return props.themes === 'dark' ? 'ndark' : 'dark'
@@ -82,11 +89,17 @@ watch(searchStr, val => {
 })
 
 const showTree = computed(() => {
-  return datasetTree.value && datasetTree.value.length > 0 && !loadingDatasetTree.value
+  return (
+    datasetTree.value && datasetTree.value.length > 0 && !loadingDatasetTree.value && orgCheck.value
+  )
+})
+
+const emptyMsg = computed(() => {
+  return orgCheck.value ? '暂无' + sourceName.value : '已切换至新组织，无权访问其他组织的资源'
 })
 
 const showEmptyInfo = computed(() => {
-  return !showTree.value && !loadingDatasetTree.value
+  return !showTree.value && !loadingDatasetTree.value && !orgCheck.value
 })
 
 const computedTree = computed(() => {
@@ -187,6 +200,18 @@ function onPopoverHide() {
 function getNode(nodeId: number) {
   return datasetSelector?.value?.getNode(nodeId)
 }
+const handleFocus = () => {
+  if (
+    props.sourceType === 'dataset' &&
+    userStore.getOid &&
+    wsCache.get('user.oid') &&
+    userStore.getOid !== wsCache.get('user.oid')
+  ) {
+    orgCheck.value = false
+  } else {
+    orgCheck.value = true
+  }
+}
 
 defineExpose({ getNode })
 const appStore = useAppStoreWithOut()
@@ -223,6 +248,7 @@ onMounted(() => {
               v-model="selectedNodeName"
               readonly
               class="data-set-dark"
+              @focus="handleFocus"
               :placeholder="'请选择' + sourceName"
             >
               <template #suffix>
@@ -255,7 +281,7 @@ onMounted(() => {
           <el-main :class="{ dark: themes === 'dark' }">
             <el-scrollbar max-height="252px" always>
               <div class="m-loading" v-if="loadingDatasetTree" v-loading="loadingDatasetTree"></div>
-              <div class="empty-info" v-if="showEmptyInfo">暂无{{ sourceName }}</div>
+              <div class="empty-info" v-if="showEmptyInfo">{{ emptyMsg }}</div>
               <!--          <div class="empty-info" v-if="showEmptySearchInfo">暂无相关数据</div>-->
               <el-tree
                 :class="{ dark: themes === 'dark' }"
@@ -426,6 +452,7 @@ onMounted(() => {
         font-style: normal;
         font-weight: 400;
         line-height: 20px;
+        text-align: center;
       }
 
       .m-loading {