@cloudbase/weda-ui 3.1.6 → 3.2.0

package/dist/web/components/listView/interface.d.ts

@@ -120,3 +120,8 @@ export interface IListView extends IDataContainer {
      */
     isRecords?: boolean;
 }
+/**
+ * 查询状态
+ * 成功｜失败｜空｜加载中｜初始化
+ */
+export declare type IStatus = 'success' | 'fail' | 'empty' | 'loading' | '';

package/dist/web/components/lottery/index.js

@@ -80,12 +80,13 @@ export default React.forwardRef(function Lottery({ className, id, style, prizeLi
                 });
                 setLotteryList(list);
                 setActivedId(-1);
+                // eslint-disable-next-line rulesdir/no-timer
                 setTimeout(() => {
                     events.finishLottery({
                         prize: idx,
                         result: list[idx - 1],
                     });
-                    //延迟700毫秒显示的视觉效果更好，否则看不清结果就弹出dialog盖住了
+                    // 延迟700毫秒显示的视觉效果更好，否则看不清结果就弹出dialog盖住了
                 }, 700);
             }
         };

package/dist/web/components/lottery/lotteryUtil.js

@@ -1,3 +1,4 @@
+/* eslint-disable rulesdir/no-timer */
 export default class LotteryAction {
     constructor() {
         Object.defineProperty(this, "idx", {

package/dist/web/components/navigationBar/index.css

@@ -50,8 +50,8 @@
   .wedatea2td-menu__title
   .wedatea2td-menu__title-icon {
   display: block;
-  width: 2.28571em;
-  height: 2.28571em;
+  width: 2.28571rem;
+  height: 2.28571rem;
   margin-right: 0.85714rem;
 }
 
@@ -60,8 +60,7 @@
   .weda-menu__menu-content
   .wedatea2td-menu__title
   .wedatea2td-h2 {
-  font-size: 1.1428571em;
-  line-height: 1.28571em;
+  font-size: 1.14286rem;
   color: #000000;
   margin-top: 0;
   font-weight: normal;
@@ -85,8 +84,8 @@
   .wedatea2td-menu__body
   .wedatea2td-menu__item
   .wedatea2td-menu__list-icon {
-  width: 1.42857em;
-  height: 1.42857em;
+  width: 1.42857rem;
+  height: 1.42857rem;
   margin-top: 0;
 }
 
@@ -96,12 +95,10 @@
   .wedatea2td-menu__item
   .wedatea2td-menu__text {
   font-weight: normal;
-  font-size: 1em;
-  line-height: 1.5714em;
+  font-size: 1rem;
   color: rgba(0, 0, 0, 0.9);
   padding: 0;
 }
-
 .weda-menu .weda-menu__menu-content .wedatea2td-icon-arrowdown,
 .weda-menu
   .weda-menu__menu-content
@@ -298,8 +295,7 @@
 
 .weda-menu-horizontal .weda-menu__nav .weda-menu__nav-title .weda-menu__title {
   font-weight: normal;
-  font-size: 1.14285em;
-  line-height: 1.28571rem;
+  font-size: 1.14286rem;
   color: #000000;
   margin-left: 0.85714rem;
 }
@@ -410,8 +406,7 @@
 
 .weda-menu-horizontal .wedatea2td-dropdown .wedatea2td-dropdown__value {
   font-weight: 400;
-  font-size: 1em;
-  line-height: 1.5714em;
+  font-size: 1rem;
   color: #000000;
   white-space: nowrap;
 }
@@ -437,8 +432,7 @@
   .weda-menu__dropdown
   .wedatea2td-dropdown__value {
   font-weight: normal;
-  font-size: 1em;
-  line-height: 1.5714em;
+  font-size: 1rem;
   color: #000000;
   padding: 0;
   white-space: nowrap;
@@ -450,7 +444,7 @@
   .wedatea2td-dropdown__header {
   padding-left: 0;
   padding-right: 1.64286rem;
-  height: 21.5714em;
+  height: 1.57143rem;
 }
 
 .weda-menu-horizontal
@@ -515,8 +509,7 @@
   margin-bottom: 0.28571rem;
   color: rgba(0, 0, 0, 0.9);
   font-weight: 400;
-  font-size: 1em;
-  line-height: 1.5714em;
+  font-size: 1rem;
 }
 
 .weda-menu__dropdown-menu-list .weda-menu__dropdown-list-item:last-child {
@@ -543,7 +536,7 @@
   align-items: center;
   justify-content: space-between;
   padding: 0 1.42857rem 0 1.14286rem;
-  height: 4.5714em;
+  height: 4.57143rem;
   background-color: #fff;
   position: relative;
   box-shadow: 0 0.14286rem 0.14286rem rgba(0, 0, 0, 0.05);
@@ -557,8 +550,7 @@
 
 .weda-menu-mobile .weda-menu__bar-main .weda-menu__main-logo {
   font-weight: normal;
-  font-size: 1.28571em;
-  line-height: 1.28571em;
+  font-size: 1.28571rem;
   color: #000000;
   text-decoration: none;
   display: flex;
@@ -566,8 +558,8 @@
 }
 
 .weda-menu-mobile .weda-menu__bar-main .weda-menu__main-icon {
-  width: 2.2857em;
-  height: 2.2857em;
+  width: 2.28571rem;
+  height: 2.28571rem;
   margin-right: 0.85714rem;
 }
 
@@ -579,8 +571,8 @@
 
 .weda-menu-mobile .weda-menu__bar-extra .weda-menu__bar-btn,
 .weda-menu-mobile .weda-menu__bar-extra .weda-menu__bar-btn--close {
-  width: 1.71428em;
-  height: 1.71428em;
+  width: 1.71429rem;
+  height: 1.71429rem;
 }
 
 .weda-menu__drawer {
@@ -676,14 +668,12 @@
   .wedatea2td-menu__submenu
   .wedatea2td-menu__list
   .wedatea2td-menu__text {
-  font-size: 1.14285em;
-  line-height: 1.142857em;
+  font-size: 1.14286rem;
   color: rgba(0, 0, 0, 0.9);
   padding: 0;
   max-width: 100%;
   font-weight: normal;
 }
-
 .weda-menu__drawer
   .weda-menu__drawer-menu
   .wedatea2td-menu__submenu
@@ -719,7 +709,7 @@
 .weda-menu__fonticon.lcap-icon,
 .weda-menu__fonticon.t-icon {
   margin: 0 0.28571rem 0 0;
-  font-size: 1em;
+  font-size: 1rem;
 }
 .weda-menu__fonticon.lcap-icon:hover {
   background-color: unset;
@@ -729,11 +719,13 @@
   display: flex;
   justify-content: center;
   align-items: center;
+  line-height: 1.2;
 }
 .weda-menu__drawer .wedatea2td-menu__text .menu-text {
   display: flex;
   justify-content: center;
   align-items: center;
+  line-height: 1.2;
 }
 .weda-menu-mobile .weda-menu__wrapper .weda-menu__bar-main {
   height: 4.57143rem;

package/dist/web/components/richText/index.css

@@ -100,6 +100,7 @@
 
 .weda-richText .weda-formcells__content.weui-flex__item {
   margin-top: 1.14286rem;
+  margin-bottom: 1.14286rem;
 }
 
 .weda-richText .bf-font-size-dropdown {

package/dist/web/components/swiper/index.js

@@ -12,9 +12,10 @@ export default function Swiper({ children, className, style, autoplay = true, ci
     const [swipeStyle, setSwipeStyle] = useState(null);
     const [height, setHeight] = useState(0);
     const { change = () => { } } = events;
-    // 自动切换
     useEffect(() => {
         if (autoplay) {
+            // 自动切换
+            // eslint-disable-next-line rulesdir/no-timer
             const timer = setInterval(() => {
                 setIndex(currentIndex + 1);
             }, interval);
@@ -57,6 +58,8 @@ export default function Swiper({ children, className, style, autoplay = true, ci
                 setSwipeStyle({
                     transform: `translate3d(0, 0, 0)`,
                 });
+            // 不知道
+            // eslint-disable-next-line rulesdir/no-timer
             setTimeout(() => {
                 setSwipeStyle({
                     transform: vertical
@@ -75,6 +78,7 @@ export default function Swiper({ children, className, style, autoplay = true, ci
                         ? `translate3d(0, -${(to + 2) * 100}%, 0)`
                         : `translate3d(-${(to + 2) * 100}%, 0, 0)`,
                 });
+            // eslint-disable-next-line rulesdir/no-timer
             setTimeout(() => {
                 setSwipeStyle({
                     transform: vertical

package/dist/web/components/wedaVideo/index.js

@@ -113,6 +113,7 @@ const WedaVideo = ({ className, style, id, videoDataSource, posterImage, autoPla
                         return;
                     if (currentTime > endTime) {
                         players.currentTime(startTime);
+                        // eslint-disable-next-line rulesdir/no-timer
                         setTimeout(() => {
                             !loopPlay && players.pause();
                         }, 200);

package/dist/web/utils/getUserService.d.ts

@@ -0,0 +1,17 @@
+/**
+ * 根据_id查询用户数据
+ *
+ */
+export function getUserById(data: any): Promise<any>;
+/**
+ * 根据_id查询部门数据
+ *
+ */
+export function getDepartById(data: any): Promise<any>;
+export function initRootOrgs(data: any): Promise<any>;
+export function getDeparts(data: any): Promise<any>;
+export function searchByCondition(data: any): Promise<any>;
+export function userDepartRequest(action: any, params: {}, callback: any): Promise<any>;
+export function defaultRequest(action: any, params: any, type?: any): Promise<any>;
+export function getDataSourceByName(dbName: any): Promise<any>;
+export function getUserInfo(): Promise<any>;

package/dist/web/utils/getUserService.js

@@ -0,0 +1,148 @@
+import { callWedaApi, callDataSource } from './tcb';
+export const userDepartRequest = (action, params = {}, callback) => {
+    if (callback) {
+        return Promise.resolve(callback(action, params));
+    }
+    return defaultRequest(action, params);
+};
+/**
+ * 默认请求统一处理方法
+ * @param {*} action
+ * @param {*} params
+ * @param {*} type
+ * @returns
+ */
+export const defaultRequest = async (action, params, type = 'callWedaApi') => {
+    try {
+        if (type === 'callWedaApi') {
+            const res = await callWedaApi({
+                action: action,
+                data: params,
+            });
+            return res;
+        }
+    }
+    catch (error) {
+        console.error(action + '错误', error);
+        throw errorHandle(error, action);
+    }
+};
+/**
+ * 获取用户表schema
+ */
+export const getDataSourceByName = async (dbName) => {
+    // dbName 为空时
+    if (!dbName)
+        return;
+    const datasource = await window.app.cloud.getDataSourceProfile(dbName);
+    return datasource;
+};
+/**
+ * 根据_id查询用户数据
+ *
+ */
+export async function getUserById(data) {
+    try {
+        const datasource = await getDataSourceByName('sys_user');
+        const res = await callDataSource({
+            dataSourceName: 'sys_user',
+            methodName: 'wedaGetItem',
+            params: data,
+        });
+        return res[datasource === null || datasource === void 0 ? void 0 : datasource.schema['x-primary-column']];
+    }
+    catch (error) {
+        console.error('错误', error);
+        throw errorHandle(error, 'getUserById');
+    }
+}
+/**
+ * 根据_id查询部门数据
+ *
+ */
+export async function getDepartById(data) {
+    try {
+        const datasource = await getDataSourceByName('sys_department');
+        const res = await callDataSource({
+            dataSourceName: 'sys_department',
+            methodName: 'wedaGetItem',
+            params: data,
+        });
+        return res[datasource === null || datasource === void 0 ? void 0 : datasource.schema['x-primary-column']];
+    }
+    catch (error) {
+        console.error('错误', error);
+        throw errorHandle(error, 'getDepartById');
+    }
+}
+/**
+ *  获取当前登录人信息
+ * */
+export const getUserInfo = () => {
+    var _a, _b;
+    const userInfo = (_b = (_a = window === null || window === void 0 ? void 0 : window.app) === null || _a === void 0 ? void 0 : _a.auth) === null || _b === void 0 ? void 0 : _b.getUserInfo();
+    return Promise.resolve(userInfo);
+};
+/*
+ * 初始化加载部门数据
+ * @author servernnyu
+ */
+export async function initRootOrgs(data) {
+    try {
+        const res = await callWedaApi({
+            action: 'InitRootOrgs',
+            data,
+        });
+        return res;
+    }
+    catch (error) {
+        console.error('错误', error);
+        throw errorHandle(error, 'InitRootOrgs');
+    }
+}
+/*
+ * 懒加载部门数据 LazyDescribeOrgs
+ * OrgId：组织架构Id，为根节点就不传了，我就会去查根节点
+ * DescribeCondition：查询条件，现在可以传{"Key":"NeedUser","Value": "true"}
+ */
+export async function getDeparts(data) {
+    try {
+        const res = await callWedaApi({
+            action: 'LazyDescribeOrgs',
+            data,
+        });
+        return res;
+    }
+    catch (error) {
+        console.error('错误', error);
+        throw errorHandle(error, 'LazyDescribeOrgs');
+    }
+}
+/*
+ SearchByCondition接口
+入参：
+KeyWords：关键词
+SearchCondition：搜索条件，当前要传俩，一个是是否关联用户同上，一个是SeachType，SearchByRole和SearchByOrg, NeedUser
+ */
+export async function searchByCondition(data) {
+    try {
+        const res = await callWedaApi({
+            action: 'SearchByCondition',
+            data,
+        });
+        return res;
+    }
+    catch (error) {
+        console.error('错误', error);
+        throw errorHandle(error, 'SearchByCondition');
+    }
+}
+const errorHandle = (error, action) => {
+    var _a;
+    if (error === null || error === void 0 ? void 0 : error.result) {
+        return `${(_a = error === null || error === void 0 ? void 0 : error.result) === null || _a === void 0 ? void 0 : _a.message}(${action}${error === null || error === void 0 ? void 0 : error.requestId})`;
+    }
+    else {
+        return `${action}(${error === null || error === void 0 ? void 0 : error.message})`;
+    }
+};

package/dist/web/utils/platform.js

@@ -92,6 +92,8 @@ export const downloadFile = (url) => {
     urlObj.searchParams.append('response-content-disposition', 'attawchment');
     const urls = urlObj.toString();
     window.open(urls);
+    // 定时清object https://github.com/eligrey/FileSaver.js/blob/9806041b0e800979dddabbaa1b5f6ce6952d7cd7/src/FileSaver.js#L106
+    // eslint-disable-next-line rulesdir/no-timer
     setTimeout(() => {
         window.URL.revokeObjectURL(urls);
     }, 0);

package/dist/web/weda-ui.css

@@ -88,3 +88,12 @@ body .weda-ui {
 .weda-ui .wedatea2td-form__controls {
   font-size: 1em;
 }
+
+.weda-ui .weui-check[disabled] + .weui-icon-checked {
+  opacity: 0.4;
+}
+
+.weda-ui .weui-check__label.weui-cell_readonly,
+.weda-ui .weui-check__label.weui-cell_disabled {
+  color: rgba(0, 0, 0, 0.4);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/weda-ui",
-  "version": "3.1.6",
+  "version": "3.2.0",
   "main": "./dist/index.js",
   "module": "./dist/index",
   "miniprogram": "mpdist",
@@ -22,18 +22,14 @@
     "test": "npm run test:jest",
     "test:jest": "jest test --env=jsdom",
     "test:watch": "jest test --env=jsdom --watch",
-    "test:e2e": "npx cypress run --component",
-    "test:all": "npm run test && npm run test:e2e",
+    "prestart:e2e-server": "node ./tools/e2e-prepare.mjs",
+    "start:e2e-server": "node ./lowcode-comps/e2e-server.js",
+    "test:e2e-component": "npx cypress run --component",
+    "test:e2e-cals": "start-server-and-test start:e2e-server 2333 'npx cypress run -b chrome --headless'",
+    "test:e2e": "npm run test:e2e-component && npm run test:e2e-cals",
+    "test:all": "node tools/test-ci.mjs",
     "e2e": "npx cypress open --component",
     "pretest:all": "rimraf .nyc_output || true",
-    "posttest:all": "npm run report:combined",
-    "mkdir:reports": "mkdir reports || true",
-    "precopy:reports": "npm run mkdir:reports",
-    "copy:reports": "cp cypress-coverage/coverage-final.json reports/from-cypress.json && cp jest-coverage/coverage-final.json reports/from-jest.json",
-    "precombine:reports": "npm run copy:reports && mkdir .nyc_output || true",
-    "combine:reports": "npx nyc merge reports && mv coverage.json .nyc_output/out.json",
-    "prereport:combined": "npm run combine:reports",
-    "report:combined": "npx nyc report --reporter lcov --reporter text --reporter html --report-dir coverage",
     "storybook": "start-storybook -p 6006",
     "build-storybook": "build-storybook",
     "lint": "eslint --ext .js,.jsx,.ts,.tsx .",
@@ -64,7 +60,7 @@
     "dayjs": "^1.10.7",
     "destr": "^1.1.1",
     "echarts": "^5.3.0",
-    "kedao": "^0.1.23",
+    "kedao": "^0.1.24",
     "lodash.isequal": "^4.5.0",
     "object.fromentries": "^2.0.5",
     "prop-types": "^15.7.2",
@@ -75,7 +71,7 @@
     "tea-component": "^2.7.3",
     "uuid": "8.3.2",
     "video.js": "^7.18.1",
-    "weui": "^2.4.4",
+    "weui": "^2.5.9",
     "weui.js": "1.2.2"
   },
   "peerDependencies": {
@@ -91,6 +87,7 @@
     "@craco/craco": "^7.0.0-alpha.7",
     "@cypress/code-coverage": "^3.10.0",
     "@cypress/react": "^6.0.0",
+    "@cypress/skip-test": "^2.6.1",
     "@cypress/webpack-dev-server": "~2.0.0",
     "@istanbuljs/nyc-config-typescript": "^1.0.2",
     "@size-limit/preset-big-lib": "^7.0.8",
@@ -113,6 +110,8 @@
     "babel-plugin-istanbul": "^6.1.1",
     "cross-env": "^7.0.3",
     "cypress": "~10.3.0",
+    "cypress-image-diff-js": "^1.20.0",
+    "cypress-wait-until": "^1.7.2",
     "eslint": "^8.19.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-config-tencent": "^1.0.4",
@@ -141,9 +140,11 @@
     "regenerator-runtime": "^0.13.9",
     "rimraf": "^3.0.2",
     "size-limit": "^7.0.8",
+    "start-server-and-test": "^1.14.0",
     "swc-loader": "0.2.3",
     "swc-plugin-coverage-instrument": "^0.0.7",
     "ts-loader": "^9.3.1",
+    "ts-node": "^10.9.1",
     "typescript": "^4.7.4",
     "webpack": "^5.73.0",
     "webpack-cli": "^4.10.0",

package/dist/asset-manifest.json

@@ -1,17 +0,0 @@
-{
-  "files": {
-    "main.js": "/static/js/main.chunk.js",
-    "main.js.map": "/static/js/main.chunk.js.map",
-    "runtime-main.js": "/static/js/bundle.js",
-    "runtime-main.js.map": "/static/js/bundle.js.map",
-    "vendors~main.js": "/static/js/vendors~main.chunk.js",
-    "vendors~main.js.map": "/static/js/vendors~main.chunk.js.map",
-    "index.html": "/index.html",
-    "static/media/ef6fa527e24e354765d806b826b41391.svg": "/static/media/ef6fa527e24e354765d806b826b41391.fa67580a.svg"
-  },
-  "entrypoints": [
-    "static/js/bundle.js",
-    "static/js/vendors~main.chunk.js",
-    "static/js/main.chunk.js"
-  ]
-}

package/dist/index.html

@@ -1,88 +0,0 @@
-Html Webpack Plugin:
-<pre>
-  Error: Child compilation failed:
-  Entry module not found: Error: Can't resolve '/Users/fengkx/lowcode/weda-ui/public/index.html' in '/Users/fengkx/lowcode/weda-ui':
-  Error: Can't resolve '/Users/fengkx/lowcode/weda-ui/public/index.html' in '/Users/fengkx/lowcode/weda-ui'
-  EntryModuleNotFoundError: Entry module not found: Error: Can't resolve '/Users/fengkx/lowcode/weda-ui/public/index.html' in '/Users/fengkx/lowcode/weda-ui  '
-  
-  - Compilation.js:1075 
-    [weda-ui]/[builder-webpack4]/[webpack]/lib/Compilation.js:1075:31
-  
-  - NormalModuleFactory.js:401 
-    [weda-ui]/[builder-webpack4]/[webpack]/lib/NormalModuleFactory.js:401:22
-  
-  - NormalModuleFactory.js:130 
-    [weda-ui]/[builder-webpack4]/[webpack]/lib/NormalModuleFactory.js:130:21
-  
-  - NormalModuleFactory.js:224 
-    [weda-ui]/[builder-webpack4]/[webpack]/lib/NormalModuleFactory.js:224:22
-  
-  - async.js:2830 
-    [weda-ui]/[neo-async]/async.js:2830:7
-  
-  - async.js:6877 
-    [weda-ui]/[neo-async]/async.js:6877:13
-  
-  - NormalModuleFactory.js:214 
-    [weda-ui]/[builder-webpack4]/[webpack]/lib/NormalModuleFactory.js:214:25
-  
-  - Resolver.js:213 
-    [weda-ui]/[enhanced-resolve]/lib/Resolver.js:213:14
-  
-  - Resolver.js:285 
-    [weda-ui]/[enhanced-resolve]/lib/Resolver.js:285:5
-  
-  
-  - UnsafeCachePlugin.js:44 
-    [weda-ui]/[enhanced-resolve]/lib/UnsafeCachePlugin.js:44:7
-  
-  - Resolver.js:285 
-    [weda-ui]/[enhanced-resolve]/lib/Resolver.js:285:5
-  
-  
-  - Resolver.js:285 
-    [weda-ui]/[enhanced-resolve]/lib/Resolver.js:285:5
-  
-  
-  - DescriptionFilePlugin.js:67 
-    [weda-ui]/[enhanced-resolve]/lib/DescriptionFilePlugin.js:67:43
-  
-  - child-compiler.js:131 
-    [weda-ui]/[react-scripts]/[html-webpack-plugin]/lib/child-compiler.js:131:18
-  
-  - Compiler.js:343 
-    [weda-ui]/[builder-webpack4]/[webpack]/lib/Compiler.js:343:11
-  
-  - Compiler.js:681 
-    [weda-ui]/[builder-webpack4]/[webpack]/lib/Compiler.js:681:15
-  
-  
-  - Hook.js:154 AsyncSeriesHook.lazyCompileHook
-    [weda-ui]/[tapable]/lib/Hook.js:154:20
-  
-  - Compiler.js:678 
-    [weda-ui]/[builder-webpack4]/[webpack]/lib/Compiler.js:678:31
-  
-  
-  - Hook.js:154 AsyncSeriesHook.lazyCompileHook
-    [weda-ui]/[tapable]/lib/Hook.js:154:20
-  
-  - Compilation.js:1423 
-    [weda-ui]/[builder-webpack4]/[webpack]/lib/Compilation.js:1423:35
-  
-  
-  - Hook.js:154 AsyncSeriesHook.lazyCompileHook
-    [weda-ui]/[tapable]/lib/Hook.js:154:20
-  
-  - Compilation.js:1414 
-    [weda-ui]/[builder-webpack4]/[webpack]/lib/Compilation.js:1414:32
-  
-  
-  - Hook.js:154 AsyncSeriesHook.lazyCompileHook
-    [weda-ui]/[tapable]/lib/Hook.js:154:20
-  
-  - Compilation.js:1409 
-    [weda-ui]/[builder-webpack4]/[webpack]/lib/Compilation.js:1409:36
-  
-  
-</pre><script src="/static/js/bundle.js"></script><script src="/static/js/vendors~main.chunk.js"></script><script src="/static/js/main.chunk.js"></script>