tianheng-ui 0.0.93 → 0.0.95

package/package.json

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

package/packages/FormMaking/GenerateForm.vue

@@ -116,7 +116,7 @@ export default {
   },
   watch: {
     data(val) {
-      this.formJson = val;
+      this.setJSON(val);
     },
     formJson: {
       handler(val) {

package/packages/FormMaking/GenerateFormItem.vue

@@ -372,12 +372,15 @@
     </template>
 
     <template v-if="widget.type == 'image'">
-      <th-image
+      <el-image
+        :style="{
+          width: widget.options.width,
+          height: widget.options.height
+        }"
         :src="widget.options.defaultValue"
-        :height="widget.options.height"
-        :width="widget.options.width"
         :fit="widget.options.fit"
-      ></th-image>
+        lazy
+      ></el-image>
     </template>
 
     <template v-if="widget.type == 'upload'">
@@ -802,6 +805,7 @@ export default {
     // 支撑 JavaScript 动态编译
     handleEventAction(key) {
       if (!key) return;
+
       const eventScript = this.config.eventScript;
       for (let i = 0; i < eventScript.length; i++) {
         const element = eventScript[i];

package/packages/FormMaking/custom/configs/button.vue

@@ -88,14 +88,14 @@
           <span class="value" @click="handleEventsShow">配置</span>
         </div>
 
-        <el-radio-group
+        <!-- <el-radio-group
           style="margin-bottom:10px;"
           v-model="widget.options.remote"
           size="mini"
         >
           <el-radio-button :label="false">自定义事件</el-radio-button>
           <el-radio-button :label="true">绑定接口</el-radio-button>
-        </el-radio-group>
+        </el-radio-group> -->
 
         <div v-show="widget.options.remote">
           <el-select

package/packages/FormMaking/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="fm-container">
-    <el-container v-if="widgetFormData.config" class="container-box">
+    <el-container v-if="Object.keys(widgetFormData.config).length" class="container-box">
       <el-main>
         <el-container>
           <!-- 左侧字段区 -->
@@ -400,7 +400,7 @@ export default {
     data: {
       type: Object,
       default: () => {
-        return {};
+        return { config: {}, list: [] };
       }
     },
     oauthConfig: {
@@ -547,8 +547,13 @@ export default {
       this.baseConfig,
       this.widgetFormData.config
     );
-    if (this.widgetFormData && this.widgetFormData.list.length) {
+    if (
+      this.widgetFormData.list &&
+      this.widgetFormData.list.length
+    ) {
       this.widgetFormSelect = this.widgetFormData.list[0];
+    }else {
+      this.widgetFormData.list = []
     }
   },
   mounted() {},

package/packages/TableMaking/generateTable.vue

@@ -236,7 +236,10 @@ export default {
           data: this.oauthConfig.oauth.params,
           headers: this.oauthConfig.oauth.headers
         }).then(res => {
-          const oauthInfo = { token: res.data, baseUrl: this.oauthConfig.baseUrl };
+          const oauthInfo = {
+            token: res.data,
+            baseUrl: this.oauthConfig.baseUrl
+          };
           sessionStorage.setItem("th_oauth_info", JSON.stringify(oauthInfo));
           // this.axios.defaults.baseURL = this.oauthConfig.baseUrl;
           this.requestConfigData();
@@ -290,6 +293,7 @@ export default {
             label: "操作",
             hide: true,
             slot: "action",
+            fixed: "right",
             actions: []
           };
 

package/packages/TableMaking/widgetConfig.vue

@@ -109,7 +109,18 @@
               </el-select>
             </el-form-item>
           </el-collapse-item> -->
-          <el-collapse-item title="按钮配置" name="3">
+          <el-collapse-item name="3">
+            <template slot="title">
+              <div class="collapse-title">
+                <div>按钮配置</div>
+                <div
+                  class="collapse-title-action"
+                  @click.stop="handleActionConfig"
+                >
+                  配置
+                </div>
+              </div>
+            </template>
             <el-form-item label-width="90px">
               <el-checkbox v-model="tableConfig.tools.add.show" slot="label"
                 >新增</el-checkbox
@@ -176,11 +187,6 @@
               ></el-input>
             </el-form-item>
           </el-collapse-item>
-          <!-- <el-collapse-item title="权限设置" name="4">
-            <div>
-              与现实生活一致：与现实生活的流程、逻辑保持一致，遵循用户习惯的语言和概念；
-            </div>
-          </el-collapse-item> -->
         </el-collapse>
       </el-form>
     </div>
@@ -297,6 +303,7 @@ export default {
       this.table.isIndeterminate = false;
       this.handleChange();
     },
+    handleActionConfig() {},
     getJson() {
       return JSON.parse(JSON.stringify(this.tableConfig));
     }
@@ -346,6 +353,21 @@ export default {
 
   .tableConfig {
     height: calc(100% - 45px);
+
+    .collapse-title {
+      display: flex;
+      justify-content: space-between;
+      width: 100%;
+      padding-right: 10px;
+
+      .collapse-title-action {
+        transition: 0.25s;
+      }
+
+      .collapse-title-action:hover {
+        color: #409eff;
+      }
+    }
   }
 }
 </style>