tianheng-ui 0.1.69 → 0.1.70

package/packages/FormMaking/index.vue

@@ -13,24 +13,20 @@
           name="group-basic"
         >
           <draggable
-            tag="ul"
             :list="getBasicComponents"
             v-bind="{
               group: { name: 'people', pull: 'clone', put: false },
               sort: false
             }"
           >
-            <li
+            <div
               v-for="(item, index) in getBasicComponents"
-              class="fields-label"
-              :class="[[item.type]]"
+              :class="`fields-label ${item.type}`"
               :key="index"
             >
-              <a>
-                <i class="icon iconfont" :class="item.icon"></i>
-                <span>{{ item.name }}</span>
-              </a>
-            </li>
+              <i class="iconfont" :class="item.icon"></i>
+              <span>{{ item.name }}</span>
+            </div>
           </draggable>
         </el-collapse-item>
         <el-collapse-item
@@ -39,24 +35,20 @@
           name="group-advance"
         >
           <draggable
-            tag="ul"
             :list="getAdvanceComponents"
             v-bind="{
               group: { name: 'people', pull: 'clone', put: false },
               sort: false
             }"
           >
-            <li
+            <div
               v-for="(item, index) in getAdvanceComponents"
-              class="fields-label no-put"
-              :class="[[item.type]]"
+              :class="`fields-label ${item.type} no-put`"
               :key="index"
             >
-              <a>
-                <i class="icon iconfont" :class="item.icon"></i>
-                <span>{{ item.name }}</span>
-              </a>
-            </li>
+              <i class="iconfont" :class="item.icon"></i>
+              <span>{{ item.name }}</span>
+            </div>
           </draggable>
         </el-collapse-item>
         <el-collapse-item
@@ -65,27 +57,23 @@
           name="group-layout"
         >
           <draggable
-            tag="ul"
             :list="getLayoutComponents"
             v-bind="{
               group: { name: 'people', pull: 'clone', put: false },
               sort: false
             }"
           >
-            <li
+            <div
               v-for="(item, index) in getLayoutComponents"
-              class="fields-label"
-              :class="{
-                'no-put': ['alliance'].includes(item.type),
-                [item.type]: true
-              }"
+              :class="
+                `fields-label ${item.type} 
+                ${['alliance'].includes(item.type) ? 'no-put' : ''}`
+              "
               :key="index"
             >
-              <a>
-                <i class="icon iconfont" :class="item.icon"></i>
-                <span>{{ item.name }}</span>
-              </a>
-            </li>
+              <i class="iconfont" :class="item.icon"></i>
+              <span>{{ item.name }}</span>
+            </div>
           </draggable>
         </el-collapse-item>
         <el-collapse-item
@@ -94,31 +82,27 @@
           name="group-business"
         >
           <draggable
-            tag="ul"
             :list="getBusinessComponents"
             v-bind="{
               group: { name: 'people', pull: 'clone', put: false },
               sort: false
             }"
           >
-            <li
+            <div
               v-for="(item, index) in getBusinessComponents"
-              class="fields-label"
-              :class="[[item.type]]"
+              :class="`fields-label ${item.type}`"
               :key="index"
             >
-              <a>
-                <i class="icon iconfont" :class="item.icon"></i>
-                <span>{{ item.name }}</span>
-              </a>
-            </li>
+              <i class="iconfont" :class="item.icon"></i>
+              <span>{{ item.name }}</span>
+            </div>
           </draggable>
         </el-collapse-item>
       </el-collapse>
     </div>
 
     <!-- 中间视图区 -->
-    <div class="formMaking-drawing th-fiex_content">
+    <div class="th-fiex_content">
       <!-- 操作区 -->
       <widget-tools
         :baseConfig="baseConfig"
@@ -154,6 +138,10 @@
       >
       </widget-config>
     </div>
+
+    <!-- <th-dialog v-model="showGuide" title="配置" :showFooter="false">
+      <widget-guide></widget-guide>
+    </th-dialog> -->
   </div>
 </template>
 
@@ -163,6 +151,7 @@ import WidgetConfig from "./WidgetConfig";
 import WidgetTools from "./WidgetTools";
 import WidgetForm from "./WidgetForm";
 import GenerateForm from "./GenerateForm";
