fix: merge

.gitlab-ci.yml

@@ -16,21 +16,21 @@ before_script:
 init:
   stage: init
   script:
-    - cd /d %DEPLOY_PATH%/src/wisdom-components
+    - 'cd ${DEPLOY_PATH}/src/wisdom-components'
     - dir
     - git pull
-    - npm install
+    - npm install --registry=https://g.civnet.cn:4873/
 
 bootstrap:
   stage: bootstrap
   script:
-    - cd /d %DEPLOY_PATH%/src/wisdom-components
+    - 'cd ${DEPLOY_PATH}/src/wisdom-components'
     - dir
 
 build:
   stage: build
   script:
-    - cd /d %DEPLOY_PATH%/src/wisdom-components
+    - 'cd ${DEPLOY_PATH}/src/wisdom-components'
     - echo 开始打包...
     - npm run site
     - echo 打包完成
@@ -38,7 +38,7 @@ build:
 release:
   stage: release
   script:
-    - cd /d %DEPLOY_PATH%/src/wisdom-components
+    - 'cd ${DEPLOY_PATH}/src/wisdom-components'
     - echo 开始拷贝发布包...
-    - robocopy dist %DEPLOY_PATH%/dist /e ||  cmd /c "exit /b 0"
+    - 'robocopy "${DEPLOY_PATH}/src/wisdom-components/dist" "${DEPLOY_PATH}/dist" /S ; IF ((${LASTEXITCODE} -le 8)) {cmd /c "exit /b 0"}'
     - echo 发布完成.

package.json

@@ -147,7 +147,6 @@
     "@wisdom-components/basictable": "^1.5.14",
     "@wisdom-components/empty": "^1.3.9",
     "@wisdom-components/exportexcel": "^1.1.2",
-    "@wisdom-components/rich": "file:packages/base-components/rich",
     "@wisdom-components/timerangepicker": "^1.3.4",
     "@wisdom-utils/utils": "0.0.46",
     "classnames": "^2.2.6",
@@ -158,7 +157,7 @@
     "js-export-excel": "^1.1.4",
     "jszip": "^3.5.0",
     "mqtt-client": "^1.0.12",
-    "parseForm": "0.0.8",
+    "parseForm": "1.0.0",
     "sha1": "^1.1.1"
   },
   "size-limit": [

packages/base-components/ExportExcel/src/ExportExcel.md

@@ -9,7 +9,7 @@ group:
 
 # PandaExportExcel Excel 表格导出
 
-<code src="./demos/Base.tsx">
+<code src="./demos/base.tsx">
 
 ## API
 

packages/base-components/ParseForm/package.json

@@ -26,6 +26,6 @@
   "dependencies": {
     "@babel/runtime": "^7.17.9",
     "form-render": "^0.9.12",
-    "parseForm": "^0.0.8"
+    "parseForm": "^1.0.0"
   }
 }

packages/base-components/RealTimeInfo/src/demos/Basic.tsx

 import React, { useEffect, useState } from 'react';
-import Empty from '@wisdom-components/Empty';
+import Empty from '@wisdom-components/empty';
 import RealTimeInfo from '../index';
 import request from 'umi-request';