Merge pull request #116 from Tobin1990/master

Poptip和carousel增加配置项

Author: zhengxkq

src/fieldGenerator.vue

@@ -47,6 +47,7 @@
             @on-http-request="handleHttpRequest($event)"
             @on-reset-click="handleResetClick"
             @on-button-event="handleButtonClick"
+            @on-button-cancel="handleButtonCancel"
             @on-checkboxCard-click="handelCheckboxCardClick"
             @on-list-item-click="handelListItemClick"
         />
@@ -275,6 +276,9 @@ export default {
         handleButtonClick($event) {
             this.$emit('on-button-event', $event);
         },
+        handleButtonCancel($event) {
+            this.$emit('on-button-cancel', $event);
+        },
         handleIconClick() {
             this.$emit('on-label-tip-click',{
                 field: this.field

src/fields/fieldButton.vue

@@ -5,7 +5,10 @@
         :title="field.confirmPoptip.title"
         :placement="field.confirmPoptip.placement"
         :class="classes"
+        :ok-text="field.confirmPoptip.okText"
+        :cancel-text="field.confirmPoptip.cancelText"
         @on-ok="handleClick"
+        @on-cancel="handelCancel"
     >
         <Button
             :type="field.subtype || 'default'"
@@ -83,6 +86,9 @@ export default {
                     break;
             }
         },
+        handelCancel() {
+            this.$emit('on-button-cancel', this);
+        }
     },
 };
 </script>

src/fields/fieldCarousel.vue

@@ -3,6 +3,7 @@
         <Carousel
             :value="currentIndex"
             :loop="field.loop"
+            :arrow="computedArrow"
             @on-change="handleChange"
         >
             <CarouselItem
@@ -63,6 +64,12 @@ export default {
             }
             return this.options.length > 0 ? this.options : fieldOptions;
         },
+        computedArrow() {
+            if (this.computedOptions.length > 1) {
+                return this.field.arrow || 'hover';
+            }
+            return 'never';
+        },
         optionsApi() {
             return !Array.isArray(this.field.options) ? this.field.options : '';
         },

src/formGenerator.vue

@@ -45,6 +45,7 @@
                     @on-submit="handleSubmit($event)"
                     @on-reset="handleReset"
                     @on-button-event="handleButtonEvent($event)"
+                    @on-button-cancel="handleButtonCancel"
                     @on-checkboxCard-click="handelCheckboxCardClick"
                     @on-list-item-click="handelListItemClick"
                     @on-label-tip-click="handelLabelTipClick"
@@ -410,6 +411,10 @@ export default {
             this.$emit('on-button-event', $event);
         },
 
+        handleButtonCancel($event) {
+            this.$emit('on-button-cancel', $event);
+        },
+        
         handelCheckboxCardClick(value) {
             this.$emit('on-checkboxCard-click', value);
         },

website/code/doc/button.js

@@ -243,7 +243,9 @@ const confirm = {};
 const confirmField = {
     confirmPoptip: {
         title: '确定删除?',
-        placement: 'right'
+        placement: 'right',
+        cancelText: '你好',
+        okText: '不好'
     },
     type: 'Button',
     text: '删除',
@@ -272,6 +274,9 @@ export default {
     methods: {
         handleFieldChange(model, value) {
             console.log(model, value);
+        },
+        handleButtonCancel(val) {
+            console.log(val);
         }
     }
 };
@@ -280,7 +285,8 @@ export default {
     <Form :model="model">
         <FieldGenerator
             :field="field"
-            @on-field-change="handleFieldChange"
+            @on-field-change="handleFieldChange",
+            @on-button-cancel="handleButtonCancel"
         />
     </Form>
 </template>

website/page/doc/Button/index.vue

@@ -53,6 +53,18 @@
                             <td>Object</td>
                             <td>-</td>
                         </tr>
+                        <tr>
+                            <td>confirmPoptip.okText</td>
+                            <td>确定按钮的文字，只在 confirm 模式下有效</td>
+                            <td>String</td>
+                            <td>确定</td>
+                        </tr>
+                        <tr>
+                            <td>confirmPoptip.cancelText</td>
+                            <td>取消按钮的文字，只在 confirm 模式下有效</td>
+                            <td>String</td>
+                            <td>取消</td>
+                        </tr>
                         <tr>
                             <td>confirmPoptip.placement</td>
                             <td>确认提示弹框的的位置</td>
@@ -161,6 +173,14 @@
                             </td>
                             <td>-</td>
                         </tr>
+                        <tr>
+                            <td>on-button-cancel</td>
+                            <td>
+                                点击取消的回调，只在 confirm 模式下有效
+                            </td>
+                            <td>--</td>
+                            <td>-</td>
+                        </tr>
                     </tbody>
                 </table>
             </div>
@@ -251,6 +271,7 @@
                         <FieldGenerator
                             :field="code.confirm.data.field"
                             @on-button-event="handleButtonEvent"
+                            @on-button-cancel="handleButtonCancel"
                         />
                     </Form>
                 </div>
@@ -286,6 +307,11 @@ export default {
             // eslint-disable-next-line no-console
             console.log($event);
             this.$Message.info(`event: ${$event.name} has been triggered`);
+        },
+        handleButtonCancel($event) {
+            // eslint-disable-next-line no-console
+            console.log($event);
+            // this.$Message.info(`event: ${$event.name} has been triggered`);
         }
     }
 };

website/page/examples/CURD-example/simple.config.js

@@ -170,14 +170,7 @@ export const data = [
         status: '1',
         city: [
             {
-                value: 'beijing',
-                label: '北京',
                 url: 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1574076041&di=dba60f4ce2b9330e330f13546ce963a0&imgtype=jpg&er=1&src=http%3A%2F%2Fwww.ijointoo.com%2Fdata%2Fnews%2Fimages%2F1521193045383.jpg'
-            },
-            {
-                value: 'shanghai',
-                label: '上海',
-                url: 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1573481458804&di=5814ac5f18a6f1e9e67aa92db3557f84&imgtype=0&src=http%3A%2F%2Fimg.pconline.com.cn%2Fimages%2Fupload%2Fupc%2Ftx%2Fitbbs%2F1503%2F18%2Fc27%2F4042859_1426655007661_mthumb.jpg'
             }
         ]
     },
@@ -193,11 +186,6 @@ export const data = [
                 value: 'beijing',
                 label: '北京',
                 url: 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1574076041&di=dba60f4ce2b9330e330f13546ce963a0&imgtype=jpg&er=1&src=http%3A%2F%2Fwww.ijointoo.com%2Fdata%2Fnews%2Fimages%2F1521193045383.jpg'
-            },
-            {
-                value: 'shanghai',
-                label: '上海',
-                url: 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1573481458804&di=5814ac5f18a6f1e9e67aa92db3557f84&imgtype=0&src=http%3A%2F%2Fimg.pconline.com.cn%2Fimages%2Fupload%2Fupc%2Ftx%2Fitbbs%2F1503%2F18%2Fc27%2F4042859_1426655007661_mthumb.jpg'
             }
         ]
     },