@cloudbase/weda-ui-mp 3.11.11 → 3.12.1

package/components/wd-form-arr/index.js

@@ -31,6 +31,10 @@ Component({
       type: null,
       value: {},
     },
+    mode: {
+      type: String,
+      value: 'obj',
+    },
   },
   data: {
     status: 'edit',

package/components/wd-form-arr/index.wxml

@@ -1,5 +1,5 @@
 <block wx:if="{{visible}}">
-  <wd-form-item-obj id="{{id}}" className="{{className}}" style="{{style}}" label="{{label}}" labelVisible="{{labelVisible}}" labelTips="{{labelTips}}" labelWidth="{{labelWidth}}" labelAlign="{{labelAlign}}" labelWrap="{{labelWrap}}" extra="{{extra}}" classRoot="{{classRoot}}" layout="{{_layout}}">
+  <wd-form-item-obj id="{{id}}" mode="{{mode}}"  className="{{className}}" style="{{style}}" label="{{label}}" labelVisible="{{labelVisible}}" labelTips="{{labelTips}}" labelWidth="{{labelWidth}}" labelAlign="{{labelAlign}}" labelWrap="{{labelWrap}}" extra="{{extra}}" classRoot="{{classRoot}}" layout="{{_layout}}">
     <slot></slot>
   </wd-form-item-obj>
 </block>

package/components/wd-form-arr/wd-form-obj.wxss

@@ -12,6 +12,15 @@
   width: fit-content;
   width: 100%;
 }
+.wd-form-obj-root .wd-form-obj .wd-form-item.size-width-sm {
+  width: 100%;
+}
+.wd-form-obj-root .wd-form-obj .wd-form-item.size-width-md {
+  width: 100%;
+}
+.wd-form-obj-root .wd-form-obj .wd-form-item.size-width-lg {
+  width: 100%;
+}
 .wd-form-obj-root.size-width-sm {
   width: 100%;
 }
