tianheng-ui 0.1.10 → 0.1.12

package/packages/FormMaking/custom/config.js

@@ -30,7 +30,7 @@ export const basicComponents = [
       onFocus: "",
       onBlur: ""
     },
-    rules: []
+    rules: [{}]
   },
   {
     name: "多行文本",
@@ -60,7 +60,8 @@ export const basicComponents = [
       onChange: "",
       onFocus: "",
       onBlur: ""
-    }
+    },
+    rules: [{}]
   },
   {
     name: "单元格",
@@ -79,7 +80,8 @@ export const basicComponents = [
       textAlign: "right",
       hidden: false,
       hideLabel: false
-    }
+    },
+    rules: []
   },
   {
     name: "文字",
@@ -95,7 +97,8 @@ export const basicComponents = [
       textAlign: "left",
       hidden: false,
       hideLabel: false
-    }
+    },
+    rules: []
   },
   {
     name: "单选框组",
@@ -110,16 +113,16 @@ export const basicComponents = [
       showLabel: false,
       options: [
         {
-          value: "Option 1",
-          label: "Option 1"
+          value: "选值 1",
+          label: "选项 1"
         },
         {
-          value: "Option 2",
-          label: "Option 2"
+          value: "选值 2",
+          label: "选项 2"
         },
         {
-          value: "Option 3",
-          label: "Option 3"
+          value: "选值 3",
+          label: "选项 3"
         }
       ],
       required: false,
@@ -137,7 +140,8 @@ export const basicComponents = [
     },
     events: {
       onChange: ""
-    }
+    },
+    rules: []
   },
   {
     name: "多选框组",
@@ -152,13 +156,16 @@ export const basicComponents = [
       showLabel: false,
       options: [
         {
-          value: "Option 1"
+          value: "选值 1",
+          label: "选项 1"
         },
         {
-          value: "Option 2"
+          value: "选值 2",
+          label: "选项 2"
         },
         {
-          value: "Option 3"
+          value: "选值 3",
+          label: "选项 3"
         }
       ],
       required: false,
@@ -180,7 +187,8 @@ export const basicComponents = [
     },
     events: {
       onChange: ""
-    }
+    },
+    rules: []
   },
   {
     name: "时间选择器",
@@ -210,7 +218,8 @@ export const basicComponents = [
       onChange: "",
       onFocus: "",
       onBlur: ""
-    }
+    },
+    rules: []
   },
   {
     name: "日期选择器",
@@ -237,7 +246,8 @@ export const basicComponents = [
       onChange: "",
       onFocus: "",
       onBlur: ""
-    }
+    },
+    rules: []
   },
   {
     name: "下拉选择框",
@@ -257,15 +267,9 @@ export const basicComponents = [
       collapseTags: false,
       allowCreate: false,
       options: [
-        {
-          value: "Option 1"
-        },
-        {
-          value: "Option 2"
-        },
-        {
-          value: "Option 3"
-        }
+        { value: "选值 1", label: "选项 1" },
+        { value: "选值 2", label: "选项 2" },
+        { value: "选值 3", label: "选项 3" }
       ],
       filterable: false,
       props: {
@@ -283,7 +287,8 @@ export const basicComponents = [
       onChange: "",
       onFocus: "",
       onBlur: ""
-    }
+    },
+    rules: []
   },
   {
     name: "颜色选择器",
@@ -312,7 +317,8 @@ export const basicComponents = [
     },
     events: {
       onChange: ""
-    }
+    },
+    rules: []
   },
   {
     name: "开关",
@@ -334,7 +340,8 @@ export const basicComponents = [
     },
     events: {
       onChange: ""
-    }
+    },
+    rules: []
   },
   {
     name: "按钮",
@@ -377,13 +384,12 @@ export const basicComponents = [
       isLabelWidth: false,
       required: false,
       defaultValue: 0,
-      min: 1,
-      max: 2,
-      step: 1,
+      min: 0,
+      max: -1,
+      step: 1, //递增递减步数
+      precision: 0, //精度
       disabled: false,
       controlsPosition: false,
-      step: 1, //递增递减步数
-      precision: 1, //精度
       hidden: false,
       hideLabel: false
     },
@@ -391,7 +397,8 @@ export const basicComponents = [
       onChange: "",
       onFocus: "",
       onBlur: ""
-    }
+    },
+    rules: []
   },
   {
     name: "滑块",
@@ -419,7 +426,8 @@ export const basicComponents = [
     },
     events: {
       onChange: ""
-    }
+    },
+    rules: []
   },
   {
     name: "评分",
@@ -440,7 +448,8 @@ export const basicComponents = [
     },
     events: {
       onChange: ""
-    }
+    },
+    rules: []
   },
   {
     name: "图片",
@@ -471,7 +480,9 @@ export const basicComponents = [
       hidden: false,
       hideLabel: false,
       isLazy: true
-    }
+    },
+    events: {},
+    rules: []
   },
   {
     name: "文件",
@@ -505,7 +516,9 @@ export const basicComponents = [
       elUploadTip: "",
       listType: "default", //展示方式
       drag: false //拖拽上传
-    }
+    },
+    events: {},
+    rules: []
   },
   {
     name: "编辑器",
@@ -521,7 +534,9 @@ export const basicComponents = [
       required: false,
       hidden: false,
       hideLabel: false
-    }
+    },
+    events: {},
+    rules: []
   },
   {
     name: "级联选择器",
@@ -557,7 +572,8 @@ export const basicComponents = [
     },
     events: {
       onChange: ""
-    }
+    },
+    rules: []
   }
 ];
 
