tianheng-ui 0.0.94 → 0.0.96

package/package.json

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

package/packages/FormMaking/GenerateForm.vue

@@ -96,7 +96,7 @@ export default {
         return [];
       }
     },
-    client: String,
+    client: String
   },
   data() {
     return {
@@ -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,29 @@
     </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>
+        :preview-src-list="[widget.options.defaultValue]"
+        :lazy="widget.options.isLazy"
+      ></el-image> -->
+      <el-image
+        v-for="(item, index) in widget.options.defaultValue"
+        :key="index"
+        :style="{
+          width: widget.options.width,
+          height: widget.options.height,
+          borderRadius: widget.options.borderRadius
+        }"
+        :src="item.url"
+        :fit="widget.options.fit"
+        :preview-src-list="imagePreviewList"
+        :lazy="widget.options.isLazy"
+      ></el-image>
     </template>
 
     <template v-if="widget.type == 'upload'">
@@ -740,6 +757,13 @@ export default {
       } else {
         return this.widget.options.action;
       }
+    },
+    imagePreviewList() {
+      const list = [];
+      this.widget.options.defaultValue.forEach(item => {
+        list.push(item.url);
+      });
+      return list;
     }
   },
   created() {},
@@ -856,8 +880,7 @@ export default {
     // 获取数据，仅支持获取当前组件节点下的数据
     getData() {
       return this.models;
-    },
-
+    }
   }
 };
 </script>

package/packages/FormMaking/custom/config.js

@@ -457,9 +457,7 @@ export const basicComponents = [
     type: "image",
     icon: "icon-ic",
     options: {
-      defaultValue:
-        "https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg",
-      defaultValueArr: [
+      defaultValue: [
         {
           url:
             "https://fuss10.elemecdn.com/a/3f/3302e58f9a181d2509f3dc0fa68b0jpeg.jpeg"
@@ -473,7 +471,6 @@ export const basicComponents = [
             "https://fuss10.elemecdn.com/0/6f/e35ff375812e6b0020b6b4e8f9583jpeg.jpeg"
         }
       ],
-      remote: false,
       width: "",
       height: "200px",
       fit: "fill",
@@ -482,7 +479,8 @@ export const basicComponents = [
       errorSrc: "",
       isLoding: false,
       hidden: false,
-      hideLabel: false
+      hideLabel: false,
+      isLazy: true
     }
   },
   {

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

@@ -25,39 +25,26 @@
       </el-form-item>
 
       <el-form-item label="图片路径">
-        <div style="marginBottom:10px">
-          <el-radio-group 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>
+        <div
+          style="display: flex;"
+          v-for="(item, index) in widget.options.defaultValue"
+          :key="item.url"
+        >
+          <div style="width:80px;">地址{{ index + 1 }}：</div>
+          <el-input v-model="item.url"></el-input>
+          <el-button
+            style="padding: 8px;margin-left: 5px;"
+            type="danger"
+            icon="el-icon-minus"
+            size="mini"
+            circle
+            plain
+            @click="handleImageRemove(index)"
+          ></el-button>
         </div>
-        <div style="display: flex;" v-if="!widget.options.remote">
-          <div style="width:80px;">地址：</div>
-          <el-input v-model="widget.options.defaultValue"></el-input>
-        </div>
-
-        <div v-if="widget.options.remote">
-          <div
-            style="display: flex;"
-            v-for="(item, index) in widget.options.defaultValueArr"
-            :key="item.url"
-          >
-            <div style="width:80px;">地址：{{ index + 1 }}</div>
-            <el-input v-model="item.url"></el-input>
-
-            <el-button
-              style="padding: 8px;margin-left: 5px;"
-              type="danger"
-              icon="el-icon-minus"
-              circle
-              plain
-              @click="handleImageRemove(index)"
-            ></el-button>
-          </div>
 
-          <div style="margin-left: 22px;">
-            <el-button type="text" @click="handleAddImage">添加选项</el-button>
-          </div>
+        <div style="margin-left: 22px;">
+          <el-button type="text" @click="handleAddImage">添加选项</el-button>
         </div>
       </el-form-item>
 
@@ -111,7 +98,10 @@
       <el-form-item label="操作属性">
         <el-checkbox v-model="widget.options.hidden">隐藏组件</el-checkbox>
         <el-checkbox v-model="widget.options.hideLabel">隐藏标签</el-checkbox>
-        <el-checkbox v-model="widget.options.isLoding">加载中</el-checkbox>
+        <el-checkbox v-model="widget.options.isLoding"
+          >开启加载动画</el-checkbox
+        >
+        <el-checkbox v-model="widget.options.isLazy">开启懒加载</el-checkbox>
       </el-form-item>
     </el-form>
   </div>
@@ -136,10 +126,10 @@ export default {
       const obj = {
         url: ""
       };
-      this.widget.options.defaultValueArr.push(obj);
+      this.widget.options.defaultValue.push(obj);
     },
     handleImageRemove(index) {
-      this.widget.options.defaultValueArr.splice(index, 1);
+      this.widget.options.defaultValue.splice(index, 1);
     }
   }
 };

package/packages/FormMaking/custom/items/image.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <!-- <div>
     <th-image
       v-if="!widget.options.remote"
       :src="widget.options.defaultValue"
@@ -26,6 +26,17 @@
         :is-loding="widget.options.isLoding"
       ></th-image>
     </div>
+  </div> -->
+  <div>
+    <el-image
+      v-for="(item, index) in widget.options.defaultValue"
+      :key="index"
+      :style="selfStyle"
+      :src="item.url"
+      :fit="widget.options.fit"
+      :preview-src-list="widget.options.defaultValue"
+      :lazy="widget.options.isLazy"
+    ></el-image>
   </div>
 </template>
 
@@ -35,7 +46,16 @@ import ThImage from "ui/Image/index.vue";
 
 export default {
   components: { ThImage },
-  mixins: [itemsComponent]
+  mixins: [itemsComponent],
+  computed: {
+    selfStyle() {
+      const style = { display: "inline-block" };
+      style.width = this.widget.options.width;
+      style.height = this.widget.options.height;
+      style.borderRadius = `${this.widget.options.borderRadius || 0}`;
+      return style;
+    }
+  }
 };
 </script>
 

package/packages/TableMaking/generateTable.vue

@@ -113,7 +113,7 @@ export default {
       default: () => {
         return {
           page: {
-            url: "/viewManage/getViewManageDetailById",
+            url: "/preview/getViewManageDetailById",
             method: "POST",
             params: {}
           },
@@ -218,15 +218,17 @@ export default {
     // 初始化组件配置
     initConfig() {
       this.initData();
-      const info = sessionStorage.getItem("th_oauth_info");
-      if (info) {
-        this.requestConfigData();
-      } else if (this.oauthConfig.token) {
+
+      if (this.oauthConfig.token) {
         const oauthInfo = {
           token: this.oauthConfig.token,
           baseUrl: this.oauthConfig.baseUrl
         };
         sessionStorage.setItem("th_oauth_info", JSON.stringify(oauthInfo));
+      }
+
+      const info = sessionStorage.getItem("th_oauth_info");
+      if (info) {
         this.requestConfigData();
       } else if (this.oauthConfig.oauth) {
         // 模拟授权认证流程
@@ -261,7 +263,7 @@ export default {
         data: { ...this.network.page.params, moduleId: this.id }
       })
         .then(res => {
-          const resultData = res.data.viewManage;
+          const resultData = res.data;
           if (!resultData) {
             this.tableJson = null;
             return;