@cloudbase/weda-ui-mp 3.14.2 → 3.15.0

package/components/wd-switch/wd-switch.wxss

@@ -1230,4 +1230,19 @@ textarea {
 }
 .wd-mp-form-item-obj .wd-form-item--weui.wd-form-item {
   width: 100%;
+}
+
+.wd-input-password-icon {
+  padding: 0 5px;
+  display: flex;
+  cursor: pointer;
+}
+
+.wd-pc-input-password-icon {
+  position: absolute;
+  right: -30px;
+}
+
+.password-input .wd-form-item-wrap__control-wrap {
+  position: relative;
 }

package/components/wd-tag-select/wd-tag-select.wxss

@@ -1271,4 +1271,19 @@ textarea {
 }
 .wd-mp-form-item-obj .wd-form-item--weui.wd-form-item {
   width: 100%;
+}
+
+.wd-input-password-icon {
+  padding: 0 5px;
+  display: flex;
+  cursor: pointer;
+}
+
+.wd-pc-input-password-icon {
+  position: absolute;
+  right: -30px;
+}
+
+.password-input .wd-form-item-wrap__control-wrap {
+  position: relative;
 }

package/package.json

@@ -3,7 +3,7 @@
   "miniprogram": "./",
   "packageManager": "yarn@3.0.2",
   "dependencies": {},
-  "version": "3.14.2",
+  "version": "3.15.0",
   "main": "./",
   "publishConfig": {
     "access": "public"

package/utils/getModelParams.js

@@ -22,7 +22,7 @@ export const convertWhere = (props) => {
 /**
  * 拼接filter参数
  */
-const getFilter = (wList) => {
+export const getFilter = (wList) => {
   let where = [];
   let filter = { where: {} };
   if (wList?.where?.$or) {
@@ -151,3 +151,29 @@ const transformSorter = (sorter = []) => {
       }
     });
 };
+
+export function getDefaultQuery({ supportManyRelated, queryCondition, where, sorter }) {
+  const params = {};
+  // 兼容旧的筛选条件
+  const _queryCondition = supportManyRelated ? queryCondition : getWhereList(where);
+  // 支持多关联查询，需要将查询条件转换为filter
+  params.filter = getFilter(_queryCondition);
+  params.select = { $master: true };
+  // 处理排序字段
+  params.orderBy = sorter
+    ?.filter((n) => (n.orderBy && n.orderType) || n.relationalTableName)
+    ?.map((i) => {
+      if (i.relationalTableName) {
+        return {
+          [i.relationalTableName]: i.sorter
+            ?.filter((j) => j.orderBy && j.orderType)
+            ?.map((k) => ({ [k.orderBy]: k.orderType })),
+        };
+      } else {
+        return { [i.orderBy]: i.orderType };
+      }
+    });
+  params.getCount = true;
+  params.compatibleWithV1 = true;
+  return params;
+}

package/utils/tcb.js

@@ -150,8 +150,7 @@ export async function callDataSourceApi(param) {
  */
 export const resolveStaticResourceUrl = (path) => {
   try {
-    const resourceUrl =
-      getWedaAPI()?.app?.__internal__?.resolveStaticResourceUrl(path);
+    const resourceUrl = getWedaAPI()?.app?.__internal__?.resolveStaticResourceUrl(path);
     return resourceUrl;
   } catch (error) {
     errorHandler({
@@ -175,3 +174,13 @@ export const getDataSourceByName = async (dbName, swrMode = true) => {
   });
   return datasource;
 };
+
+/**
+ * 设置默认上传路径
+ */
+export const getDefaultUploadPath = async (uploadPath) => {
+  const app = await getWedaAPI().app;
+  const WeAppName = app?.name || app?.id;
+  const _uploadPath = WeAppName ? `${uploadPath}/${WeAppName}` : uploadPath;
+  return _uploadPath;
+};