tianheng-ui 0.1.11 → 0.1.14

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>

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

@@ -171,9 +171,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/number.vue

@@ -104,9 +104,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/radio.vue

@@ -35,33 +35,31 @@
         </el-radio-group>
       </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">
+      <el-form-item>
+        <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>
@@ -78,6 +76,12 @@
           </el-input>
         </template>
         <template v-else>
+          <el-switch
+            v-model="widget.options.showLabel"
+            active-text="显示标签"
+            inactive-text="隐藏标签"
+          >
+          </el-switch>
           <el-radio-group v-model="widget.options.defaultValue">
             <draggable
               tag="ul"
@@ -165,9 +169,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>
@@ -197,8 +201,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/rate.vue

@@ -73,9 +73,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/select.vue

@@ -33,31 +33,29 @@
       </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="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>
@@ -74,6 +72,12 @@
           </el-input>
         </template>
         <template v-else>
+          <el-switch
+            v-model="widget.options.showLabel"
+            active-text="显示标签"
+            inactive-text="隐藏标签"
+          >
+          </el-switch>
           <template v-if="widget.options.multiple">
             <el-checkbox-group v-model="widget.options.defaultValue">
               <draggable
@@ -92,18 +96,19 @@
                 >
                   <el-checkbox :label="item.value" style="margin-right: 5px;">
                     <el-input
+                      v-model="item.value"
                       :style="{
                         width: widget.options.showLabel ? '90px' : '180px'
                       }"
-                      v-model="item.value"
                       :disabled="
                         widget.options.defaultValue.indexOf(item.value) !== -1
                       "
                     ></el-input>
                     <el-input
-                      v-if="widget.options.showLabel"
+                      v-show="widget.options.showLabel"
                       style="width:90px;"
                       v-model="item.label"
+                      placeholder="标签"
                     >
                     </el-input>
                   </el-checkbox>
@@ -244,9 +249,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>
@@ -291,8 +296,8 @@ export default {
     },
     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/slider.vue

@@ -106,9 +106,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/switch.vue

@@ -94,9 +94,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/tabs.vue

@@ -46,38 +46,33 @@
       <el-form-item label="选项">
         <el-radio-group
           v-model="widget.options.remote"
-          size="mini"
           style="margin-bottom:10px;"
+          size="mini"
         >
           <el-radio-button :label="false">静态数据</el-radio-button>
-          <el-radio-button :label="true">远端数据</el-radio-button>
+          <el-radio-button :label="true" disabled>远端数据</el-radio-button>
         </el-radio-group>
         <div v-if="widget.options.remote">
           <el-select
+            v-model="widget.options.remoteFunc"
             class="remoteApis"
             size="mini"
-            v-model="widget.options.remoteFunc"
             placeholder="请选择远端方法"
           >
             <template slot="prefix">
               <div style="width:70px;">接口名</div>
             </template>
-            <el-option-group
-              v-for="group in remoteApis"
-              :key="group.label"
-              :label="group.label"
+
+            <el-option
+              v-for="item in config.remoteFuncs.options"
+              :key="item[config.remoteFuncs.props.key]"
+              :label="item[config.remoteFuncs.props.label]"
+              :value="item"
             >
-              <el-option
-                v-for="item in group.options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option>
-            </el-option-group>
+            </el-option>
           </el-select>
 
-          <el-input size="mini" style="" v-model="widget.options.props.value">
+          <!-- <el-input size="mini" style="" v-model="widget.options.props.value">
             <template slot="prepend">
               <div style="width:30px;">值</div>
             </template>
@@ -86,7 +81,7 @@
             <template slot="prepend">
               <div style="width:30px;">标签</div>
             </template>
-          </el-input>
+          </el-input> -->
         </div>
         <template v-else>
           <el-radio-group v-model="widget.options.defaultValue">

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

@@ -152,9 +152,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/time.vue

@@ -109,9 +109,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/upload.vue

@@ -71,15 +71,15 @@
         </el-radio-group>
         <el-select
           v-if="widget.options.remote"
-          style="width:100%"
           v-model="widget.options.remoteFunc"
