tianheng-ui 0.1.32 → 0.1.34

package/packages/TableMaking/generateTable.js

@@ -0,0 +1,5 @@
+import GenerateTable from "./generateTable.vue";
+GenerateTable.install = function(Vue) {
+  Vue.component(GenerateTable.name, GenerateTable);
+};
+export default GenerateTable;

package/packages/TableMaking/generateTable.vue

@@ -88,9 +88,9 @@
 </template>
 
 <script>
-import Search from "./custom/items/search";
-import Tools from "./custom/items/tools";
-import STable from "./custom/items/table";
+import Search from "./custom/items/search/index-pc.vue";
+import Tools from "./custom/items/tools/index-pc.vue";
+import STable from "./custom/items/table/index-pc.vue";
 import * as Axios from "lib/theme-chalk/js/axios";
 export default {
   name: "thTableGenerate",

package/packages/TableMaking/index.vue

@@ -10,7 +10,6 @@
         <slot name="action"></slot>
       </widget-tools>
       <widget-table
-        v-if="client === 'monitor'"
         style="height:calc(100% - 45px)"
         :config="tableConfig"
       ></widget-table>

package/packages/TableMaking/making.js

@@ -1,5 +1,5 @@
-import TableMaking from "./index.vue";
-TableMaking.install = function(Vue) {
-  Vue.component(TableMaking.name, TableMaking);
+import MakingTable from "./index.vue";
+MakingTable.install = function(Vue) {
+  Vue.component(MakingTable.name, MakingTable);
 };
-export default TableMaking;
+export default MakingTable;

package/packages/TableMaking/widgetConfig.vue

@@ -186,18 +186,44 @@
               <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-collapse-item name="group-style_table">
+            <el-tooltip slot="title" effect="dark" placement="top">
+              <div slot="content">
+                <span>显示边框: border</span><br />
+                <span>高度: height</span><br />
+                <!-- <span>自定义: 可自定义填写css样式</span><br /> -->
+              </div>
+              <span style="color: #409EFF;">table 样式配置（电脑端）</span>
+            </el-tooltip>
+            <el-form-item label="显示边框">
               <el-switch v-model="config.table.style.table.border"> </el-switch>
             </el-form-item>
+            <el-form-item>
+              <el-tooltip
+                slot="label"
+                effect="dark"
+                content="Table 的高度，默认为自动高度。如果 height 为 number 类型，单位 px；如果 height 为 string 类型，则这个高度会设置为 Table 的 style.height 的值，Table 的高度会受控于外部样式。"
+                placement="top"
+              >
+                <span style="color: #409EFF;">高度</span>
+              </el-tooltip>
+              <el-input
+                v-model="config.table.style.table.height"
+                placeholder="请输入"
+                clearable
+              ></el-input>
+            </el-form-item>
           </el-collapse-item>
-          <el-collapse-item
-            title="cell 样式配置（移动端）"
-            name="group-style_cell"
-          >
+          <el-collapse-item name="group-style_cell">
+            <el-tooltip slot="title" effect="dark" placement="top">
+              <div slot="content">
+                <span>外边框: margin</span><br />
+                <span>内边框: padding</span><br />
+                <span>分割线: border-bottom</span><br />
+                <span>自定义: 可自定义填写css样式</span><br />
+              </div>
+              <span style="color: #409EFF;">cell 样式配置（移动端）</span>
+            </el-tooltip>
             <el-form-item label="外边距">
               <el-input
                 v-model="config.table.style.cell.margin"
@@ -229,10 +255,18 @@
               </el-input>
             </el-form-item>
           </el-collapse-item>
-          <el-collapse-item
-            title="title 样式配置（移动端）"
-            name="group-style_title"
-          >
+          <el-collapse-item name="group-style_title">
+            <el-tooltip slot="title" effect="dark" placement="top">
+              <div slot="content">
+                <span>外边框: margin</span><br />
+                <span>内边框: padding</span><br />
+                <span>宽度: width</span><br />
+                <span>对齐方式: text-align</span><br />
+                <span>颜色: color</span><br />
+                <span>自定义: 可自定义填写css样式</span><br />
+              </div>
+              <span style="color: #409EFF;">title 样式配置（移动端）</span>
+            </el-tooltip>
             <el-form-item label="外边距">
               <el-input
                 v-model="config.table.style.title.margin"
@@ -278,10 +312,18 @@
               </el-input>
             </el-form-item>
           </el-collapse-item>
-          <el-collapse-item
-            title="value 样式配置（移动端）"
-            name="group-style_value"
-          >
+          <el-collapse-item name="group-style_value">
+            <el-tooltip slot="title" effect="dark" placement="top">
+              <div slot="content">
+                <span>外边框: margin</span><br />
+                <span>内边框: padding</span><br />
+                <span>宽度: width</span><br />
+                <span>对齐方式: text-align</span><br />
+                <span>颜色: color</span><br />
+                <span>自定义: 可自定义填写css样式</span><br />
+              </div>
+              <span style="color: #409EFF;">value 样式配置（移动端）</span>
+            </el-tooltip>
             <el-form-item label="外边距">
               <el-input
                 v-model="config.table.style.value.margin"
@@ -398,7 +440,15 @@
             <el-form-item label="按钮图标">
               <th-icons v-model="dialog.data.style.icon"></th-icons>
             </el-form-item>
-            <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="dialog.data.form"
                 style="width:100%"
@@ -415,7 +465,15 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <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="dialog.data.api"
                 style="width:100%"
@@ -476,11 +534,7 @@ export default {
         "group-sort",
         "group-hint",
         "group-network",
-        "group-button",
-        "group-style_table",
-        "group-style_cell",
-        "group-style_title",
-        "group-style_value"
+        "group-button"
       ],
       formRules: {
         "table.fieldsType": [

package/packages/index.js

@@ -41,10 +41,11 @@ import ImagePreview from "./ImagePreview/index.js";
 import Row from "./Row/index.js";
 import Col from "./Col/index.js";
 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 MakingForm from "./FormMaking/making.js";
+import GenerateForm from "./FormMaking/generate.js";
+import MakingTable from "./TableMaking/making.js";
+import GenerateTable from "./TableMaking/generateTable.js";
+import GenerateList from "./TableMaking/generateList.js";
 import Workflow from "../packages/Workflow/index.js";
 
 const components = [
@@ -67,10 +68,11 @@ const components = [
   Row,
   Col,
   Upload,
-  FormMaking,
-  FormGenerate,
-  TableMaking,
-  TableGenerate,
+  MakingForm,
+  GenerateForm,
+  MakingTable,
+  GenerateTable,
+  GenerateList,
   Workflow
 ];
 
@@ -125,10 +127,11 @@ export default {
   Row,
   Col,
   Upload,
-  FormMaking,
-  FormGenerate,
-  TableMaking,
-  TableGenerate,
+  MakingForm,
+  GenerateForm,
+  MakingTable,
+  GenerateTable,
+  GenerateList,
   Workflow
 };
 
@@ -153,9 +156,10 @@ export {
   Row,
   Col,
   Upload,
-  FormMaking,
-  FormGenerate,
-  TableMaking,
-  TableGenerate,
+  MakingForm,
+  GenerateForm,
+  MakingTable,
+  GenerateTable,
+  GenerateList,
   Workflow
 };

package/packages/TableMaking/generate.js

@@ -1,5 +0,0 @@
-import TableGenerate from "./generateTable.vue";
-TableGenerate.install = function(Vue) {
-  Vue.component(TableGenerate.name, TableGenerate);
-};
-export default TableGenerate;