+import WidgetGuide from "./WidgetGuide.vue";
 import {
   basicComponents,
   advanceComponents,
@@ -181,7 +170,8 @@ export default {
     WidgetConfig,
     WidgetTools,
     WidgetForm,
-    GenerateForm
+    GenerateForm,
+    WidgetGuide
   },
   props: {
     config: Object,
@@ -229,7 +219,7 @@ export default {
     },
     advanceFields: {
       type: Array,
-      default: () => ["table", "tableH5", "list", "tabs"]
+      default: () => ["table", "list", "tabs"]
     },
     layoutFields: {
       type: Array,
@@ -238,7 +228,8 @@ export default {
     businessFields: {
       type: Array,
       default: () => ["blank", "descriptions", "workflow"]
-    }
+    },
+    guide: Boolean
   },
   data() {
     this.basicComponents = basicComponents;
@@ -256,7 +247,8 @@ export default {
         "group-advance",
         "group-layout",
         "group-business"
-      ]
+      ],
+      showGuide: this.guide
     };
   },
   computed: {
@@ -292,6 +284,12 @@ export default {
     },
     apiOptions(val) {
       this.handleNetworkConfig(true);
+    },
+    guide(val) {
+      this.showGuide = val;
+    },
+    showGuide(val) {
+      this.$emit("update:guide", val);
     }
   },
   created() {
@@ -353,7 +351,7 @@ export default {
             item.options.columns.forEach(e => {
               initList(e.list);
             });
-          } else if (item.type === "table" || item.type === "tableH5") {
+          } else if (item.type === "table" || item.type === "list") {
             initList(item.options.columns);
           } else if (item.type === "workflow") {
             initList(item.options.buttons);
@@ -497,14 +495,8 @@ export default {
       padding: 0 15px;
       z-index: 99;
     }
-    ul {
-      position: relative;
-      overflow: hidden;
-      padding: 5px;
-      margin: 0;
-    }
     .fields-label {
-      margin: 0 3px;
+      margin: 2px 3px;
       width: calc(50% - 6px);
       line-height: 26px;
       font-size: 12px;
@@ -513,9 +505,23 @@ export default {
       overflow: hidden;
       text-overflow: ellipsis;
       white-space: nowrap;
+      background: #f4f6fc;
       border: 1px solid #f4f6fc;
       box-sizing: border-box;
       transition: 0.25s;
+      cursor: move;
+
+      i {
+        margin-right: 6px;
+        margin-left: 8px;
+        font-size: 14px;
+        display: inline-block;
+        vertical-align: middle;
+      }
+      span {
+        display: inline-block;
+        vertical-align: middle;
+      }
 
       &:hover {
         color: $color-parimary-active !important;
@@ -525,32 +531,8 @@ export default {
           color: $color-parimary-active !important;
         }
       }
-
-      & > a {
-        color: #333;
-        display: block;
-        cursor: move;
-        background: #f4f6fc;
-        border: 1px solid #f4f6fc;
-        transition: 0.25s;
-
-        .icon {
-          margin-right: 6px;
-          margin-left: 8px;
-          font-size: 14px;
-          display: inline-block;
-          vertical-align: middle;
-        }
-
-        span {
-          display: inline-block;
-          vertical-align: middle;
-        }
-      }
     }
   }
-  .formMaking-drawing {
-  }
 }
 </style>
 
@@ -562,5 +544,9 @@ export default {
     line-height: 40px;
     background-color: #f5f7f9;
   }
+  .el-collapse-item__content {
+    padding: 2px 3px;
+    line-height: normal;
+  }
 }
 </style>

package/packages/FormMaking/styles/index.scss

@@ -66,7 +66,7 @@
     overflow: hidden;
     content: "";
     // 隐藏内容
-    a {
+    i {
       display: none;
     }
   }

package/packages/TableMaking/index.vue

@@ -22,7 +22,14 @@
         ref="configRef"
       ></widget-config>
     </div>
-    <!-- <widget-guide :visible="true"></widget-guide> -->
+
+    <th-dialog v-model="showGuide" title="引导配置" :showFooter="false">
+      <widget-guide
+        :config="tableConfig"
+        :apiOptions="apiOptions"
+        @save="showGuide = false"
+      ></widget-guide>
+    </th-dialog>
   </div>
 </template>
 
@@ -79,12 +86,14 @@ export default {
         "generateCode",
         "generateJson"
       ]
