tianheng-ui 0.1.29 → 0.1.31

package/package.json

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

package/packages/FormMaking/FormConfig.vue

@@ -80,7 +80,15 @@
         </el-collapse-item>
 
         <el-collapse-item title="数据配置" name="group-resultData">
-          <el-form-item label="表单回填">
+          <el-form-item>
+            <el-tooltip
+              slot="label"
+              effect="dark"
+              content="一般用于编辑和详情的数据回显"
+              placement="top"
+            >
+              <span style="color: #409EFF;">数据回填</span>
+            </el-tooltip>
             <el-select
               v-model="config.mounted.api"
               value-key="id"
@@ -89,7 +97,7 @@
               no-data-text="暂无接口，请前往【接口模块】创建"
             >
               <el-option
-                v-for="item in config.network"
+                v-for="item in Object.values(apiConfig)"
                 :key="item.id"
                 :label="item.label"
                 :value="item.id"

package/packages/FormMaking/WidgetConfig.vue

@@ -79,6 +79,7 @@
           :widget="data"
           :config="config"
           :fields="fields"
+          :apiConfig="apiConfig"
           :is="compsData[data.type].content"
           @events-show="handleEventDialogShow"
           @events-edit="handleEventsCollapseClick"
@@ -257,7 +258,8 @@ export default {
         return {};
       }
     },
-    fields: Array
+    fields: Array,
+    apiConfig: Object
   },
   data() {
     return {

package/packages/FormMaking/custom/config.js

@@ -798,6 +798,6 @@ export const baseConfig = {
         value: ""
       }
     ],
-    network: []
+    network: {}
   }
 };

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

@@ -96,7 +96,7 @@
           no-data-text="暂无接口，请前往【接口模块】创建"
         >
           <el-option
-            v-for="item in config.network"
+            v-for="item in Object.values(apiConfig)"
             :key="item.id"
             :label="item.label"
             :value="item.id"

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

@@ -65,7 +65,7 @@
           clearable
         >
           <el-option
-            v-for="item in config.network"
+            v-for="item in Object.values(apiConfig)"
             :key="item.id"
             :label="item.label"
             :value="item.id"

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

@@ -59,7 +59,7 @@
             clearable
           >
             <el-option
-              v-for="item in config.network"
+              v-for="item in Object.values(apiConfig)"
               :key="item.id"
               :label="item.label"
               :value="item.id"

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

@@ -47,7 +47,7 @@
             clearable
           >
             <el-option
-              v-for="item in config.network"
+              v-for="item in Object.values(apiConfig)"
               :key="item.id"
               :label="item.label"
               :value="item.id"

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

@@ -44,7 +44,7 @@
             clearable
           >
             <el-option
-              v-for="item in config.network"
+              v-for="item in Object.values(apiConfig)"
               :key="item.id"
               :label="item.label"
               :value="item.id"

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

@@ -55,7 +55,7 @@
             placeholder="请选择远端方法"
           >
             <el-option
-              v-for="item in config.network"
+              v-for="item in Object.values(apiConfig)"
               :key="item.id"
               :label="item.label"
               :value="item.id"

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

@@ -72,7 +72,7 @@
           placeholder="请选择远端方法"
         >
           <el-option
-            v-for="item in config.network"
+            v-for="item in Object.values(apiConfig)"
             :key="item.id"
             :label="item.label"
             :value="item.id"

package/packages/FormMaking/custom/mixins/index.js

@@ -12,12 +12,7 @@ export const configComponent = {
         return {};
       }
     },
