Merge branch 'dev'

Author: levy

docs/basic.md

@@ -61,11 +61,14 @@ export default {
           label: 'type',
           default: [],
           options: [{
-            label: 'typeA'
+            label: 'typeA',
+            value: 'A'
           }, {
-            label: 'typeB'
+            label: 'typeB',
+            value:'B'
           }, {
-            label: 'typeC'
+            label: 'typeC',
+            value: 'C'
           }],
           rules: [
             { type: 'array', required: true, message: 'miss type', trigger: 'change' }

docs/slot-label.md

@@ -8,7 +8,14 @@
 <script>
 export default {
   data () {
-    const h = this.$createElement
+    /**
+     * 如果 babel-plugins-transform-vue-jsx 版本低于 3.4.0，jsx 作用域中需要如下定义 h
+     * 下面的代码可确保在 CI 环境不报错！
+     * @see: https://cn.vuejs.org/v2/guide/render-function.html#JSX
+    */
+    if (typeof h === 'undefined') {
+      h = this.$createElement
+    }
     return {
       content: [
         {

netlify.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+echo "is netlify: $NETLIFY"
+echo "in branch: $BRANCH"
+echo "head: $HEAD"
+
+if [ "$NETLIFY" != "true" ]
+then
+  echo "this script only runs in netlify, bye"
+  exit 1
+fi
+
+if [ "$BRANCH" != "dev" ] && [ "$HEAD" != "dev" ]
+then
+  yarn doc
+else
+  echo "this script only runs in targeting dev's PR deploy preview, bye"
+fi

notify.sh

@@ -1,16 +1,32 @@
 #!/bin/sh
+# https://stackoverflow.com/questions/13872048/bash-script-what-does-bin-bash-mean
+echo "1/5: checking TRAVIS_TEST_RESULT"
 if [ "$TRAVIS_TEST_RESULT" != "0" ]
 then
   echo "build not success, bye"
   exit 1
 fi
 
-git remote add github https://$GITHUB_TOKEN@github.com/FEMessage/el-form-renderer.git > /dev/null 2>&1
+ORG_NAME=$(echo "$TRAVIS_REPO_SLUG" | cut -d '/' -f 1)
+REPO_NAME=$(echo "$TRAVIS_REPO_SLUG" | cut -d '/' -f 2)
+
+echo "2/5: pushing commit and tag to github"
+# 该命令很可能报错，但不影响实际进行，因而不能简单地在脚本开头 set -e 
+git remote add github https://$GITHUB_TOKEN@github.com/$TRAVIS_REPO_SLUG.git > /dev/null 2>&1
 git push github HEAD:master --follow-tags
 
+echo "3/5: generating github release notes"
 GREN_GITHUB_TOKEN=$GITHUB_TOKEN yarn release
 
-url=https://api.github.com/repos/FEMessage/el-form-renderer/releases/latest
+# 避免发送错误信息
+if [ $? -ne 0 ]
+then
+  echo "gren fails, bye"
+  exit 1
+fi
+
+echo "4/5: downloading github release info"
+url=https://api.github.com/repos/$TRAVIS_REPO_SLUG/releases/latest
 resp_tmp_file=resp.tmp
 
 curl -H "Authorization: token $GITHUB_TOKEN" $url > $resp_tmp_file
@@ -19,8 +35,11 @@ html_url=$(sed -n 5p $resp_tmp_file | sed 's/\"html_url\"://g' | awk -F '"' '{pr
 body=$(grep body < $resp_tmp_file | sed 's/\"body\"://g;s/\"//g')
 version=$(echo $html_url | awk -F '/' '{print $NF}')
 
-msg='{"msgtype": "markdown", "markdown": {"title": "el-form-renderer更新", "text": "@所有人\n# [el-form-renderer('$version')]('$html_url')\n'$body'"}}'
+echo "5/5: notifying with dingtalk bot"
+msg='{"msgtype": "markdown", "markdown": {"title": "'$REPO_NAME'更新", "text": "@所有人\n# ['$REPO_NAME'('$version')]('$html_url')\n'$body'"}}'
 
 curl -X POST https://oapi.dingtalk.com/robot/send\?access_token\=$DINGTALK_ROBOT_TOKEN -H 'Content-Type: application/json' -d "$msg"
 
 rm $resp_tmp_file
+
+echo "executing notify.sh successfully"

package.json

@@ -59,7 +59,7 @@
     "@babel/plugin-transform-runtime": "^7.4.3",
     "@babel/preset-env": "^7.4.3",
     "@femessage/el-semver-input": "^1.1.3",
-    "@femessage/github-release-notes": "^0.19.0",
+    "@femessage/github-release-notes": "latest",
     "@vue/test-utils": "^1.0.0-beta.30",
     "axios": "^0.19.0",
     "babel-core": "^7.0.0-bridge.0",
@@ -104,7 +104,7 @@
     "node": ">= 4.0.0",
     "npm": ">= 3.0.0"
   },
-  "vue-sfc-cli": "1.10.6",
+  "vue-sfc-cli": "1.12.0",
   "browserslist": [
     "> 1%",
     "last 2 versions",

src/components/render-form-item.vue

@@ -43,9 +43,12 @@
         <!-- TODO: 支持 el-checkbox-button 变体 -->
         <el-checkbox
           v-else-if="data.type === 'checkbox-group'"
-          :key="opt.label"
+          :key="opt.value"
           v-bind="opt"
-        />
+          :label="'value' in opt ? opt.value : opt.label"
+        >
+          {{ opt.label }}
+        </el-checkbox>
         <!-- WARNING: radio 用 label 属性来表示 value 的含义 -->
         <!-- FYI: radio 的 value 属性可以在没有 radio-group 时用来关联到同一个 v-model -->
         <el-radio

yarn.lock

@@ -743,7 +743,7 @@
   resolved "https://registry.npm.taobao.org/@femessage/el-semver-input/download/@femessage/el-semver-input-1.1.3.tgz#1b5d0d44a82b7aa8b83043f145a95d3dc2001e19"
   integrity sha1-G10NRKgreqi4MEPxRaldPcIAHhk=
 
-"@femessage/github-release-notes@^0.19.0":
+"@femessage/github-release-notes@latest":
   version "0.19.0"
   resolved "https://registry.npmjs.org/@femessage/github-release-notes/-/github-release-notes-0.19.0.tgz#483767c6a52d3a1086000442580503fed72a0898"
   integrity sha512-p97YOnBoLfgiWknF5bzqlUOTHIBcBpI8L7bpekPls3annTV65TGfdkl2ICZZAvhjIcl9usDqGFj6pJWj+R+Rzw==