tianheng-ui 0.0.70 → 0.0.72

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tianheng-ui",
   "description": "A Vue.js project",
-  "version": "0.0.70",
+  "version": "0.0.72",
   "author": "shu lang <403732931@qq.com>",
   "license": "MIT",
   "private": false,

package/packages/Dialog/index.vue

@@ -1,29 +1,35 @@
 <template>
   <el-dialog
     class="th-dialog"
+    :class="[customClass]"
     :visible.sync="visible"
+    :width="width"
+    :top="top"
     :fullscreen="dialogFullscreen"
-    :close-on-click-modal="false"
+    :close-on-click-modal="closeOnClickModal"
+    :close-on-press-escape="closeOnPressEscape"
     :show-close="false"
-    :before-close="handleClose"
+    :modal="modal"
+    :modal-append-to-body="modalAppendToBody"
+    :append-to-body="appendToBody"
+    :before-close="handleBeforeClose"
+    :destroy-on-close="destroyOnClose"
   >
-    <div slot="title">
-      <div slot="title" class="th-dialog__header">
-        <div class="th-dialog__title">{{ title }}</div>
-        <div class="th-dialog__action">
-          <i
-            v-if="showFullscreen"
-            class="th-dialog__action_item"
-            :class="fullscreenIcon"
-            @click="handleFullscreenChange"
-          ></i>
-          <i
-            v-if="showClose"
-            class="th-dialog__action_item "
-            :class="closeIcon"
-            @click="handleClose"
-          ></i>
-        </div>
+    <div slot="title" class="th-dialog__header">
+      <div class="th-dialog__title">{{ title }}</div>
+      <div class="th-dialog__action">
+        <i
+          v-if="showFullscreen"
+          class="th-dialog__action_item"
+          :class="fullscreenIcon"
+          @click="handleFullscreenChange"
+        ></i>
+        <i
+          v-if="showClose"
+          class="th-dialog__action_item "
+          :class="closeIcon"
+          @click="handleBeforeClose"
+        ></i>
       </div>
     </div>
     <slot />
@@ -57,6 +63,17 @@ export default {
     visible: Boolean,
     loading: Boolean,
     title: { type: String, default: "" },
+    width: { type: String, default: "800px" },
+    fullscreen: { type: Boolean, default: false },
+    top: { type: String, default: "15vh" },
+    modal: { type: Boolean, default: true },
+    modalAppendToBody: { type: Boolean, default: true },
+    appendToBody: { type: Boolean, default: false },
+    customClass: String,
+    closeOnClickModal: { type: Boolean, default: false },
+    closeOnPressEscape: { type: Boolean, default: false },
+    beforeClose: Function,
+    destroyOnClose: { type: Boolean, default: false },
 
     showAffirm: { type: Boolean, default: true },
     affirmText: { type: String, default: "确 认" },
@@ -67,7 +84,6 @@ export default {
     showClose: { type: Boolean, default: true },
     closeIcon: { type: String, default: "el-icon-close" },
 
-    fullscreen: { type: Boolean, default: false },
     showFullscreen: { type: Boolean, default: true },
     fullscreenIcon: { type: String, default: "el-icon-full-screen" },
 
@@ -89,6 +105,16 @@ export default {
       this.$emit("input", !this.visible);
       this.$emit("on-close");
     },
+    handleBeforeClose(done) {
+      if (this.beforeClose) {
+        const callback = () => {
+          this.handleClose();
+        };
+        this.beforeClose(callback);
+      } else {
+        this.handleClose();
+      }
+    },
     handleAffirm() {
       this.$emit("on-affirm");
     },

package/packages/FormMaking/Container.vue

@@ -112,7 +112,7 @@
               </div>
               <slot name="action"> </slot>
               <el-popover
-                placement="top"
+                placement="bottom"
                 trigger="hover"
                 style="margin:0 10px;"
               >
@@ -230,6 +230,7 @@
           <th-dialog
             title="导入JSON"
             :visible="dialog.import.visible"
+            :modal-append-to-body="false"
             @on-close="dialog.import.visible = false"
             @on-affirm="handleUploadJson"
             @on-fullscreen="$refs.valueCodeEditor.resize()"
@@ -247,7 +248,8 @@
           <!-- 预览 -->
           <th-dialog
             title="预览"
-            :visible="dialog.preview.visible"
+            v-model="dialog.preview.visible"
+            :modal-append-to-body="false"
             @on-close="dialog.preview.visible = false"
           >
             <generate-form
@@ -278,6 +280,7 @@
           <th-dialog
             title="获取数据"
             :visible="dialog.data.visible"
+            :modal-append-to-body="false"
             @on-close="dialog.data.visible = false"
             @on-fullscreen="$refs.dataCodeEditor.resize()"
           >
@@ -300,6 +303,7 @@
           <th-dialog
             title="生成JSON"
             :visible="dialog.config.visible"
+            :modal-append-to-body="false"
             @on-close="dialog.config.visible = false"
             @on-fullscreen="$refs.jsonCodeEditor.resize()"
           >
@@ -324,6 +328,7 @@
             title="生成代码"
             :visible="dialog.code.visible"
             :showFooter="false"
+            :modal-append-to-body="false"
             @on-close="dialog.code.visible = false"
             @on-fullscreen="handleDialogFullscreen"
           >

package/packages/VueEditor/index.vue

@@ -28,9 +28,10 @@ export default {
       deep: true
     },
     value(val) {
-      this.data = val
+      this.data = val;
     }
-  }
+  },
+  methods: {}
 };
 </script>