-    remoteApis: {
-      type: Array,
-      default: () => {
-        return [];
-      }
-    }
+    apiConfig: Object
   },
   data() {
     return {};

package/packages/FormMaking/index.vue

@@ -152,6 +152,7 @@
                   :data="widgetFormSelect"
                   :config="formConfig.config"
                   :fields="fields"
+                  :apiConfig="apiConfig"
                   @update="handleWidgetConfigUpdate"
                 >
                 </widget-config>
@@ -420,7 +421,10 @@ export default {
             this.$message.warning("请选择字段类型");
             return reject();
           }
-          if (!this.formConfig.config.fieldsApi) {
+          if (
+            this.formConfig.config.fieldsType === "fieldsApi" &&
+            !this.formConfig.config.fieldsApi
+          ) {
             this.$message.warning("请选择字段接口");
             return reject();
           }

package/packages/TableMaking/WidgetTools.vue

@@ -186,6 +186,11 @@ export default {
       this.$emit("click", val, data);
     },
     handleDialogOpen(action, data = {}) {
+      if (action === "preview") {
+        const { href } = this.$router.resolve({ path: "" });
+        window.open(href, "_blank");
+        return;
+      }
       switch (action) {
         case "generateJson":
           const configText = JSON.stringify(this.config, null, 2);

package/packages/TableMaking/custom/config.js

@@ -39,6 +39,8 @@ export const table = {
   style: {
     table: {
       border: true,
+      height: "",
+      maxHeight: "",
       customStyle: ""
     },
     cell: {
@@ -86,7 +88,7 @@ export const tools = {
     position: "header",
     form: "",
     api: "",
-    style: buttonStyle
+    style: { ...buttonStyle, type: "primary" }
   },
   edit: {
     show: true,
@@ -96,7 +98,7 @@ export const tools = {
     position: "row",
     form: "",
     api: "",
-    style: buttonStyle
+    style: { ...buttonStyle, type: "primary", plain: true }
   },
   look: {
     show: false,
@@ -106,7 +108,7 @@ export const tools = {
     position: "row",
     form: "",
     api: "",
-    style: buttonStyle
+    style: { ...buttonStyle, type: "primary", plain: true }
   },
   delete: {
     show: true,
@@ -116,7 +118,7 @@ export const tools = {
     position: "row",
     form: "",
     api: "",
-    style: buttonStyle
+    style: { ...buttonStyle, type: "danger", plain: true }
   },
   batchDelete: {
     show: false,
@@ -126,7 +128,7 @@ export const tools = {
     position: "header",
     form: "",
     api: "",
-    style: buttonStyle
+    style: { ...buttonStyle, type: "danger", plain: true }
   },
   export: {
     show: false,
@@ -136,7 +138,7 @@ export const tools = {
     position: "header",
     form: "",
     api: "",
-    style: buttonStyle
+    style: { ...buttonStyle }
   },
   import: {
     show: false,
@@ -146,7 +148,7 @@ export const tools = {
     position: "header",
     form: "",
     api: "",
-    style: buttonStyle
+    style: { ...buttonStyle }
   }
 };
 

package/packages/TableMaking/custom/items/table/index.vue

@@ -29,7 +29,9 @@ export default {
     return {};
   },
   created() {},
-  mounted() {},
+  mounted() {
+    console.log(this.config)
+  },
   methods: {}
 };
 </script>

package/packages/TableMaking/index.vue

@@ -144,12 +144,15 @@ export default {
               this.$message.warning("请选择字段表");
               return reject();
             }
-            if (!this.tableConfig.table.title) {
-              this.$message.warning("请选择列表名称");
+            if (
+              this.tableConfig.table.fieldsTable === "fieldsApi" &&
+              !this.tableConfig.table.mounted.api
+            ) {
+              this.$message.warning("请选择列表接口");
               return reject();
             }
-            if (!this.tableConfig.table.mounted.api) {
-              this.$message.warning("请选择列表接口");
+            if (!this.tableConfig.table.title) {
+              this.$message.warning("请选择列表名称");
               return reject();
             }
             const data = deepClone(this.tableConfig);

package/packages/TableMaking/widgetConfig.vue

@@ -186,6 +186,14 @@
               <i class="el-icon-set-up" @click="handleActionConfig(item)"></i>
             </div>
           </el-collapse-item>
+          <el-collapse-item
+            title="table 样式配置（电脑端）"
+            name="group-style_table"
+          >
+            <el-form-item label="是否边框">
+              <el-switch v-model="config.table.style.table.border"> </el-switch>
+            </el-form-item>
+          </el-collapse-item>
           <el-collapse-item
             title="cell 样式配置（移动端）"
             name="group-style_cell"
@@ -351,6 +359,7 @@
                 :icon="dialog.data.style.icon"
                 :plain="dialog.data.style.plain"
                 :round="dialog.data.style.round"
+                :circle="dialog.data.style.circle"
                 :size="dialog.data.style.size"
                 >{{ dialog.data.text }}</el-button
               >
@@ -366,6 +375,7 @@
                 <el-radio label="info">信息按钮</el-radio>
                 <el-radio label="warning">警告按钮</el-radio>
                 <el-radio label="danger">危险按钮</el-radio>
+                <el-radio label="text">文字按钮</el-radio>
               </el-radio-group>
             </el-form-item>
             <el-form-item label="按钮大小">
@@ -383,7 +393,7 @@
               <el-switch v-model="dialog.data.style.round"> </el-switch>
             </el-form-item>
             <el-form-item label="是否圆型">
-              <el-switch v-model="dialog.data.style.round"> </el-switch>
+              <el-switch v-model="dialog.data.style.circle"> </el-switch>
             </el-form-item>
             <el-form-item label="按钮图标">
               <th-icons v-model="dialog.data.style.icon"></th-icons>
@@ -465,11 +475,12 @@ export default {
         "group-pageInfo",
         "group-sort",
         "group-hint",
+        "group-network",
+        "group-button",
+        "group-style_table",
         "group-style_cell",
         "group-style_title",
-        "group-style_value",
-        "group-network",
-        "group-button"
+        "group-style_value"
       ],
       formRules: {
         "table.fieldsType": [
@@ -490,14 +501,14 @@ export default {
   },
   watch: {
     config(val) {
-      this.handleFieldsApiChange(val.table.mounted.api)
+      this.handleFieldsApiChange(val.table.mounted.api);
       this.handleFields();
     },
     fields(val) {
       this.handleFields();
     },
-    apiOptions(){
-      this.handleFieldsApiChange(this.config.table.mounted.api)
+    apiOptions() {
+      this.handleFieldsApiChange(this.config.table.mounted.api);
     }
   },
   computed: {