@@ -569,6 +585,7 @@ export const advanceComponents = [
     options: {
       height: "",
       defaultValue: "",
+      columns: [],
       customClass: "",
       labelWidth: 100,
       isLabelWidth: false,
@@ -590,14 +607,16 @@ export const advanceComponents = [
       showHeader: true, // 是否显示表头
       highlightCurrentRow: false // 是否高亮当前行
     },
-    list: []
+    events: {},
+    rules: []
   },
   {
     name: "子表单H5",
-    type: "table_h5",
+    type: "tableH5",
     icon: "icon-table",
     options: {
       defaultValue: "",
+      columns: [],
       customClass: "",
       labelWidth: 100,
       isLabelWidth: false,
@@ -617,29 +636,30 @@ export const advanceComponents = [
       deleteButtonText: "删除",
       deleteIndex: 0 //  可删除的最小索引
     },
-    list: []
+    events: {},
+    rules: []
   },
   {
     name: "标签页",
     type: "tabs",
     icon: "icon-tabs",
-    tabs: [
-      {
-        label: "选项1",
-        value: "tab1",
-        list: []
-      },
-      {
-        label: "选项2",
-        value: "tab2",
-        list: []
-      }
-    ],
     options: {
       defaultValue: "tab1",
       type: "",
       tabPosition: "top",
       customClass: "",
+      columns: [
+        {
+          label: "选项1",
+          value: "tab1",
+          list: []
+        },
+        {
+          label: "选项2",
+          value: "tab2",
+          list: []
+        }
+      ],
       hidden: false,
       labelWidth: 100,
       isLabelWidth: false,
@@ -649,6 +669,7 @@ export const advanceComponents = [
       remoteOption: [],
       tableColumn: false
     },
+    events: {},
     rules: []
   },
   {
@@ -658,7 +679,9 @@ export const advanceComponents = [
     options: {
       defaultType: "String",
       required: false
-    }
+    },
+    events: {},
+    rules: []
   }
 ];
 
@@ -667,43 +690,47 @@ export const layoutComponents = [
     name: "栅格布局",
     type: "grid",
     icon: "icon-grid-",
-    columns: [
-      {
-        span: 12,
-        list: []
-      },
-      {
-        span: 12,
-        list: []
-      }
-    ],
     options: {
       gutter: 0,
       justify: "start",
       align: "top",
+      columns: [
+        {
+          span: 12,
+          list: []
+        },
+        {
+          span: 12,
+          list: []
+        }
+      ],
       hideLabel: true
-    }
+    },
+    events: {},
+    rules: []
   },
   {
     name: "浮动布局",
     type: "alliance",
     icon: "icon-grid-",
-    columns: [
-      {
-        span: 12,
-        list: []
-      },
-      {
-        span: 12,
-        list: []
-      }
-    ],
     options: {
       gutter: 0,
       justify: "start",
       align: "top",
+      columns: [
+        {
+          span: 12,
+          list: []
+        },
+        {
+          span: 12,
+          list: []
+        }
+      ],
       hideLabel: true
-    }
+    },
+    events: {},
+    rules: []
   },
   {
     name: "填充物",
@@ -716,8 +743,10 @@ export const layoutComponents = [
       labelWidth: 100,
       isLabelWidth: false,
       hideLabel: true,
-      hidden: false,
-    }
+      hidden: false
+    },
+    events: {},
+    rules: []
   },
   {
     name: "分割线",
@@ -733,10 +762,13 @@ export const layoutComponents = [
       contentPosition: "left",
       tableColumn: false
     },
+    events: {},
     rules: []
   }
 ];
 
