cloud-web-corejs 1.0.54-dev.236 → 1.0.54-dev.238

package/src/layout/components/TagsView/index.vue

@@ -27,12 +27,25 @@
         <i class="el-icon-arrow-right" ayadmin-event="rightPage"
            one-link-mark="yes" @click="$refs.scrollPane.handleScrollRight()"/>
       </el-tooltip>
-      <el-tooltip :enterable="false" class="item" effect="dark" :content="$t1('刷新')" placement="bottom">
+      <el-dropdown style="margin-right:10px">
+        <span class="el-dropdown-link">
+          <i class="el-icon-more el-icon--right"></i>
+        </span>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item @click.native="refreshSelectedTag($route)">
+            <i class="el-icon-refresh"/><span>{{ $t1('刷新') }}</span>
+          </el-dropdown-item>
+          <el-dropdown-item @click.native="closeAllTags(selectedTag)">
+            <i class="el-icon-close"/><span>{{ $t1('全部关闭') }}</span>
+          </el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
+      <!-- <el-tooltip :enterable="false" class="item" effect="dark" :content="$t1('刷新')" placement="bottom">
         <i class="el-icon-refresh" @click="refreshSelectedTag($route)"/>
       </el-tooltip>
       <el-tooltip :enterable="false" class="item" effect="dark" :content="$t1('全部关闭')" placement="bottom">
         <i class="el-icon-close" @click="closeAllTags(selectedTag)"/>
-      </el-tooltip>
+      </el-tooltip> -->
     </div>
     <!-- <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
       <li @click="refreshSelectedTag(selectedTag)">Refresh</li>
@@ -191,11 +204,13 @@ export default {
       })
     },
     closeAllTags(view) {
-      this.$store.dispatch('tagsView/delAllViews').then(({visitedViews}) => {
-        if (this.affixTags.some(tag => tag.path === view.path)) {
-          return
-        }
-        this.toLastView(visitedViews, view)
+      this.$baseConfirm(this.$t1('您确定要全部关闭吗？')).then(() => {
+        this.$store.dispatch('tagsView/delAllViews').then(({visitedViews}) => {
+          if (this.affixTags.some(tag => tag.path === view.path)) {
+            return
+          }
+          this.toLastView(visitedViews, view)
+        })
       })
     },
     toLastView(visitedViews, view) {

package/src/views/bd/setting/form_script/mixins/edit.js

@@ -14,7 +14,11 @@ modules = {
     formTemplate: Object,
     currentFormType: Object,
     readonly: Boolean,
-    otherFlag:Boolean
+    otherFlag:Boolean,
+    scriptType: {
+      type: Number,
+      default: 0
+    },
   },
   components: {formOplogTable, preformDialog, projectTagView, MenuKindDialog,otherAuthDialog},
   data() {
@@ -23,7 +27,7 @@ modules = {
       tabIndex: 'first',
       dataId: '',
       formScript: {
-        scriptType: 1,
+        scriptType: 0,
         enabled: true,
         formCode: null,
         menuKindCode: null,
@@ -48,11 +52,13 @@ modules = {
       this.dataId = this._dataId;
     } else {
       if (this.formTemplate) {
+        this.formScript.scriptType = 1;
         this.formScript.formCode = this.formTemplate.formCode;
         this.formScript.menuKindCode = this.formTemplate.menuKindCode;
         this.formScript.menuKindName = this.formTemplate.menuKindName;
         this.formScript.serviceName = this.formTemplate.serviceName;
       } else {
+        this.formScript.scriptType = this.scriptType;
         this.formScript.formCode = 'intf';
         this.formScript.menuKindName = this.currentFormType?.name || null;
         this.formScript.menuKindCode = this.currentFormType?.menuKindCode || null;