Merge branch 'master' of github.com:JSON-Drived-Configurable-Platform/form-generator-iview

Author: BingBlog

.github/workflows/main.yml

@@ -0,0 +1,59 @@
+# This is a basic workflow to help you get started with Actions
+
+name: CI
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events but only for the master branch
+on:
+    push:
+        branches: [ master ]
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+    # This workflow contains a single job called "build"
+    build:
+        # The type of runner that the job will run on
+        runs-on: ubuntu-latest
+
+        # Steps represent a sequence of tasks that will be executed as part of the job
+        steps:
+            # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+            - uses: actions/checkout@v2
+              with:
+                  persist-credentials: false
+
+            # Runs a set of commands using the runners shell
+            - name: Run a multi-line script
+              run: |
+                  npm install --dev
+                  npm run build-website
+
+            # The project is then uploaded as an artifact named 'site'.
+            - name: Upload Artifacts
+              uses: actions/upload-artifact@v1
+              with:
+                  name: site
+                  path: gh-pages
+
+    deploy:
+        needs: [build]
+        runs-on: ubuntu-latest
+        steps:
+            - name: Checkout 🛎️
+              uses: actions/checkout@v2
+              with:
+                  persist-credentials: false
+
+            # The built project is downloaded into the 'site' folder.
+            - name: Download Artifacts
+              uses: actions/download-artifact@v1
+              with:
+                  name: site
+
+            # Deploy
+            - name: Deploy to GitHub Pages
+              uses: JamesIves/github-pages-deploy-action@3.5.2
+              with:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+                  BRANCH: gh-pages # The branch the action should deploy to.
+                  FOLDER: "site" # The folder the action should deploy.

.travis.yml

@@ -26,6 +26,15 @@ A form generator with json schema based on iview ui.
 
 `yarn run dev`
 
+## deploy github page
+
+提交PR之前需要提供demo以供验证，需要部署到github page上
+github page需要设置为gh-pages分支
+目前使用了github action来自动部署，需要fork后开启actions
+
+
+`yarn run deployDoc remoteName`
+
 ## production
 
 `yarn run build`

README.md

@@ -1,6 +1,6 @@
 {
     "name": "form-generator-iview",
-    "version": "0.1.1-beta",
+    "version": "0.1.4-beta",
     "title": "formGeneratorIView",
     "description": "A form generator with json schema based on iview ui",
     "keywords": [
@@ -25,8 +25,7 @@
         "build-prod": "webpack --color --progress --config build/webpack.dist.prod.config.js",
         "build": "npm run build-dev && npm run build-prod",
         "lint": "eslint --fix --ext .js,.vue,.json src --fix --ext .json docs/website-data-api",
-        "deploy": "fis3 release --root=./website/dist/ --file=./deploy-baidu/config.js",
-        "deployDoc": "bash ./manualDeploy.sh"
+        "deploy": "fis3 release --root=./website/dist/ --file=./deploy-baidu/config.js"
     },
     "repository": {
         "type": "git",

deploy.sh

@@ -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

manualDeploy.sh

@@ -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>

package.json

@@ -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 : '';
         },