tianheng-ui 0.0.77 → 0.0.80

package/packages/TableMaking/widgetConfig.vue

@@ -65,9 +65,10 @@
               <el-select
                 v-model="tableConfig.table.sort.key"
                 placeholder="请选择"
+                clearable
               >
                 <el-option
-                  v-for="item in []"
+                  v-for="item in sortFieldOptions"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"
@@ -75,11 +76,19 @@
                 </el-option>
               </el-select>
             </el-form-item>
+            <el-form-item label="序号">
+              <el-switch v-model="tableConfig.table.sequence"> </el-switch>
+            </el-form-item>
             <el-form-item label="分页设置">
               <el-switch v-model="tableConfig.table.pageInfo.show"> </el-switch>
             </el-form-item>
-            <el-form-item label="分页条数">
-              <el-radio-group v-model="tableConfig.table.pageInfo.pageSize">
+            <el-form-item
+              v-if="tableConfig.table.pageInfo.show"
+              label="分页条数"
+            >
+              <el-radio-group
+                v-model="tableConfig.table.pageInfo.options.pageSize"
+              >
                 <el-radio-button :label="20">20条</el-radio-button>
                 <el-radio-button :label="50">50条</el-radio-button>
                 <el-radio-button :label="100">100条</el-radio-button>
@@ -120,9 +129,7 @@
               ></el-input>
             </el-form-item>
             <el-form-item label-width="90px">
-              <el-checkbox
-                v-model="tableConfig.tools.detail.show"
-                slot="label"
+              <el-checkbox v-model="tableConfig.tools.detail.show" slot="label"
                 >详情</el-checkbox
               >
               <el-input
@@ -131,9 +138,7 @@
               ></el-input>
             </el-form-item>
             <el-form-item label-width="90px">
-              <el-checkbox
-                v-model="tableConfig.tools.delete.show"
-                slot="label"
+              <el-checkbox v-model="tableConfig.tools.delete.show" slot="label"
                 >删除</el-checkbox
               >
               <el-input
@@ -153,9 +158,7 @@
               ></el-input>
             </el-form-item>
             <el-form-item label-width="90px">
-              <el-checkbox
-                v-model="tableConfig.tools.export.show"
-                slot="label"
+              <el-checkbox v-model="tableConfig.tools.export.show" slot="label"
                 >导出</el-checkbox
               >
               <el-input
@@ -164,9 +167,7 @@
               ></el-input>
             </el-form-item>
             <el-form-item label-width="90px">
-              <el-checkbox
-                v-model="tableConfig.tools.import.show"
-                slot="label"
+              <el-checkbox v-model="tableConfig.tools.import.show" slot="label"
                 >导入</el-checkbox
               >
               <el-input
@@ -222,25 +223,32 @@ export default {
         },
         table: {
           options: [],
-          sort: {
-            type: "1",
-            key: ""
-          },
           pageInfo: {
             show: true,
-            pageSize: 20
-          }
+            options: {
+              pageCount: 0, // 总页数
+              pageSize: 20, // 每页展示的条数
+              currentPage: 1, // 当前页码
+              total: 0, // 总条数
+              sizes: [10, 20, 30, 50, 100]
+            }
+          },
+          sort: { type: "1", key: "createTime" },
+          loading: { show: false, text: "加载中", image: "" },
+          empty: { show: true, text: "暂无数据", image: "" },
+          sequence: true //是否显示序号
         },
         tools: {
-          add: { show: true, name: "新增" },
-          edit: { show: true, name: "编辑" },
-          detail: { show: false, name: "查看" },
-          delete: { show: true, name: "删除" },
-          batchDelete: { show: false, name: "批量删除" },
-          export: { show: false, name: "导出" },
-          import: { show: false, name: "导入" }
+          add: { show: true, name: "新增", position: 1 },
+          edit: { show: true, name: "编辑", position: 2 },
+          detail: { show: true, name: "查看", position: 2 },
+          delete: { show: true, name: "删除", position: 2 },
+          batchDelete: { show: true, name: "批量删除", position: 1 },
+          export: { show: true, name: "导出", position: 1 },
+          import: { show: true, name: "导入", position: 1 }
         }
-      }
+      },
+      sortFieldOptions: [{ label: "创建时间", value: "createTime" }]
     };
   },
   mounted() {},