@@ -25,7 +34,7 @@
   width: 100%;
 }
 .wd-form-obj-root .wd-form-item-wrap .wd-form-item-wrap__control {
-  overflow: hidden;
+  overflow: unset;
 }
 .wd-form-obj-root .wd-form-item-wrap .wd-card-root {
   width: 100%;

package/components/wd-form-item-obj/index.js

@@ -12,6 +12,12 @@ import {
 Component({
   options: { virtualHost: true, styleIsolation: 'shared' },
   behaviors: [itemBehavior],
+  properties: {
+    mode: {
+      type: String,
+      value: 'obj',
+    },
+  },
   data: {
     item: `${WD_PREFIX}-form-item`,
     itemWrap: `${WD_PREFIX}-form-item-wrap`,

package/components/wd-form-item-obj/index.wxml

@@ -1,5 +1,23 @@
 <view class="{{cls}}" id="{{id}}" style="{{style}}">
   <view class="{{itemWrap}}">
+
+<block wx:if="{{mode==='table'||mode==='custom'}}">
+    <view class="{{itemWrap}}__control">
+          <view class="{{controlWrapCls}} wd-form-obj-item-wrap__control-wrap">
+            <block wx:if="{{readOnly}}">
+              <view class="{{item}}__readonly">
+                <text class="{{item}}__readonly-before" wx:if="{{_before}}">{{_before}}</text>
+                <text class="{{item}}__readonly-value">{{_readValue}}</text>
+                <text class="{{item}}__readonly-after" wx:if="{{_after}}">{{_after}}</text>
+              </view>
+            </block>
+            <block wx:else>
+              <slot></slot>
+            </block>
+          </view>
+        </view>
+</block>
+<block wx:else>
     <wd-card className="{{iconName === 'chevrondown' ? 'wd-card-content__hidden' : ''}}" showContent="{{true}}">
       <view slot="headerSlot" class="wd-form-obj-card-header">
         <wd-icon name="{{iconName}}" bind:tap="setIconName"></wd-icon>
@@ -35,6 +53,7 @@
         </view>
       </view>
     </wd-card>
+    </block>
   </view>
   <!-- Message -->
   <block wx:if="{{validateErrorMsg}}">

package/components/wd-form-obj/index.js

@@ -26,6 +26,10 @@ Component({
       type: String,
       value: 'form-obj',
     },
+    mode: {
+      type: String,
+      value: 'obj',
+    },
   },
   data: {
     status: 'edit',

package/components/wd-form-obj/index.wxml

@@ -1,5 +1,5 @@
 <block wx:if="{{visible}}">
-  <wd-form-item-obj id="{{id}}" className="{{className}}" style="{{style}}" label="{{label}}" labelVisible="{{labelVisible}}" labelTips="{{labelTips}}" labelWidth="{{labelWidth}}" labelAlign="{{labelAlign}}" labelWrap="{{labelWrap}}" extra="{{extra}}" classRoot="{{classRoot}}" layout="{{_layout}}">
+  <wd-form-item-obj id="{{id}}" mode="{{mode}}"  className="{{className}}" style="{{style}}" label="{{label}}" labelVisible="{{labelVisible}}" labelTips="{{labelTips}}" labelWidth="{{labelWidth}}" labelAlign="{{labelAlign}}" labelWrap="{{labelWrap}}" extra="{{extra}}" classRoot="{{classRoot}}" layout="{{_layout}}">
     <slot></slot>
   </wd-form-item-obj>
 </block>

package/components/wd-form-obj/wd-form-obj.wxss

@@ -12,6 +12,15 @@
   width: fit-content;
   width: 100%;
 }
+.wd-form-obj-root .wd-form-obj .wd-form-item.size-width-sm {
+  width: 100%;
+}
+.wd-form-obj-root .wd-form-obj .wd-form-item.size-width-md {
+  width: 100%;
+}
+.wd-form-obj-root .wd-form-obj .wd-form-item.size-width-lg {
+  width: 100%;
+}
 .wd-form-obj-root.size-width-sm {
   width: 100%;
 }
@@ -25,7 +34,7 @@
   width: 100%;
 }
 .wd-form-obj-root .wd-form-item-wrap .wd-form-item-wrap__control {
-  overflow: hidden;
+  overflow: unset;
 }
 .wd-form-obj-root .wd-form-item-wrap .wd-card-root {
   width: 100%;

package/components/wd-image/wd-image.wxss

@@ -31,6 +31,8 @@
   right: 0;
   top: 0;
   bottom: 0;
+  width: 80%;
+  margin: 0 auto;
 }
 
 .wd-image-mask {
@@ -83,4 +85,31 @@
   top: 0;
   width: 100%;
   height: 100%;
+}
+
+.wd-image__zoom-in {
+  cursor: zoom-in;
+}
+
+.wd-image-preview-toolbar {
+  position: absolute;
+  bottom: 40px;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 1002;
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+  width: 150px;
+  color: #fff;
+}
+.wd-image-preview-toolbar .wd-icon-wrap {
+  height: 30px;
+  width: 30px;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: var(--wd-font-gray-2);
+  cursor: pointer;
 }

package/package.json

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

package/style/wd-design.wxss

@@ -353,7 +353,7 @@ page[theme-mode=light],
   --wd-color-success-focus: var(--wd-color-success-2);
   --wd-color-success-active: var(--wd-color-success-6);
   --wd-color-success-disabled: var(--wd-color-success-3);
-  --wd-bg-mask: rgba(var(--wd-black-rgb), 80%);
+  --wd-bg-mask: rgba(var(--wd-black-rgb), 50%);
   --wd-bg-mask-inverse: rgba(var(--wd-white-rgb), 60%);
   --wd-color-bg-page: var(--wd-color-gray-1);
   --wd-color-bg-container: var(--wd-white);

package/utils/getModelParams.js

@@ -71,9 +71,7 @@ const getSelectFields = async (props) => {
       select[name] = true;
     });
   } else if (props.selectFieldType === 'custom') {
-    const _selectFields = Array.isArray(props.selectFields)
-      ? props.selectFields
-      : [];
+    const _selectFields = Array.isArray(props.selectFields) ? props.selectFields : [];
     _selectFields.forEach((name) => {
       select[name] = true;
     });
@@ -98,6 +96,12 @@ export const getModelParams = async (props) => {
       // 支持多关联查询，需要将查询条件转换为filter
       if (props?.queryCondition?.constructor === Object) {
         params['filter'] = getFilter(props.queryCondition);
+      } else if (Array.isArray(props?.queryCondition)) {
+        params['filter'] = {
+          where: {
+            $and: props?.queryCondition,
+          },
+        };
       }
       params.select = await getSelectFields(props);
       // 处理排序字段