+export const templateComponents = [];
+
 export const baseConfig = {
   ui: "element",
   title: "",
@@ -749,14 +781,14 @@ export const baseConfig = {
   hideLabel: false,
   eventScript: [
     {
-      key: "mounted",
-      name: "mounted",
-      func: ""
+      id: "mounted",
+      label: "mounted",
+      value: ""
     },
     {
-      key: "refresh",
-      name: "refresh",
-      func: ""
+      id: "refresh",
+      label: "refresh",
+      value: ""
     }
   ]
 };

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

@@ -82,12 +82,7 @@
         </el-checkbox>
       </el-form-item>
 
-      <el-form-item>
-        <div class="config-header" slot="label">
-          <span class="title">动作设置</span>
-          <span class="value" @click="handleEventsShow">配置</span>
-        </div>
-
+      <el-form-item label="提交接口">
         <!-- <el-radio-group
           style="margin-bottom:10px;"
           v-model="widget.options.remote"
@@ -96,23 +91,27 @@
           <el-radio-button :label="false">自定义事件</el-radio-button>
           <el-radio-button :label="true">绑定接口</el-radio-button>
         </el-radio-group> -->
-
-        <div v-show="widget.options.remote">
-          <el-select
-            style="width:100%"
-            v-model="widget.options.remoteFunc"
-            value-key="api"
-            placeholder="请选择远端方法"
-            clearable
+        <el-select
+          style="width:100%"
+          v-model="widget.options.remoteFunc"
+          value-key="id"
+          placeholder="请选择提交方法"
+          clearable
+        >
+          <el-option
+            v-for="item in config.remoteFuncs"
+            :key="item.id"
+            :label="item.label"
+            :value="item"
           >
-            <el-option
-              v-for="item in remoteApis"
-              :key="item.api"
-              :label="item.name"
-              :value="item"
-            >
-            </el-option>
-          </el-select>
+          </el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item>
+        <div class="config-header" slot="label">
+          <span class="title">动作设置</span>
+          <span class="value" @click="handleEventsShow">配置</span>
         </div>
 
         <el-collapse v-show="!widget.options.remote" class="eventsCollapse">
@@ -131,9 +130,9 @@
               >
                 <el-option
                   v-for="item in config.eventScript"
-                  :key="item.key"
-                  :label="item.name"
-                  :value="item.key"
+                  :key="item.id"
+                  :label="item.label"
+                  :value="item.id"
                 >
                 </el-option>
               </el-select>

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

@@ -64,14 +64,14 @@
         <el-select
           style="width:100%"
           v-model="widget.options.remoteFunc"
-          value-key="api"
+          value-key="id"
           placeholder="请选择远端方法"
           clearable
         >
           <el-option
-            v-for="item in remoteApis"
-            :key="item.api"
-            :label="item.name"
+            v-for="item in config.remoteFuncs"
+            :key="item.id"
+            :label="item.label"
             :value="item"
           >
           </el-option>
@@ -137,9 +137,9 @@
               >
                 <el-option
                   v-for="item in config.eventScript"
-                  :key="item.key"
-                  :label="item.name"
-                  :value="item.key"
+                  :key="item.id"
+                  :label="item.label"
+                  :value="item.id"
                 >
                 </el-option>
               </el-select>

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

@@ -43,40 +43,35 @@
         </div>
         <div style="display: flex;">
           <div style="flex:1;">最大勾选：</div>
-          <el-input-number
-            v-model="widget.options.max"
-            :min="widget.options.min || 1"
-          >
+          <el-input-number v-model="widget.options.max" :min="0">
           </el-input-number>
         </div>
       </el-form-item>
 
       <el-form-item label="选项">
-        <div
-          style="display: flex;align-items: center;justify-content: space-between;margin-bottom:10px;"
-        >
-          <el-radio-group v-model="widget.options.remote" size="mini">
+        <div class="config-header" slot="label">
+          <span class="title">选项</span>
+          <el-radio-group
+            class="value"
+            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 v-if="!widget.options.remote">
-            <span>显示标签</span>
-            <el-switch v-model="widget.options.showLabel"> </el-switch>
-          </div>
         </div>
         <template v-if="widget.options.remote">
           <el-select
             style="width:100%"
             v-model="widget.options.remoteFunc"
-            value-key="api"
+            :value-key="config.remoteFuncs.props.key"
             placeholder="请选择远端方法"
             clearable
           >
             <el-option
-              v-for="item in remoteApis"
-              :key="item.api"
-              :label="item.name"
+              v-for="item in config.remoteFuncs.options"
+              :key="item[config.remoteFuncs.props.key]"
+              :label="item[config.remoteFuncs.props.label]"
               :value="item"
             >
             </el-option>
@@ -93,6 +88,12 @@
           </el-input>
         </template>
         <template v-else>
+          <el-switch
+            v-model="widget.options.showLabel"
+            active-text="显示标签"
+            inactive-text="隐藏标签"
+          >
+          </el-switch>
           <el-checkbox-group v-model="widget.options.defaultValue">
             <draggable
               tag="ul"
@@ -188,9 +189,9 @@
               >
                 <el-option
                   v-for="item in config.eventScript"
-                  :key="item.key"
-                  :label="item.name"
-                  :value="item.key"
+                  :key="item.id"
+                  :label="item.label"
+                  :value="item.id"
                 >
                 </el-option>
               </el-select>
@@ -220,8 +221,8 @@ export default {
   methods: {
     handleAddOption() {
       this.widget.options.options.push({
-        value: `新选项${this.widget.options.options.length + 1}`,
-        label: `新选项${this.widget.options.options.length + 1}`
+        value: `选值 ${this.widget.options.options.length + 1}`,
+        label: `选项 ${this.widget.options.options.length + 1}`
       });
     },
     handleOptionsRemove(index) {

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

@@ -86,9 +86,9 @@
               >
                 <el-option
                   v-for="item in config.eventScript"
-                  :key="item.key"
-                  :label="item.name"
-                  :value="item.key"
+                  :key="item.id"
+                  :label="item.label"
+                  :value="item.id"
                 >
                 </el-option>
               </el-select>

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

@@ -122,9 +122,9 @@
               >
                 <el-option
                   v-for="item in config.eventScript"
-                  :key="item.key"
-                  :label="item.name"
-                  :value="item.key"
+                  :key="item.id"
+                  :label="item.label"
+                  :value="item.id"
                 >
                 </el-option>
               </el-select>