tianheng-ui 0.0.71 → 0.0.73

package/package.json

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

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"
           >
@@ -363,8 +368,6 @@ import WidgetConfig from "./WidgetConfig";
 import FormConfig from "./FormConfig";
 import WidgetForm from "./WidgetForm";
 import GenerateForm from "./GenerateForm";
-import ThDialog from "ui/Dialog/index.vue";
-import ThCodeEditor from "ui/CodeEditor/index.vue";
 import {
   basicComponents,
   advanceComponents,
@@ -383,8 +386,6 @@ export default {
     FormConfig,
     WidgetForm,
     GenerateForm,
-    ThDialog,
-    ThCodeEditor
   },
   props: {
     preview: {

package/packages/FormMaking/WidgetConfig.vue

@@ -1,5 +1,5 @@
 <template>
-  <div v-if="show">
+  <div class="widgetConfig" v-if="show">
     <component
       :widget="data"
       :config="config"
@@ -12,6 +12,7 @@
     <th-dialog
       title="动作设置"
       v-model="eventsDialog.visible"
+      :modal-append-to-body="false"
       @on-fullscreen="$refs.codeEditor && $refs.codeEditor.resize()"
     >
       <div class="eventsSetting">
@@ -347,127 +348,125 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.remoteApis {
-  width: 100%;
-  margin-bottom: 6px;
+.widgetConfig {
+  .remoteApis {
+    width: 100%;
+    margin-bottom: 6px;
 
-  /deep/ .el-input--prefix .el-input__inner {
-    padding-left: 85px;
-  }
+    /deep/ .el-input--prefix .el-input__inner {
+      padding-left: 85px;
+    }
 
-  /deep/ .el-input__prefix {
-    left: 0;
-    width: 75px;
-    color: #999;
+    /deep/ .el-input__prefix {
+      left: 0;
+      width: 75px;
+      color: #999;
+    }
   }
-}
 
-/deep/ .el-form-item__label {
-  width: 100%;
-}
-
-.el-dialog__body {
-  padding: 20px;
-}
+  .el-dialog__body {
+    padding: 20px;
+  }
 
-.eventsSetting {
-  height: 100%;
-  display: flex;
-  border: 1px solid #eee;
+  .eventsSetting {
+    height: 100%;
+    display: flex;
+    border: 1px solid #eee;
 
-  .list {
-    width: 270px;
-    min-height: 430px;
-    overflow-y: overlay;
-    border-right: 1px solid #eee;
+    .list {
+      width: 270px;
+      min-height: 430px;
+      overflow-y: overlay;
+      border-right: 1px solid #eee;
 
-    .list-header {
-      position: sticky;
-      top: 0;
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      padding: 5px;
-      line-height: 30px;
-      border-bottom: 1px solid #eee;
-      background: #f2f6fc;
-    }
+      .list-header {
+        position: sticky;
+        top: 0;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        padding: 5px;
+        line-height: 30px;
+        border-bottom: 1px solid #eee;
+        background: #f2f6fc;
+      }
 
-    .list-item {
-      display: flex;
-      // align-items: center;
-      margin: 5px;
-      padding: 10px;
-      border-radius: 3px;
-      border: 1px solid #dcdfe6;
-      transition: 0.25s;
+      .list-item {
+        display: flex;
+        // align-items: center;
+        margin: 5px;
+        padding: 10px;
+        border-radius: 3px;
+        border: 1px solid #dcdfe6;
+        transition: 0.25s;
 
-      .list-item-title {
-        color: var(--th-green);
-      }
-      .list-item-value {
-        flex: 1;
-        padding: 0 5px;
-      }
-      i {
-        cursor: pointer;
+        .list-item-title {
+          color: var(--th-green);
+        }
+        .list-item-value {
+          flex: 1;
+          padding: 0 5px;
+        }
+        i {
+          cursor: pointer;
+        }
       }
-    }
 
-    .list-item:hover {
-      background-color: #f2f6fc;
+      .list-item:hover {
+        background-color: #f2f6fc;
+      }
     }
-  }
 
-  .detail {
-    flex: 1;
-    padding: 10px;
+    .detail {
+      flex: 1;
+      padding: 10px;
 
-    > div:nth-child(1) {
-      position: relative;
-      display: flex;
-      align-items: center;
-      margin-bottom: 20px;
-      padding-left: 10px;
+      > div:nth-child(1) {
+        position: relative;
+        display: flex;
+        align-items: center;
+        margin-bottom: 20px;
+        padding-left: 10px;
 
-      /deep/ .el-input {
-        flex: 1;
-        margin-left: 10px;
+        /deep/ .el-input {
+          flex: 1;
+          margin-left: 10px;
+        }
       }
-    }
-
-    > div:nth-child(1)::after {
-      content: "*";
-      position: absolute;
-      left: 0;
-      color: red;
-    }
 
-    > div:nth-child(2) {
-      height: calc(100% - 48px);
-      > div:nth-child(1) {
-        margin-bottom: 10px;
-        color: var(--th-blue);
+      > div:nth-child(1)::after {
+        content: "*";
+        position: absolute;
+        left: 0;
+        color: red;
       }
 
-      > div:nth-child(3) {
-        margin-top: 10px;
-        color: var(--th-blue);
+      > div:nth-child(2) {
+        height: calc(100% - 48px);
+        > div:nth-child(1) {
+          margin-bottom: 10px;
+          color: var(--th-blue);
+        }
+
+        > div:nth-child(3) {
+          margin-top: 10px;
+          color: var(--th-blue);
+        }
       }
     }
   }
-}
-.selectableRange {
-  width: 100%;
+  .selectableRange {
+    width: 100%;
 
-  /deep/ .el-range-separator {
-    width: 20px;
+    /deep/ .el-range-separator {
+      width: 20px;
+    }
   }
-}
 
-.functions {
-  span {
-    margin: 0 5px;
+  .functions {
+    span {
+      margin: 0 5px;
+    }
   }
 }
 </style>

package/packages/FormMaking/index.js

@@ -1,6 +1,6 @@
 import "normalize.css/normalize.css";
 import "./iconfont/iconfont.css";
-import "./styles/cover.scss";
+// import "./styles/cover.scss";
 import "./styles/index.scss";
 
 import FormMaking from "./Container.vue";

package/packages/FormMaking/making.js

@@ -1,6 +1,6 @@
 import "normalize.css/normalize.css";
 import "./iconfont/iconfont.css";
-import "./styles/cover.scss";
+// import "./styles/cover.scss";
 import "./styles/index.scss";
 import FormMaking from "./Container.vue";
 FormMaking.install = function(Vue) {

package/packages/FormMaking/styles/index.scss

@@ -733,6 +733,10 @@ $primary-background-color: #ecf5ff;
       padding: 5px;
     }
   }
+
+  .el-form-item__label {
+    width: 100%;
+  }
 }
 
 .widget-actions {