eta1.9.8 bug-fix

src/lang/modules/ETATables/En.js

@@ -129,6 +129,7 @@ export default {
     share_user_btn:'Select User',
     share_success_msg:'Set Successful',
     cancel_share_success_msg:'Cancellation Successful',
+    cancel_share_hint:'Confirm to cancel the share?',
     share_set_user:'Select Sharing User',
     shart_user:'Sharing User',
     share_check_text:'Viewable',

src/lang/modules/ETATables/Zh.js

@@ -129,6 +129,7 @@ export default {
     share_user_btn:'选择用户',
     share_success_msg:'设置共享成功',
     cancel_share_success_msg:'取消共享成功',
+    cancel_share_hint:'是否确认取消共享?',
     share_set_user:'设置共享用户',
     shart_user:'共享用户',
     share_check_text:'可查看权限',

src/views/datasheet_manage/customAnalysis/components/shareTableDia.vue

@@ -235,7 +235,10 @@ export default {
                     margin-top:10px;
                     margin-left:95px;
                     display:flex;
+                    flex-wrap: wrap;
                     gap:15px;
+                    max-height: 200px;
+                    overflow-y: auto;
                     .list-item{
                         cursor:pointer;
                         display:flex;

src/views/datasheet_manage/customAnalysis/list.vue

@@ -75,7 +75,7 @@
             :allow-drop="canDropHandle"
             :current-node-key="select_node"
             :default-expanded-keys="defaultShowNodes"
-            draggable
+            :draggable="classify_tab!==1"
             :expand-on-click-node="false"
             check-strictly
             :empty-text="$t('Common.no_classify_msg')"
@@ -94,7 +94,7 @@
                 :placeholder="$t('OnlineExcelPage.please_value_ipt')"
                 class="label-input"
                 v-model="new_label"
-                v-if="data.isEdit&&isSheetBtnShow('classifyOpt_edit')"
+                v-if="data.isEdit&&isSheetBtnShow('classifyOpt_edit')&&classify_tab!==1"
                 @blur="changeValue(data)"
               />
               <span
@@ -122,6 +122,7 @@
                   src="~@/assets/img/data_m/move_ico.png"
                   alt=""
                   style="width: 14px; height: 14px; margin-right: 8px"
+                  v-if="classify_tab!==1"
                 />
                  <!-- 目录操作：添加/编辑/删除 -->
                 <img
@@ -129,14 +130,14 @@
                     alt=""
                     style="width: 14px; height: 14px; margin-right: 8px"
                     @click.stop="addNode(node,data)"
-                    v-if="!data.ExcelInfoId&&isSheetBtnShow('classifyOpt_edit')&&node.level<3"
+                    v-if="!data.ExcelInfoId&&isSheetBtnShow('classifyOpt_edit')&&node.level<3&&classify_tab!==1"
                 />
                 <img
                   src="~@/assets/img/set_m/edit.png"
                   alt=""
                   style="width: 15px; height: 14px; margin-right: 8px"
                   @click.stop="editNode(node, data)"
-                  v-if="!data.ExcelInfoId&&isSheetBtnShow('classifyOpt_edit')"
+                  v-if="!data.ExcelInfoId&&isSheetBtnShow('classifyOpt_edit')&&classify_tab!==1"
                 />
                 <img
                   slot="reference"
@@ -144,7 +145,7 @@
                   alt=""
                   style="width: 14px; height: 14px"
                   @click.stop="removeNode(node, data)"
-                  v-if="!data.ExcelInfoId&&isSheetBtnShow('classifyOpt_delete')"
+                  v-if="!data.ExcelInfoId&&isSheetBtnShow('classifyOpt_delete')&&classify_tab!==1"
                 />
                 <!-- 表格操作：共享/取消共享 -->
                 <span v-if="data.ExcelInfoId&&data.ShowShareBtn">
@@ -248,7 +249,7 @@
                         </li> -->
                         <li
                             class="editsty"
-                            @click="saveOtherHandle"
+                            @click="saveOtherHandle(null)"
                             v-if="isSheetBtnShow('otherSave')&&sheetDetailInfo.Button.CopyButton"
                         >
                             <img src="~@/assets/img/icons/save_as_blue_new.png"/>
@@ -591,16 +592,22 @@ export default {
             this.currentTable = command.item
             this.isShowShareDia = true
         }else{
-            //取消共享就是 两个权限列表都为空
-            sheetInterface.sheetAnalysisInterface.setSheetShare({
-                ExcelInfoId:command.item.ExcelInfoId,
-                ViewUserIds:[],
-                EditUserIds:[]
-            }).then(res=>{
-                if(res.Ret!==200) return 
-                this.$message.success(`取消共享成功`)
-                this.getTreeData();
-            })
+            //取消共享就是 两个权限列表都为空 但是要二次确认
+            this.$confirm(/* "是否确认取消共享?" */this.$t('CustomAnalysisPage.cancel_share_hint'), this.$t('Dialog.warn_tit'), {
+                type: "warning",
+           }).then(() => {
+                sheetInterface.sheetAnalysisInterface.setSheetShare({
+                    ExcelInfoId:command.item.ExcelInfoId,
+                    ViewUserIds:[],
+                    EditUserIds:[]
+                }).then(res=>{
+                    if(res.Ret!==200) return 
+                    this.$message.success(this.$t('CustomAnalysisPage.cancel_share_success_msg'))
+                    this.getTreeData()
+                    this.getPublicList()
+                })
+           })
+            .catch(() => {});
         }
     },
     /* 获取表格分类 */