three-trees-ui 1.0.75 → 1.0.77

package/package.json

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

package/packages/TemplateFormDialog/src/main.vue

@@ -10,8 +10,8 @@
   >
     <span>
       <ht-template-form
-        class="template-form-dialog_form"
         v-if="dialogVisible"
+        class="template-form-dialog_form"
         :template-key="templateKey"
         :is-share="false"
         open-type="dialog"
@@ -77,6 +77,11 @@
           margin-right: 10px;
         }
         .template-form-dialog_form {
+          .el-form {
+            .el-main {
+              padding: 20px;
+            }
+          }
           width: 100%;
           padding: 0;
           .base-main_box {

package/src/mixins/onlineSubtable.js

@@ -16,7 +16,7 @@ export default {
     // 子表前端分页过滤器
     pagingSubData() {
       const me = this
-      return function(datapath) {
+      return function (datapath) {
         // 通过子表数据路径获取分页数据
         return SubPagination.pagingByPath(datapath, me)
       }
@@ -257,7 +257,7 @@ export default {
       let exp = calc.mathExp
       if (!exp) return null
       var reg = /([\[|\{]).*?\((.*?)\)[\}|\]]/g
-      exp = exp.replace(reg, function() {
+      exp = exp.replace(reg, function () {
         var symbol = arguments[1],
           name = arguments[2]
         const prop = name.split('.')[1]
@@ -368,7 +368,7 @@ export default {
       if (this.isPrint) {
         this.$router.go(-1)
       }
-      setTimeout(function() {
+      setTimeout(function () {
         location.reload()
       }, 200)
     },
@@ -412,6 +412,12 @@ export default {
       if (newOne.sub_row_readonly) {
         delete newOne.sub_row_readonly
       }
+      if (newOne.sub_row_copy) {
+        delete newOne.sub_row_copy
+      }
+      if (newOne.sub_row_delete) {
+        delete newOne.sub_row_delete
+      }
       //有孙表时，删除孙表id_
       for (let key in newOne) {
         if (key.startsWith('sub_') && Array.isArray(newOne[key])) {
@@ -508,13 +514,14 @@ export default {
       return { '--headerBgColor': color ? color : '#f4f4f4' }
     },
     guid() {
-      return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(
-        c
-      ) {
-        var r = (Math.random() * 16) | 0,
-          v = c == 'x' ? r : (r & 0x3) | 0x8
-        return v.toString(16)
-      })
+      return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(
+        /[xy]/g,
+        function (c) {
+          var r = (Math.random() * 16) | 0,
+            v = c == 'x' ? r : (r & 0x3) | 0x8
+          return v.toString(16)
+        }
+      )
     },
     //孙表默认值回填
     addSunTab(subTabPath, index) {
@@ -791,17 +798,15 @@ export default {
             if (conf.code) {
               const codePath = conf.code.split('.')
               if (!this.data[paths[0]][paths[1]][0][codePath[2]]) {
-                this.data[paths[0]][paths[1]][0][
-                  codePath[2]
-                ] = this.fillOrg.code
+                this.data[paths[0]][paths[1]][0][codePath[2]] =
+                  this.fillOrg.code
               }
             }
             if (conf.name) {
               const namePath = conf.name.split('.')
               if (!this.data[paths[0]][paths[1]][0][namePath[2]]) {
-                this.data[paths[0]][paths[1]][0][
-                  namePath[2]
-                ] = this.fillOrg.name
+                this.data[paths[0]][paths[1]][0][namePath[2]] =
+                  this.fillOrg.name
               }
             }
           }

package/src/mixins/templatePreview.js

@@ -2221,7 +2221,7 @@ export default {
         path = url + startFlowStr + dataUrl
       }
       //TODO 如果是模块开发 全部已新窗口打开
-      if (openType == 'new' || this.isJoinFlow || isDataView) {
+      if (openType == 'new' || this.isJoinFlow) {
         window.open(
           this.$router.resolve({
             path: path + '&isNewPage=true',
@@ -2232,7 +2232,7 @@ export default {
           }).href,
           '_blank'
         )
-      } else if (openType === 'dialog') {
+      } else if (openType === 'dialog' || isDataView) {
         this.$refs.templateFormDialog.showDialog({
           templateKey: this.templateInfo.alias,
           action,