@cloudbase/weda-ui 2.0.10 → 2.0.26

package/src/mp/components/form/select/index.js

@@ -1,6 +1,12 @@
 import classNames from '../../../utils/classnames';
 import dayjs from '../../../utils/dayjs.min.js';
-import { getRegionTree, buildDisplayValue , provinces, cities, regions } from './region/index';
+import {
+  getRegionTree,
+  buildDisplayValue,
+  provinces,
+  cities,
+  regions,
+} from './region/index';
 import destr from '../../../utils/destr';
 import { callDataSourceApi, callWedaApi } from '../../../utils/tcb';
 import { REL_DICT } from '../../../utils/constant';
@@ -73,7 +79,7 @@ Component({
     },
     regionType: {
       type: String,
-      value: ''
+      value: '',
     },
     range: {
       type: Array,
@@ -120,7 +126,7 @@ Component({
     },
     defaultMutiRegion: {
       type: String,
-      value: ''
+      value: '',
     },
     separator: {
       type: String,
@@ -152,8 +158,8 @@ Component({
     },
     where: {
       type: Array,
-      value: []
-    }
+      value: [],
+    },
   },
   data: {
     cls: '',
@@ -169,7 +175,7 @@ Component({
     multiIndex: [0, 0, 0], // 默认的下标
     records: [],
     option: [{ label: '', value: '' }],
-    whereEffected: []
+    whereEffected: [],
   },
   lifetimes: {
     attached() {
@@ -205,7 +211,11 @@ Component({
 
       switch (mode) {
         case 'selector': {
-          if (format === 'related' || format === 'father-son' || format === 'x-enum') {
+          if (
+            format === 'related' ||
+            format === 'father-son' ||
+            format === 'x-enum'
+          ) {
             selectRange = this.data.option.map((item) => item.label);
           } else {
             selectRange = range.map((item) => item.label);
@@ -249,65 +259,85 @@ Component({
     },
   },
   observers: {
-    'defaultValue, defaultTime, defaultRegion,defaultMutiRegion,defaultDate': function (
-      defaultValue,
-      defaultTime,
-      defaultRegion,
-      defaultMutiRegion,
-      defaultDate
-    ) {
-      const { range, mode, separator, placeholder, dateMode, format, option } =
-        this.properties;
-      let value, displayValue;
-      switch (mode) {
-        case 'selector': {
-          // TODO: == 故意的
-          if (format !== 'father-son' && format !== 'related' && format !== 'x-enum') {
-            const index = range.findIndex((item) => item.value == defaultValue);
-            value = index < 0 ? '' : defaultValue;
-            displayValue = index < 0 ? '' : range[index].label;
-          } else {
-            const index = option.findIndex((item) => item.value == defaultValue);
-            value = index < 0 ? '' : defaultValue;
-            displayValue = index < 0 ? '' : option[index].label;
+    'defaultValue, defaultTime, defaultRegion,defaultMutiRegion,defaultDate':
+      function (
+        defaultValue,
+        defaultTime,
+        defaultRegion,
+        defaultMutiRegion,
+        defaultDate
+      ) {
+        const {
+          range,
+          mode,
+          separator,
+          placeholder,
+          dateMode,
+          format,
+          option,
+        } = this.properties;
+        let value, displayValue;
+        switch (mode) {
+          case 'selector': {
+            // TODO: == 故意的
+            if (
+              format !== 'father-son' &&
+              format !== 'related' &&
+              format !== 'x-enum'
+            ) {
+              const index = range.findIndex(
+                (item) => item.value == defaultValue
+              );
+              value = index < 0 ? '' : defaultValue;
+              displayValue = index < 0 ? '' : range[index].label;
+            } else {
+              const index = option.findIndex(
+                (item) => item.value == defaultValue
+              );
+              value = index < 0 ? '' : defaultValue;
+              displayValue = index < 0 ? '' : option[index].label;
+            }
+            break;
+          }
+          case 'date': {
+            value = this._coverNumber2Date(defaultDate, dateMode);
+            displayValue = this._coverNumber2Date(defaultDate, dateMode, true);
+            break;
+          }
+          case 'time': {
+            value = defaultTime ? this.converTime(defaultTime) : undefined;
+            displayValue = value;
+            break;
+          }
+          case 'region': {
+            value = defaultRegion;
+            displayValue = defaultRegion.join(separator);
+            break;
+          }
+          case 'mutiRegion': {
+            displayValue = defaultMutiRegion || '';
+            break;
+          }
+          default: {
+            break;
           }
-          break;
-        }
-        case 'date': {
-          value = this._coverNumber2Date(defaultDate, dateMode);
-          displayValue = this._coverNumber2Date(defaultDate, dateMode, true);
-          break;
-        }
-        case 'time': {
-          value = defaultTime ? this.converTime(defaultTime) : undefined;
-          displayValue = value;
-          break;
-        }
-        case 'region': {
-          value = defaultRegion;
-          displayValue = defaultRegion.join(separator);
-          break;
-        }
-        case 'mutiRegion': {
-          displayValue = defaultMutiRegion || '';
-          break;
-        }
-        default: {
-          break;
         }
-      }
-      this.setData({
-        value: value,
-        displayValue: displayValue || placeholder,
-        displayCls: displayValue ? '' : 'weui-input__placeholder',
-      });
-    },
+        this.setData({
+          value: value,
+          displayValue: displayValue || placeholder,
+          displayCls: displayValue ? '' : 'weui-input__placeholder',
+        });
+      },
     range: function (range) {
       const { mode, format } = this.properties;
       let selectRange = '';
       switch (mode) {
         case 'selector': {
-          if (format !== 'father-son' && format !== 'related' && format !== 'x-enum') {
+          if (
+            format !== 'father-son' &&
+            format !== 'related' &&
+            format !== 'x-enum'
+          ) {
             selectRange = range.map((item) => item.label);
           }
           break;
@@ -331,18 +361,22 @@ Component({
       const whereEffected = [].concat(getWhereList(where));
       this.setData({ whereEffected });
       const { format, dataSourceName, viewId } = this.properties;
-      if ((format === 'father-son' || format === 'related') && dataSourceName && viewId) {
+      if (
+        (format === 'father-son' || format === 'related') &&
+        dataSourceName &&
+        viewId
+      ) {
         this._fetchData(whereEffected);
       }
     },
-    'records': function (records) {
+    records: function (records) {
       const { primaryField } = this.properties;
       if (records && records.length !== 0 && primaryField) {
-        const option = records.map(item => {
+        const option = records.map((item) => {
           return {
-            label: item[primaryField],
+            label: item[primaryField] || item._id,
             value: item._id,
-            name: item[primaryField]
+            name: item[primaryField] || item._id,
           };
         });
         this.setData({ selectRange: option.map((item) => item.label), option });
@@ -365,7 +399,7 @@ Component({
           params: {
             where: param,
             pageNo: pageNo,
-            pageSize: pageSize
+            pageSize: pageSize,
           },
         });
         pageNo = pageNo + 1;
@@ -373,7 +407,6 @@ Component({
           total = data?.total || 0;
           records = records.concat(data?.records);
         }
-
       }
 
       if (records) {
@@ -389,25 +422,28 @@ Component({
         this.triggerEvent('change', changeData);
       }
       var provinceList = [...provinces];
-      var provinceArr = provinces.map((item) => { return { value: item.Value, code: item.Code }; }); //保存省级名称
+      var provinceArr = provinces.map((item) => {
+        return { value: item.Value, code: item.Code };
+      }); //保存省级名称
       this.setData({
         multiArray: JSON.parse(JSON.stringify(provinceArr)),
-        provinceList,//保存省级原始数据
+        provinceList, //保存省级原始数据
         provinceArr, //省级所有的名称
       });
-      var defaultCode = this.data.provinceList[0].Code;  // 使用第一项当作参数获取市级数据
+      var defaultCode = this.data.provinceList[0].Code; // 使用第一项当作参数获取市级数据
       this.setData({
-        currnetProvinceKey: defaultCode  // 保存在当前的省级key
+        currnetProvinceKey: defaultCode, // 保存在当前的省级key
       });
       if (regionType != 'levelOne') {
-        this.getCity(this.data.provinceList[0]);  // 获取市级数据
+        this.getCity(this.data.provinceList[0]); // 获取市级数据
       }
     },
-    getCity(provinceInfo) { // 获取市级数据
+    getCity(provinceInfo) {
+      // 获取市级数据
       const { regionType } = this.properties;
       const code = provinceInfo.Code;
       this.setData({
-        currnetProvinceKey: code  // 保存当前选择的市级code
+        currnetProvinceKey: code, // 保存当前选择的市级code
       });
       var cityArr = [];
       var cityList = [];
@@ -418,8 +454,8 @@ Component({
         }
       });
       this.setData({
-        cityList,  // 保存下市级原始数据
-        cityArr  // 市级所有的名称
+        cityList, // 保存下市级原始数据
+        cityArr, // 市级所有的名称
       });
       if (regionType == 'levelTwo') {
         const cityData = [this.data.provinceArr, cityArr];
@@ -429,7 +465,7 @@ Component({
       }
       var defaultCode = cityList[0]?.Code;
       this.setData({
-        currnetCityKey: defaultCode  // 存下当前选择的城市key
+        currnetCityKey: defaultCode, // 存下当前选择的城市key
       });
       if (regionType == 'levelThree') {
         this.getRegion(cityList[0]);
@@ -438,7 +474,7 @@ Component({
     getRegion(cityInfo) {
       const code = cityInfo.Code;
       this.setData({
-        currnetCityKey: code // 更新当前选择的市级key
+        currnetCityKey: code, // 更新当前选择的市级key
       });
       var regionList = [];
       var regionArr = [];
@@ -459,31 +495,34 @@ Component({
       this.setData({
         multiArray: JSON.parse(JSON.stringify(threeRegion)),
         regionList,
-        regionArr
+        regionArr,
       });
       var defaultCode = regionList[0]?.Code;
       this.setData({
-        currnetRegionKey: defaultCode  // 存下当前选择的城市key
+        currnetRegionKey: defaultCode, // 存下当前选择的城市key
       });
     },
-    columnchange(e) {  // 滚动选择器 触发的事件
+    columnchange(e) {
+      // 滚动选择器 触发的事件
       const { regionType } = this.properties;
-      var column = e.detail.column;  // 当前改变的列
+      var column = e.detail.column; // 当前改变的列
       var data = {
         multiIndex: JSON.parse(JSON.stringify(this.data.multiIndex)),
-        multiArray: JSON.parse(JSON.stringify(this.data.multiArray))
+        multiArray: JSON.parse(JSON.stringify(this.data.multiArray)),
       };
-      data.multiIndex[column] = e.detail.value;  // 第几列改变了就是对应multiIndex的第几个，更新它
-      switch (column) { // 处理不同的逻辑
-        case 0:   // 第一列更改 就是省级的更改
+      data.multiIndex[column] = e.detail.value; // 第几列改变了就是对应multiIndex的第几个，更新它
+      switch (
+        column // 处理不同的逻辑
+      ) {
+        case 0: // 第一列更改 就是省级的更改
           if (regionType != 'levelOne')
-            this.getCity(this.data.provinceList[e.detail.value]);  // 获取当前key下面的市级数据
-          data.multiIndex[1] = 0;  // 将市默认选择第一个
+            this.getCity(this.data.provinceList[e.detail.value]); // 获取当前key下面的市级数据
+          data.multiIndex[1] = 0; // 将市默认选择第一个
           break;
-        case 1:  // 市发生变化
-          this.getRegion(this.data.cityList[e.detail.value]);   // 获取区
+        case 1: // 市发生变化
+          this.getRegion(this.data.cityList[e.detail.value]); // 获取区
           // }
-          data.multiIndex[2] = 0;  // 区默认为第一个
+          data.multiIndex[2] = 0; // 区默认为第一个
           break;
       }
     },
@@ -491,25 +530,42 @@ Component({
     _fetchEnumData: async function () {
       let data = await callWedaApi({
         action: 'DescribeGeneralOptionsDetailList',
-        data: { OptNameList: [this.properties.enumName], PageIndex: 1, PageSize: 10 },
+        data: {
+          OptNameList: [this.properties.enumName],
+          PageIndex: 1,
+          PageSize: 10,
+        },
       });
       const config = destr(data?.Items?.[0]?.Config) ?? [];
-      const option = config.map(item => {
+      const option = config.map((item) => {
         return {
           label: item.value,
           value: item.key,
-          name: item.value
+          name: item.value,
         };
       });
       this.setData({ selectRange: option.map((item) => item.label), option });
     },
 
     onChange(e) {
-      const { range, mode, separator, placeholder, regionType, dateMode, format, option } = this.properties;
+      const {
+        range,
+        mode,
+        separator,
+        placeholder,
+        regionType,
+        dateMode,
+        format,
+        option,
+      } = this.properties;
       let displayValue;
       switch (mode) {
         case 'selector': {
-          if (format !== 'father-son' && format !== 'related' && format !== 'x-enum') {
+          if (
+            format !== 'father-son' &&
+            format !== 'related' &&
+            format !== 'x-enum'
+          ) {
             this.triggerEvent('change', range[e.detail.value]);
             displayValue = range[e.detail.value].label;
           } else {
@@ -542,9 +598,13 @@ Component({
         case 'mutiRegion': {
           this.setData({
             step: 1,
-            multiIndex: e.detail.value  // 更新下标字段
+            multiIndex: e.detail.value, // 更新下标字段
           });
-          const value = buildDisplayValue(this.data.multiArray, this.data.multiIndex, regionType);
+          const value = buildDisplayValue(
+            this.data.multiArray,
+            this.data.multiIndex,
+            regionType
+          );
           displayValue = value?.value;
           this.triggerEvent('change', value);
           break;
@@ -613,6 +673,5 @@ Component({
         return d;
       }
     },
-
   },
 });

package/src/mp/components/form/select/index.wxml

@@ -1,40 +1,12 @@
-<formcell
-	className="{{cls}}"
-	style="{{style}}"
-	label="{{labelVisible ? label : null}}"
-	layout="{{layout}}"
-	multiCell="{{false}}"
-	requiredFlag="{{requiredFlag}}"
->
-<view class="{{subCls}}">
-		<view class="weui-cell__bd">
-			<picker
-			wx:if="{{mode!='mutiRegion'}}"
-			 class="weui-picker__group weui-input"
-			 bindchange="onChange"
-			 bindcancel="onCancel"
-			 mode="{{mode}}"
-			 range="{{selectRange}}"
-			 disabled="{{disabled}}"
-			 start="{{start}}"
-			 end="{{end}}"
-			disabled="{{disabled}}"
-			 value="{{value}}"
-			 fields="{{dateMode}}"
-			>
-			<label class="{{displayCls}}">{{displayValue}}</label>
-			</picker>
-			<picker wx:if="{{mode=='mutiRegion'}}"
-			 mode="multiSelector"
-			 disabled="{{disabled}}"
-			 range="{{multiArray}}"
-			 range-key='value'
-			 bindcolumnchange="columnchange"
-			 value="{{multiIndex}}"
-			 bindchange='onChange'
-			 class="weui-picker__group weui-input">
-				<label class="{{displayCls}}">{{displayValue}}</label>
-			</picker>
-		</view>
-</view>
+<formcell className="{{cls}}" style="{{style}}" label="{{labelVisible ? label : null}}" layout="{{layout}}" multiCell="{{false}}" requiredFlag="{{requiredFlag}}">
+  <view class="{{subCls}}">
+    <view class="weui-cell__bd">
+      <picker wx:if="{{mode!='mutiRegion'}}" class="weui-picker__group weui-input" bindchange="onChange" bindcancel="onCancel" mode="{{mode}}" range="{{selectRange}}" disabled="{{disabled}}" start="{{start}}" end="{{end}}" disabled="{{disabled}}" value="{{value}}" fields="{{dateMode}}">
+        <label class="{{displayCls}}">{{displayValue}}</label>
+      </picker>
+      <picker wx:if="{{mode=='mutiRegion'}}" mode="multiSelector" disabled="{{disabled}}" range="{{multiArray}}" range-key="value" bindcolumnchange="columnchange" value="{{multiIndex}}" bindchange="onChange" class="weui-picker__group weui-input">
+        <label class="{{displayCls}}">{{displayValue}}</label>
+      </picker>
+    </view>
+  </view>
 </formcell>

package/src/mp/components/form/select/index.wxss

@@ -1,7 +1,16 @@
 @import '../../../style/weda-ui.wxss';
 .weda-ui .weui-cell.weui-check__label {
-    padding: 16px;
+  padding: 16px;
 }
 .weda-ui .weui-flex__item .weui-cell.weui-check__label {
   padding-left: 0;
 }
+
+.weda-ui.weda-select .weui-cell_form {
+  padding: 0 16px;
+}
+
+.weda-ui.weda-select .weui-flex__item .weui-cell_form {
+  padding: 0;
+  padding-right: 16px;
+}

package/src/mp/components/form/select/region/index.js

@@ -12,7 +12,7 @@ export async function getAreaCode() {
   try {
     const res = await callWedaApi({
       action: 'QueryRuntimeAreaCode',
-      data: { Mask: "11100" },
+      data: { Mask: '11100' },
     });
     return res?.AreaCodeList;
   } catch (error) {
@@ -29,11 +29,12 @@ export const splitAreaData = (areaData) => {
   provinces = [];
   cities = [];
   regions = [];
-  areaData.forEach(item => {
+  areaData.forEach((item) => {
     if (!item.Deprecated) {
       if (item?.Type == 1) {
         provinces.push(item);
-      } if (item?.Type == 2 || (item?.Type == 1 && item.CentralCity)) {
+      }
+      if (item?.Type == 2 || (item?.Type == 1 && item.CentralCity)) {
         cities.push(item);
       } else if (item?.Type == 3) {
         regions.push(item);
@@ -52,12 +53,16 @@ export const changeResult = (regionValue, areaData) => {
     defaultValue.forEach((element, index) => {
       areaData.map((item, id) => {
         //区级判重
-        if ((item?.Value == element && index != 2) || (item?.Value == element && item.Code.substr(0, 2) == changeValue[0].code.substr(0, 2) && index == 2)) {
+        if (
+          (item?.Value == element && index != 2) ||
+          (item?.Value == element &&
+            item.Code.substr(0, 2) == changeValue[0].code.substr(0, 2) &&
+            index == 2)
+        ) {
           changeValue.push({
             value: item?.Value,
-            code: item?.Code
-          }
-          );
+            code: item?.Code,
+          });
           defaultIndex.push(id);
         }
       });
@@ -77,15 +82,15 @@ export const buildDisplayValue = (data, indexList, type) => {
       provinceItem = data[0][indexList[0]];
       return {
         value: provinceItem.value,
-        result: [provinceItem]
+        result: [provinceItem],
       };
     }
     case 'levelTwo': {
       provinceItem = data[0][indexList[0]];
       cityItem = data[1][indexList[1]];
       return {
-        value: provinceItem.value + "," + cityItem.value,
-        result: [provinceItem, cityItem]
+        value: provinceItem.value + ',' + cityItem.value,
+        result: [provinceItem, cityItem],
       };
     }
     case 'levelThree': {
@@ -93,8 +98,9 @@ export const buildDisplayValue = (data, indexList, type) => {
       cityItem = data[1][indexList[1]];
       regionItem = data[2][indexList[2]];
       return {
-        value: provinceItem.value + "," + cityItem.value + "," + regionItem.value,
-        result: [provinceItem, cityItem, regionItem]
+        value:
+          provinceItem.value + ',' + cityItem.value + ',' + regionItem.value,
+        result: [provinceItem, cityItem, regionItem],
       };
     }
   }

package/src/mp/components/form/switch/index.wxml

@@ -1,18 +1,11 @@
-<formcell
-	className="{{cls}}" 
-	style="{{style}}"
-	label="{{labelVisible ? label : null}}"
-	layout="{{layout}}"
-	multiCell="{{false}}"
-	requiredFlag="{{requiredFlag}}"
->
-	<view class="{{subCls}}">
-		<view wx:if="{{isFlex}}" class="weui-cell__bd" />
-		<view class="{{ isFlex? 'weui-cell__ft' : 'weui-cell__bd'}}">
-			<label class="weui-switch-cp">
-				<switch class="weui-switch-cp__input" checked="{{checked}}" bindchange="change" />
-				<view class="weui-switch-cp__box" />
-			</label>
-		</view>
-	</view>
-</formcell>
+<formcell className="{{cls}}" style="{{style}}" label="{{labelVisible ? label : null}}" layout="{{layout}}" multiCell="{{false}}" requiredFlag="{{requiredFlag}}">
+  <view class="{{subCls}}">
+    <view wx:if="{{isFlex}}" class="weui-cell__bd" />
+    <view class="{{ isFlex? 'weui-cell__ft' : 'weui-cell__bd'}}">
+      <label class="weui-switch-cp">
+        <switch class="weui-switch-cp__input" checked="{{checked}}" bindchange="change" />
+        <view class="weui-switch-cp__box" />
+      </label>
+    </view>
+  </view>
+</formcell>

package/src/mp/components/form/textarea/index.js

@@ -80,5 +80,11 @@ Component({
       this.setData({ value: e.detail.value });
       this.triggerEvent('change', e.detail);
     },
+    handleFocus: function (e) {
+      this.triggerEvent('focus', e.detail);
+    },
+    handleBlur: function (e) {
+      this.triggerEvent('blur', e.detail);
+    },
   },
 });

package/src/mp/components/form/textarea/index.wxml

@@ -1,22 +1,7 @@
-<formcell
-	className="{{cls}}"
-	style="{{style}}"
-	label="{{labelVisible ? label : null}}"
-	layout="{{layout}}"
-	multiCell="{{true}}"
-	requiredFlag="{{requiredFlag}}"
->
+<formcell className="{{cls}}" style="{{style}}" label="{{labelVisible ? label : null}}" layout="{{layout}}" multiCell="{{true}}" requiredFlag="{{requiredFlag}}">
   <view class="weui-cell weui-cell_active weui-cell_form}} {{disabled ? 'weui-cell_disabled' : ''}}">
     <view class="weui-cell__bd">
-      <textarea
-        class="weui-textarea"
-        placeholder="{{placeholder}}"
-        placeholder-class="weui-input__placeholder"
-        bindinput="handleChange"
-        value="{{value}}"
-        disable="{{disabled}}"
-        maxlength="{{maxLength}}"
-      ></textarea>
+      <textarea class="weui-textarea" placeholder="{{placeholder}}" placeholder-class="weui-input__placeholder" bindinput="handleChange" value="{{value}}" disable="{{disabled}}" maxlength="{{maxLength}}" bindfocus="handleFocus" bindblur="handleBlur"></textarea>
       <view wx:if="{{counterVisible}}" class="weui-textarea-counter"><span>{{!!value ? value.length : 0}}</span>/{{maxLength}}</view>
     </view>
   </view>

package/src/mp/components/form/textarea/index.wxss

@@ -3,3 +3,8 @@
 .weda-ui .weda-textarea .weui-cell_form {
   padding: 16px;
 }
+
+.weda-ui .weda-textarea .weui-flex__item .weui-cell_form {
+  padding: 16px;
+  padding-left: 0;
+}

package/src/mp/components/form/tips/index.wxml

@@ -1,3 +1 @@
-<view class="{{cls}}">
-	{{tips}}
-</view>
+<view class="{{cls}}"> {{tips}} </view>

package/src/mp/components/form/uploader/index.js

@@ -115,7 +115,7 @@ Component({
       //当单图片上传且默认值为空数组时，初次渲染更新value，以避免空串提交类型不匹配问题
       if (Array.isArray(value) && !this.data.singleFlag) {
         this.setData({
-          urls: value
+          urls: value,
         });
         this.data.singleFlag = true;
       }