Merge branch 'test' into release/v0.18.2

vusion · Jul 17, 2024 · d803169 · d803169
2 parents 602ed8e + 0bc9125
commit d803169
Show file tree

Hide file tree

Showing 7 changed files with 99 additions and 39 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -0,0 +1,15 @@
+name: Deploy dev & test
+
+on:
+  push:
+    branches:
+      - test
+      - test/**
+      - test-**
+  # 支持手动触发
+  workflow_dispatch:
+
+jobs:
+  call-tyler:
+    uses: vusion/wexler/.github/workflows/deploy-vant.yml@master
+    secrets: inherit
diff --git a/bin/deploy-lcp-images b/bin/deploy-lcp-images
@@ -17,9 +17,20 @@ components.forEach((component) => {
       commandDrawings = `lcap deploy src-vusion/components/${component.name}/drawings`;
     }
     if (argv.platform) {
-        command = `${command} --platform ${argv.platform}`;
-        commandDrawings = `${commandDrawings} --platform ${argv.platform}`;
+        command += ` --platform ${argv.platform}`;
+        commandDrawings += ` --platform ${argv.platform}`;
     }
+
+    if (argv.username) {
+        command += ` --username ${argv.username}`;
+        commandDrawings += ` --username ${argv.username}`;
+    }
+
+    if (argv.password) {
+        command += ` --password ${argv.password}`;
+        commandDrawings += ` --password ${argv.password}`;
+    }
+
     console.log(command);
     vusion.cli.execSync(command);
     vusion.cli.execSync(commandDrawings);

diff --git a/bin/deploy-lcp-tgz b/bin/deploy-lcp-tgz
@@ -21,7 +21,20 @@ if (fs.existsSync('zip.tgz')) {
 // 复制tgz到zip.tgz
 fs.copyFileSync(tgz, 'zip.tgz');
 
-const command = `lcap deploy zip.tgz --platform ${argv.platform}`;
+let command = `lcap deploy zip.tgz`;
+
+if (argv.platform) {
+  command += ` --platform ${argv.platform}`;
+}
+
+if (argv.username) {
+  command += ` --username ${argv.username}`;
+}
+
+if (argv.password) {
+  command += ` --password ${argv.password}`;
+}
+
 console.log(command);
 vusion.cli.execSync(command);
 vusion.cli.done(`${tgz}`);

diff --git a/package.json b/package.json
@@ -26,11 +26,9 @@
     "lint": "vant-cli lint",
     "test": "jest",
     "copyimg": "node bin/copy-lcp-images ",
-    "build:vusion": "npm run check && npm run genThemeConfig && vue-cli-service library-build --dest dist-theme && npm run copyimg && node ./scripts/lcap && node scripts/i18n/index.js && node ./scripts/ui-json/index.js --dest ./dist-theme/nasl.ui.json && npm run check:api && npm pack",
-    "build:theme": "npm run genThemeConfig && vue-cli-service library-build --dest dist-theme && npm run copyimg && node ./scripts/lcap && node scripts/i18n/index.js && node ./scripts/ui-json/index.js --dest ./dist-theme/nasl.ui.json && npm run check:api && npm pack",
-    "build:theme-local": "npm run genThemeConfig && vue-cli-service library-build --dest dist-theme && npm run copyimg && node ./scripts/lcap && node scripts/i18n/index.js && node ./scripts/ui-json/index.js --dest ./dist-theme/nasl.ui.json && npm run check:api && npm pack",
-    "build2": "vant-cli build",
-    "build": "cross-env scene=desktop vant-cli build",
+    "build:vusion": "npm run genThemeConfig && vue-cli-service library-build --dest dist-theme && npm run copyimg && node ./scripts/lcap && node scripts/i18n/index.js && node ./scripts/ui-json/index.js --dest ./dist-theme/nasl.ui.json && npm run check:api && npm pack",
+    "build": "npm run genThemeConfig && vue-cli-service library-build --dest dist-theme && npm run copyimg && node ./scripts/lcap && node scripts/i18n/index.js && node ./scripts/ui-json/index.js --dest ./dist-theme/nasl.ui.json && npm run check:api && npm pack",
+    "build:cli": "cross-env scene=desktop vant-cli build",
     "release": "vant-cli release",
     "test:watch": "vant-cli test --watch",
     "release:site": "sh docs/site/release.sh",
@@ -39,14 +37,9 @@
     "move-docs": "node bin/move-docs",
     "screenshot": "node bin/screenshot",
     "genThemeConfig": "node ./scripts/genThemeConfig/index.js",
-    "deploy:dev": "node bin/deploy-lcp-tgz --platform=http://defaulttenant.lcap.codewave-dev.163yun.com && lcap deploy dist-theme --platform http://defaulttenant.lcap.codewave-dev.163yun.com && node bin/deploy-lcp-images --platform=http://defaulttenant.lcap.codewave-dev.163yun.com",
-    "deploy:test": "node bin/deploy-lcp-tgz --platform=http://defaulttenant.lcap.codewave-test.163yun.com && lcap deploy dist-theme --platform http://defaulttenant.lcap.codewave-test.163yun.com && node bin/deploy-lcp-images --platform=http://defaulttenant.lcap.codewave-test.163yun.com",
-    "deploy:test-3.4": "node bin/deploy-lcp-tgz --platform=http://defaulttenant.lcap.test33x-lowcode.163yun.com && lcap deploy dist-theme --platform http://defaulttenant.lcap.test33x-lowcode.163yun.com && node bin/deploy-lcp-images --platform=http://defaulttenant.lcap.test33x-lowcode.163yun.com",
-    "deploy:pre": "lcap deploy dist-theme --platform https://defaulttenant.lcap.hadri.163yun.com && node bin/deploy-lcp-images --platform=https://defaulttenant.lcap.hadri.163yun.com",
-    "deploy:online": "lcap deploy dist-theme --platform http://netease-template.lcap.163yun.com &&  node bin/deploy-lcp-images --platform=http://netease-template.lcap.163yun.com",
     "prepublishOnly": "npm run build:vusion && git add .",
-    "deploy:qz": "lcap deploy dist-theme --platform=https://defaulttenant.lcap.qz.163yun.com --username=admin --password=Netease123 && node bin/deploy-lcp-images --platform=https://defaulttenant.lcap.qz.163yun.com",
-    "check:api": "tsc -p tsconfig.api.json"
+    "check:api": "tsc -p tsconfig.api.json",
+    "deploy": "node ./scripts/deploy.js"
   },
   "repository": {
     "type": "git",

diff --git a/scripts/deploy.js b/scripts/deploy.js
@@ -0,0 +1,28 @@
+const vusion = require('vusion-api');
+const argv = require('minimist')(process.argv.slice(2));
+
+let commandTgz = `node bin/deploy-lcp-tgz`;
+let commandDist = `lcap deploy dist-theme`;
+let commandImage = `node bin/deploy-lcp-images`;
+
+if (argv.platform) {
+  commandTgz += ` --platform ${argv.platform}`;
+  commandDist += ` --platform ${argv.platform}`;
+  commandImage += ` --platform ${argv.platform}`;
+}
+
+if (argv.username) {
+  commandTgz += ` --username ${argv.username}`;
+  commandDist += ` --username ${argv.username}`;
+  commandImage += ` --username ${argv.username}`;
+}
+
+if (argv.password) {
+  commandTgz += ` --password ${argv.password}`;
+  commandDist += ` --password ${argv.password}`;
+  commandImage += ` --password ${argv.password}`;
+}
+
+vusion.cli.execSync(commandTgz);
+vusion.cli.execSync(commandDist);
+vusion.cli.execSync(commandImage);
diff --git a/src/dialog/index.less b/src/dialog/index.less
@@ -1,10 +1,10 @@
 @import '../style/var';
 
 .van-dialog {
-  position: fixed;
-  top: 45%;
-  left: 50%;
-  width: @dialog-width;
+  position: fixed !important;
+  top: 45% !important;
+  left: 50% !important;
+  width: @dialog-width !important;
   font-size: @dialog-font-size;
 
   transform: translate3d(-50%, -50%, 0);

diff --git a/src/popup/index.less b/src/popup/index.less
@@ -6,57 +6,57 @@
   }
 
   &-popup {
-    position: fixed;
+    position: fixed !important;
     max-height: 100%;
     overflow-y: auto;
     background-color: @popup-background-color;
     transition: @popup-transition;
     -webkit-overflow-scrolling: touch;
 
     &--center {
-      top: 50%;
-      left: 50%;
-      transform: translate3d(-50%, -50%, 0);
+      top: 50% !important;
+      left: 50% !important;
+      transform: translate3d(-50%, -50%, 0) !important;
 
       &.van-popup--round {
         border-radius: @popup-round-border-radius;
       }
     }
 
     &--top {
-      top: 0;
-      left: 0;
-      width: 100%;
+      top: 0 !important;
+      left: 0 !important;
+      width: 100% !important;
 
       &.van-popup--round {
         border-radius: 0 0 @popup-round-border-radius @popup-round-border-radius;
       }
     }
 
     &--right {
-      top: 50%;
-      right: 0;
-      transform: translate3d(0, -50%, 0);
+      top: 50% !important;
+      right: 0 !important;
+      transform: translate3d(0, -50%, 0) !important;
 
       &.van-popup--round {
         border-radius: @popup-round-border-radius 0 0 @popup-round-border-radius;
       }
     }
 
     &--bottom {
-      bottom: 0;
-      left: 0;
-      width: 100%;
+      bottom: 0 !important;
+      left: 0 !important;
+      width: 100% !important;
 
       &.van-popup--round {
         border-radius: @popup-round-border-radius @popup-round-border-radius 0 0;
       }
     }
 
     &--left {
-      top: 50%;
-      left: 0;
-      transform: translate3d(0, -50%, 0);
+      top: 50% !important;
+      left: 0 !important;
+      transform: translate3d(0, -50%, 0) !important;
 
       &.van-popup--round {
         border-radius: 0 @popup-round-border-radius @popup-round-border-radius 0;
@@ -84,22 +84,22 @@
 
     &-slide-top-enter,
     &-slide-top-leave-active {
-      transform: translate3d(0, -100%, 0);
+      transform: translate3d(0, -100%, 0) !important;
     }
 
     &-slide-right-enter,
     &-slide-right-leave-active {
-      transform: translate3d(100%, -50%, 0);
+      transform: translate3d(100%, -50%, 0) !important;
     }
 
     &-slide-bottom-enter,
     &-slide-bottom-leave-active {
-      transform: translate3d(0, 100%, 0);
+      transform: translate3d(0, 100%, 0) !important;
     }
 
     &-slide-left-enter,
     &-slide-left-leave-active {
-      transform: translate3d(-100%, -50%, 0);
+      transform: translate3d(-100%, -50%, 0) !important;
     }
 
     &__close-icon {