three-trees-ui 1.1.8 → 1.1.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "three-trees-ui",
-  "version": "1.1.8",
+  "version": "1.1.10",
   "publicPath": "/ui",
   "author": "hotent",
   "private": false,

package/packages/CustomDialog/src/main.vue

@@ -438,8 +438,12 @@
           this.$refs.customDialogRef.removeSelectOrg(item)
         }
       },
-      clear() {
+      async clear() {
         this.$emit('input', '')
+        if (this.isDialogShow === false) {
+          this.isDialogShow = true
+          await this.$nextTick()
+        }
         this.$refs.customDialogRef.clearAll()
         this.validateInput()
       },

package/src/mixins/templatePreview.js

@@ -2390,7 +2390,11 @@ export default {
         .then(() => {
           let s = []
           for (let i = 0; i < this.tableData.selectRows.length; i++) {
-            s.push(this.tableData.selectRows[i][this.templateInfo.pkField ? this.templateInfo.pkField : 'id_'])
+            s.push(
+              this.tableData.selectRows[i][
+                this.templateInfo.pkField ? this.templateInfo.pkField : 'id_'
+              ]
+            )
           }
           let data = {
             ids: s.join(','),
@@ -2566,16 +2570,26 @@ export default {
       }
       //TODO 如果是模块开发 全部已新窗口打开
       if (openType == 'new' || this.isJoinFlow) {
-        window.open(
-          this.$router.resolve({
+        if (this.$tabs) {
+          this.$router.push({
             path: path + '&isNewPage=true',
             query: {
               quitAfterSaving,
               customTitleName,
             },
-          }).href,
-          '_blank'
-        )
+          })
+        } else {
+          window.open(
+            this.$router.resolve({
+              path: path + '&isNewPage=true',
+              query: {
+                quitAfterSaving,
+                customTitleName,
+              },
+            }).href,
+            '_blank'
+          )
+        }
       } else if (openType === 'dialog' || isDataView) {
         this.$refs.templateFormDialog.showDialog({
           templateKey: this.templateInfo.alias,