-          value-key="api"
+          style="width:100%"
+          :value-key="config.remoteFuncs.props.key"
           placeholder="请选择远端方法"
         >
           <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>

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

@@ -20,8 +20,42 @@
 
 <script>
 import { itemsComponent } from "../mixins/index";
+import * as Axios from "lib/theme-chalk/js/axios";
 export default {
-  mixins: [itemsComponent]
+  mixins: [itemsComponent],
+  data() {
+    return {
+      axios: null
+    };
+  },
+  created() {
+    const oauthConfig = localStorage.getItem("TH_OauthConfig") || "{}";
+    this.axios = Axios.init(JSON.parse(oauthConfig));
+  },
+  methods: {
+    hendleRemoteData() {
+      const remoteFunc = this.widget.options.remoteFunc;
+      const requestConfig = {
+        url: `/lc/api${remoteFunc.url}`,
+        method: remoteFunc.method,
+        headers: remoteFunc.headers
+      };
+      let params = { ...remoteFunc.params };
+      if (remoteFunc.needPage) {
+        params.pageNum = 1;
+        params.pageSize = 20;
+      }
+      if (remoteFunc.method.toLowerCase() === "get") {
+        requestConfig.params = params;
+      } else {
+        params = Object.assign(params, this.models);
+        requestConfig.data = params;
+      }
+      this.axios(requestConfig).then(res => {
+        this.$emit("button-submit", requestConfig);
+      });
+    }
+  }
 };
 </script>
 

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

@@ -4,7 +4,7 @@
     :style="{ width: widget.options.width }"
     :disabled="widget.options.disabled"
     :min="widget.options.min"
-    :max="widget.options.max"
+    :max="widget.options.max || 99999"
     @change="handleEventAction(widget.events.onChange)"
   >
     <template v-if="widget.options.buttonType">

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

@@ -12,6 +12,7 @@
     :editable="widget.options.editable"
     :clearable="widget.options.clearable"
     :value-format="widget.options.format"
+    :format="widget.options.format"
     @change="handleEventAction(widget.events.onChange)"
     @focus="handleEventAction(widget.events.onFocus)"
     @blur="handleEventAction(widget.events.onBlur)"

package/packages/FormMaking/custom/items/grid_dev.vue

@@ -83,9 +83,9 @@ export default {
         return false;
       }
 
-      const key =
-        Date.parse(new Date()) + "_" + Math.ceil(Math.random() * 99999);
-      if (!newComponent.model) {
+      if (!newComponent.key) {
+        const key =
+          Date.parse(new Date()) + "_" + Math.ceil(Math.random() * 99999);
         newComponent.key = key;
         newComponent.model = `${newComponent.type}_${key}`;
       }

package/packages/FormMaking/custom/items/tableH5_dev.vue

@@ -83,9 +83,9 @@ export default {
         return false;
       }
 
-      const key =
-        Date.parse(new Date()) + "_" + Math.ceil(Math.random() * 99999);
-      if (!newComponent.model) {
+      if (!newComponent.key) {
+        const key =
+          Date.parse(new Date()) + "_" + Math.ceil(Math.random() * 99999);
         newComponent.key = key;
         newComponent.model = `${newComponent.type}_${key}`;
       }

package/packages/FormMaking/custom/items/table_dev.vue

@@ -70,9 +70,9 @@ export default {
         return false;
       }
 
-      const key =
-        Date.parse(new Date()) + "_" + Math.ceil(Math.random() * 99999);
-      if (!newComponent.model) {
+      if (!newComponent.key) {
+        const key =
+          Date.parse(new Date()) + "_" + Math.ceil(Math.random() * 99999);
         newComponent.key = key;
         newComponent.model = `${newComponent.type}_${key}`;
       }

package/packages/FormMaking/custom/items/tabs_dev.vue

@@ -84,9 +84,9 @@ export default {
         return false;
       }
 
-      const key =
-        Date.parse(new Date()) + "_" + Math.ceil(Math.random() * 99999);
-      if (!newComponent.model) {
+      if (!newComponent.key) {
+        const key =
+          Date.parse(new Date()) + "_" + Math.ceil(Math.random() * 99999);
         newComponent.key = key;
         newComponent.model = `${newComponent.type}_${key}`;
       }