Merge remote-tracking branch 'origin/master'

dsl/build.sh

@@ -6,19 +6,23 @@ codePath=/data3/thinkingwms-ui
 gitUrlArr=(
   "http://git.yvanui.com/jztd/thinkingwms-ui.git"
   "http://git.yvanui.com/jztd/yvan-ext.git"
+  "http://git.yvanui.com/jztd/yvan-ext-mobile.git"
 )
 branchArr=(
   "master"
   "master"
+  "master"
 )
 positionArr=(
   "."
   "yvan-ext"
+  "yvan-ext-mobile"
 )
 # 是否需要构建，-1：自动；0：不需要；1：需要
 needBuild=(
-"-1"
-"-1"
+"1"
+"1"
+"1"
 )
 
 echoPrefix="\033[36m+"
@@ -86,6 +90,21 @@ buildCode() {
     echo "yvan-ext 文件未变化"
   fi
 
+  # 构建 yvan-ext-mobile
+  if [ "${needBuild[1]}" != "0" ]; then
+    echo -e "$echoPrefix cd $codePath/yvan-ext-mobile $echoSuffix"
+    cd "$codePath/yvan-ext-mobile"
+    echo -e "$echoPrefix yarn $echoSuffix"
+    yarn
+    echo -e "$echoPrefix yarn link $echoSuffix"
+    yarn link
+    echo -e "$echoPrefix yarn build $echoSuffix"
+    yarn build
+    echo ""
+  else
+    echo "yvan-ext-mobile 文件未变化"
+  fi
+
   # 构建 thinkingwms-ui/client
   if [ "${needBuild[2]}" != "0" ]; then
     echo -e "$echoPrefix cd $codePath/client $echoSuffix"
@@ -98,7 +117,22 @@ buildCode() {
     yarn build
     echo ""
   else
-    echo "thinkingwms-ui 文件未变化"
+    echo "thinkingwms-ui/client 文件未变化"
+  fi
+
+  # 构建 thinkingwms-ui/pda-client
+  if [ "${needBuild[2]}" != "0" ]; then
+    echo -e "$echoPrefix cd $codePath/pda-client $echoSuffix"
+    cd "$codePath/pda-client"
+    echo -e "$echoPrefix yarn $echoSuffix"
+    yarn
+    echo -e "$echoPrefix yarn link yvan-ext-mobile $echoSuffix"
+    yarn link yvan-ext-mobile
+    echo -e "$echoPrefix yarn build $echoSuffix"
+    yarn build
+    echo ""
+  else
+    echo "thinkingwms-ui/pda-client 文件未变化"
   fi
 
   # 构建 java