-    }
+    },
+    guide: Boolean
   },
   data() {
     this.baseConfig = deepClone(baseConfig);
     return {
-      tableConfig: this.baseConfig
+      tableConfig: this.baseConfig,
+      showGuide: this.guide
     };
   },
   watch: {
@@ -94,6 +103,12 @@ export default {
     config(val) {
       this.tableConfig = Object.assign(this.baseConfig, val);
       this.handleNetworkConfig();
+    },
+    guide(val) {
+      this.showGuide = val;
+    },
+    showGuide(val) {
+      this.$emit("update:guide", val);
     }
   },
   mounted() {

package/packages/TableMaking/widgetGuide.vue

@@ -1,26 +1,107 @@
 <template>
-  <div v-show="show" class="widgetGuide">
-    <div class="box">
-      <div class="header"></div>
-      <div class="content">
-        <div>你好</div>
-        <div>让我们来了解一些基本信息</div>
-      </div>
-      <div class="footer th-is_border_top">
-        <div></div>
-        <div class="stepView">
-          <el-button
-            :disabled="step === 0"
-            type="primary"
-            icon="el-icon-back"
-            size="small"
-            @click="handleBack"
-            >上一步</el-button
-          >
-          <el-button type="primary" size="small" @click="handleNext"
-            >下一步<i class="el-icon-right el-icon--right"></i
-          ></el-button>
+  <div class="widgetGuide">
+    <el-steps :active="step" finish-status="success" simple>
+      <el-step title="列表配置" icon="el-icon-s-operation" description="">
+      </el-step>
+      <!-- <el-step
+        title="字段配置"
+        icon="el-icon-c-scale-to-original"
+        description=""
+      ></el-step> -->
+      <el-step title="按钮配置" icon="el-icon-set-up" description=""></el-step>
+    </el-steps>
+    <div class="content">
+      <el-form :model="config" label-width="80px" size="small">
+        <div v-show="step === 0">
+          <el-form-item size="small">
+            <el-tooltip
+              slot="label"
+              effect="light"
+              content="字段的配置方式"
+              placement="top"
+            >
+              <span style="color: #409EFF;">字段类型</span>
+            </el-tooltip>
+            <el-radio-group v-model="config.table.fields.type">
+              <el-radio-button label="custom" disabled>自定义</el-radio-button>
+              <el-radio-button label="api">接口导入</el-radio-button>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item>
+            <el-tooltip
+              slot="label"
+              effect="light"
+              content="开启后，选择数据接口会触发 remote-params 回调，用于从服务器查询字段"
+              placement="top"
+            >
+              <span style="color: #409EFF;">远程字段</span>
+            </el-tooltip>
+            <el-switch v-model="config.table.fields.remote"> </el-switch>
+          </el-form-item>
+          <el-form-item>
+            <el-tooltip
+              slot="label"
+              effect="light"
+              content="列表初始化完成后，调用该接口获取列表数据"
+              placement="top"
+            >
+              <span style="color: #409EFF;">列表接口</span>
+            </el-tooltip>
+            <el-select
+              v-model="config.table.mounted.api"
+              style="width:100%"
+              clearable
+              placeholder="请选择"
+              no-data-text="暂无接口，请前往【接口模块】创建"
+              filterable
+            >
+              <el-option
+                v-for="item in apiOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="列表名称">
+            <el-input
+              v-model="config.table.title"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+        </div>
+        <div v-show="step === 1">
+          <el-form-item label="">
+            <div v-for="item in Object.values(config.tools)" :key="item.type">
+              <el-checkbox v-model="item.show" :label="item.name"></el-checkbox>
+            </div>
+          </el-form-item>
         </div>
+      </el-form>
+    </div>
+    <div class="footer">
+      <div></div>
+      <div class="stepView">
+        <el-button
+          type="primary"
+          icon="el-icon-back"
+          size="small"
+          :disabled="step === 0"
+          @click="handleBack"
+          >上一步</el-button
+        >
+        <el-button
+          v-if="step !== 1"
+          type="primary"
+          size="small"
+          @click="handleNext"
+        >
+          下一步<i class="el-icon-right el-icon--right"></i>
+        </el-button>
+        <el-button v-else type="success" size="small" @click="handleSave">
+          完&nbsp;&nbsp;&nbsp;成<i class="el-icon-finished el-icon--right"></i>
+        </el-button>
       </div>
     </div>
   </div>
@@ -28,19 +109,16 @@
 
 <script>
 export default {
-  props: { visible: { type: Boolean, default: true } },
+  props: { config: Object, apiOptions: Array },
   data() {
     return {
-      show: this.visible,
-      step: 0
+      step: 0,
+      formData: {}
     };
   },
-  watch: {
-    visible(val) {
-      this.show = val;
-    },
-    show(val) {
-      this.$emit("update:visible", val);
+  computed: {
+    getFields() {
+      return [];
     }
   },
   created() {},
@@ -51,6 +129,9 @@ export default {
     },
     handleNext() {
       this.step++;
+    },
+    handleSave() {
+      this.$emit("save");
     }
   }
 };
@@ -58,38 +139,21 @@ export default {
 
 <style lang="scss" scoped>
 .widgetGuide {
-  position: absolute;
   width: 100%;
   height: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  background-color: rgba($color: #000000, $alpha: 0.6);
-  z-index: 999;
 
-  .box {
-    position: relative;
-    width: calc(100% - 200px);
-    height: calc(100% - 200px);
-    background-color: white;
-    border-radius: 4px;
-
-    .header {
-      height: 50px;
-    }
-    .content {
-      height: calc(100% - 100px);
-    }
-    .footer {
-      padding: 10px 20px;
-      height: 50px;
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      box-sizing: border-box;
+  .content {
+    height: calc(100% - 96px);
+    padding-top: 10px;
+  }
+  .footer {
+    height: 50px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    box-sizing: border-box;
 
-      .stepView {
-      }
+    .stepView {
     }
   }
 }

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

@@ -1,98 +0,0 @@
-<template>
-  <div class="component-config">
-    <el-collapse-item title="组件配置" name="group-element">
-      <el-form-item label="标题">
-        <el-input v-model="widget.name"></el-input>
-      </el-form-item>
-
-      <el-form-item label="标签宽度">
-        <div style="display: flex;">
-          <el-checkbox v-model="widget.options.isLabelWidth"
-            >自定义</el-checkbox
-          >
-          <el-input-number
-            v-model="widget.options.labelWidth"
-            :min="0"
-            :max="200"
-            :disabled="!widget.options.isLabelWidth"
-          >
-          </el-input-number>
-        </div>
-      </el-form-item>
-
-      <el-form-item>
-        <div class="config-header" slot="label">
-          <span class="title">默认值</span>
-          <span class="value" @click="handleAddData">添加数据</span>
-        </div>
-        <code-editor
-          v-model="widget.options.defaultValue"
-          language="json"
-        ></code-editor>
-      </el-form-item>
-
-      <el-form-item label="新增按钮文本内容">
-        <el-input v-model.number="widget.options.addButtonText"></el-input>
-      </el-form-item>
-
-      <el-form-item label="删除按钮文本内容">
-        <el-input v-model.number="widget.options.deleteButtonText"></el-input>
-      </el-form-item>
-
-      <el-form-item label="可删除的最小索引">
-        <el-input-number v-model="widget.options.deleteIndex" :min="0">
-        </el-input-number>
-      </el-form-item>
-
-      <el-form-item label="操作属性">
-        <el-checkbox v-model="widget.options.disabled">禁用 </el-checkbox>
-        <el-checkbox v-model="widget.options.hidden">隐藏组件 </el-checkbox>
-        <el-checkbox v-model="widget.options.hideLabel">隐藏标签 </el-checkbox>
-        <el-checkbox v-model="widget.options.isAdd">可新增 </el-checkbox>
-        <el-checkbox v-model="widget.options.isDelete">可删除 </el-checkbox>
-      </el-form-item>
-
-      <el-form-item label="校验">
-        <el-checkbox v-model="widget.options.required">必填</el-checkbox>
-      </el-form-item>
-    </el-collapse-item>
-  </div>
-</template>
-
-<script>
-import Draggable from "vuedraggable";
-import { configComponent } from "../mixins";
-import CodeEditor from "ui/CodeEditor/index.vue";
-export default {
-  components: {
-    Draggable,
-    CodeEditor
-  },
-  props: {},
-  mixins: [configComponent],
-  mounted() {},
-  methods: {
-    handleAddData() {
-      let defaultValue = JSON.parse(this.widget.options.defaultValue || "[]");
-      let dic = {};
-      this.widget.list.forEach(item => {
-        if (item.type === "grid") {
-          for (let i = 0; i < item.options.columns.length; i++) {
-            const element = item.options.columns[i];
-            for (let j = 0; j < element.list.length; j++) {
-              const element2 = element.list[j];
-              dic[element2.model] = element2.options.defaultValue;
-            }
-          }
-        } else {
-          dic[item.model] = item.options.defaultValue;
-        }
-      });
-      defaultValue.push(dic);
-      this.widget.options.defaultValue = JSON.stringify(defaultValue, null, 2);
-    }
-  }
-};
-</script>
-
-<style></style>