package/packages/TableMaking/widgetTable.vue

@@ -7,6 +7,8 @@
         <div>列名</div>
         <div>字段</div>
         <div>类型</div>
+        <div>默认值</div>
+        <div>数据来源</div>
       </div>
       <draggable
         class="table-content"
@@ -29,7 +31,32 @@
           </div>
           <div>{{ item.label }}</div>
           <div>{{ item.prop }}</div>
-          <div>{{ item.type }}</div>
+          <div>
+            <el-select v-model="item.type" placeholder="请选择" size="mini">
+              <el-option
+                v-for="item in componentOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </div>
+          <div>
+            <el-input
+              v-model="item.defaultValue"
+              placeholder="请输入内容"
+              size="mini"
+            ></el-input>
+          </div>
+          <div>
+            <template v-if="item.type === 'select'">
+              <el-button type="text" size="mini" @click="handleStaticData(item)"
+                >静态</el-button
+              >
+              <el-button type="text" size="mini" disabled>远端</el-button>
+            </template>
+          </div>
         </div>
       </draggable>
     </div>
@@ -87,6 +114,15 @@
         </div>
       </draggable>
     </div>
+
+    <th-dialog
+      v-model="dialog.visible"
+      :title="dialog.title"
+      :modal-append-to-body="false"
+      @on-affirm="handleDialogAffirm"
+    >
+      <th-code-editor v-model="codeEditorValue"></th-code-editor>
+    </th-dialog>
   </div>
 </template>
 
@@ -112,11 +148,18 @@ export default {
     return {
       searchData: this.searchFields,
       tableData: this.tableFields,
+      componentOptions: [
+        { label: "输入框", value: "input" },
+        { label: "下拉框", value: "select" },
+        { label: "日期框", value: "date" }
+      ],
       alignOptions: [
         { label: "左对齐", value: "left" },
         { label: "居中对齐", value: "center" },
         { label: "右对齐", value: "right" }
-      ]
+      ],
+      dialog: { visible: false, title: "", data: null },
+      codeEditorValue: ""
     };
   },
   watch: {
@@ -146,6 +189,18 @@ export default {
     },
     handleTableMoveEnd(val) {
       this.$emit("move", { type: "table", data: val });
+    },
+    handleStaticData(val) {
+      this.dialog = {
+        visible: true,
+        title: `静态数据 - ${val.label}`,
+        data: val
+      };
+      this.codeEditorValue = val.staticData || "";
+    },
+    handleDialogAffirm() {
+      this.dialog.data.staticData = this.codeEditorValue;
+      this.dialog = { visible: false, title: "", data: null };
     }
   }
 };
@@ -175,20 +230,20 @@ export default {
     height: calc(100% - 240px);
     border: 1px solid #dcdfe6;
 
-    .table-header {
-      div:nth-child(4) {
-        flex: none;
-        width: 70px !important;
-      }
-    }
+    // .table-header {
+    //   div:nth-child(4) {
+    //     flex: none;
+    //     width: 70px !important;
+    //   }
+    // }
     .table-content {
       height: calc(100% - 40px);
       overflow-y: scroll;
     }
-    .table-content .table-content-item > div:nth-child(4) {
-      flex: none;
-      width: 70px !important;
-    }
+    // .table-content .table-content-item > div:nth-child(4) {
+    //   flex: none;
+    //   width: 70px !important;
+    // }
     .el-input-number--mini {
       width: 100%;
     }

package/packages/index.js

@@ -42,6 +42,7 @@ import Upload from "./Upload/index.js";
 import FormMaking from "./FormMaking/making.js";
 import FormGenerate from "./FormMaking/generate.js";
 import TableMaking from "./TableMaking/making.js";
+import TableGenerate from "./TableMaking/generate.js";
 import Workflow from "../packages/Workflow/index.js";
 
 const components = [
@@ -67,6 +68,7 @@ const components = [
   FormMaking,
   FormGenerate,
   TableMaking,
+  TableGenerate,
   Workflow
 ];
 
@@ -111,6 +113,7 @@ export default {
   FormMaking,
   FormGenerate,
   TableMaking,
+  TableGenerate,
   Workflow
 };
 
@@ -138,5 +141,6 @@ export {
   FormMaking,
   FormGenerate,
   TableMaking,
+  TableGenerate,
   Workflow
 };