w-ui-v1 1.1.12 → 1.1.14

package/package.json

@@ -1,18 +1,18 @@
-{
-  "name": "w-ui-v1",
-  "version": "1.1.12",
-  "description": "w-ui",
-  "author": "wgxshh",
-  "license": "ISC",
-  "main": "index.ts",
- 
-  "peerDependencies": {
-    "wot-design-uni": "^1.7.0",
-    "z-paging": "^2.8.5"
-  },
-  "dependencies": {
-    "dayjs": "^1.11.13",
-    "jsencrypt": "^3.3.2",
-    "lodash-es": "^4.17.21"
-  }
-}
+{
+  "name": "w-ui-v1",
+  "version": "1.1.14",
+  "description": "w-ui",
+  "author": "wgxshh",
+  "license": "ISC",
+  "main": "index.ts",
+ 
+  "peerDependencies": {
+    "wot-design-uni": "^1.7.0",
+    "z-paging": "^2.8.5"
+  },
+  "dependencies": {
+    "dayjs": "^1.11.13",
+    "jsencrypt": "^3.3.2",
+    "lodash-es": "^4.17.21"
+  }
+}

package/utils/idata-scan.ts

@@ -1,6 +1,6 @@
 //注意：需要在插件市场 安装 安卓原生插件“iData条码扫描插件”,https://ext.dcloud.net.cn/plugin?id=3898#
-interface callback {
-    (scanData:any): void;
+interface callback {
+    (scanData:any): void;
 }
 let barcodeModel=null
 let globalEvent=null

package/utils/nfc.ts

@@ -1,270 +1,270 @@
-var NfcAdapter;
-var NdefRecord;
-var NdefMessage;
-var _getCardNo;
- 
-export default {
-    initNFC() {
-        if (uni.getSystemInfoSync().platform == 'android') {
-            listenNFCStatus()
-        }
-    },
-    readNFC(callback) {
-        if (uni.getSystemInfoSync().platform == 'android') {
-            readData(callback);
-        }
-    },
-    closeNFC() {
-        if (uni.getSystemInfoSync().platform == 'android') {
-            closeReadAndWrite();
-        }
-    }
-}
- 
-function listenNFCStatus() {
-    try {
-        var main = plus.android.runtimeMainActivity();
-        var Intent = plus.android.importClass('android.content.Intent');
-        var Activity = plus.android.importClass('android.app.Activity');
-        var PendingIntent = plus.android.importClass('android.app.PendingIntent');
-        var IntentFilter = plus.android.importClass('android.content.IntentFilter');
-        NfcAdapter = plus.android.importClass('android.nfc.NfcAdapter');
-        var nfcAdapter = NfcAdapter.getDefaultAdapter(main);
- 
-        if (nfcAdapter == null) {
-            uni.showToast({
-                title: '设备不支持NFC！',
-                icon: 'none'
-            })
-            return;
-        }
-         
-        if (!nfcAdapter.isEnabled()) {
-            uni.showToast({
-                title: '请在系统设置中先启用NFC功能！',
-                icon: 'none'
-            });
-            return;
-        }
- 
-        var intent = new Intent(main, main.getClass());
-        intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
-        var pendingIntent = PendingIntent.getActivity(main, 0, intent, 0);
-        var ndef = new IntentFilter("android.nfc.action.TECH_DISCOVERED");
-        ndef.addDataType("*/*");
-        var intentFiltersArray = [ndef];
-        var techListsArray = [
-            ["android.nfc.tech.IsoDep"],
-            ["android.nfc.tech.NfcA"],
-            ["android.nfc.tech.NfcB"],
-            ["android.nfc.tech.NfcF"],
-            ["android.nfc.tech.Nfcf"],
-            ["android.nfc.tech.NfcV"],
-            ["android.nfc.tech.NdefFormatable"],
-            ["android.nfc.tech.MifareClassic"],
-            ["android.nfc.tech.MifareUltralight"]
-        ];
-        plus.globalEvent.addEventListener("newintent",
-            function() {
-                setTimeout(handle_nfc_data1, 1000);
-            }, false);
-        plus.globalEvent.addEventListener("pause", function(e) {
-            if (nfcAdapter) {
-                nfcAdapter.disableForegroundDispatch(main);
-            }
-        }, false);
-        plus.globalEvent.addEventListener("resume", function(e) {
-            if (nfcAdapter) {
-                //console.log('resume'); 
-                nfcAdapter.enableForegroundDispatch(main, pendingIntent, intentFiltersArray, techListsArray);
-            }
-        }, false);
-        nfcAdapter.enableForegroundDispatch(main, pendingIntent, intentFiltersArray, techListsArray);
-    } catch (e) {
-        console.error(e);
-    }
-}
- 
-function handle_nfc_data1() {
-    NdefRecord = plus.android.importClass("android.nfc.NdefRecord");
-    NdefMessage = plus.android.importClass("android.nfc.NdefMessage");
-    var main = plus.android.runtimeMainActivity();
-    var intent = main.getIntent();
-    //console.log("action type:" + intent.getAction()); 
-    if ("android.nfc.action.TECH_DISCOVERED" == intent.getAction()) {
-        if (readyWriteData) {
-            //__write(intent);
-            readyWriteData = false;
-        } else if (readyRead) {
-            __read(intent);
-            readyRead = false;
-        }
-    }
-}
- 
-function showToast(msg) {
-    plus.nativeUI.toast(msg);
-}
- 
-// function __write(intent) {
-//  try {
-//      waiting.setTitle('请勿移开标签\n正在写入...');
-//      var text = document.getElementById('text').value;
-//      console.log("text=" + text);
-//      var textBytes = plus.android.invoke(text, "getBytes");
-//      var textRecord = new NdefRecord(NdefRecord.TNF_MIME_MEDIA,
-//          plus.android.invoke("text/plain", "getBytes"), plus.android.invoke("", "getBytes"), textBytes);
-//      var message = new NdefMessage([textRecord]);
-//      var Ndef = plus.android.importClass('android.nfc.tech.Ndef');
-//      var NdefFormatable = plus.android.importClass('android.nfc.tech.NdefFormatable');
-//      var tag = intent.getParcelableExtra(NfcAdapter.EXTRA_TAG);
-//      var ndef = Ndef.get(tag);
-//      if (ndef != null) {
-//          var size = message.toByteArray().length;
-//          console.log("size=" + size);
-//          ndef.connect();
-//          if (!ndef.isWritable()) {
-//              showToast("tag不允许写入");
-//              waiting.close();
-//              return;
-//          }
-//          if (ndef.getMaxSize() < size) {
-//              showToast("文件大小超出容量");
-//              waiting.close();
-//              return;
-//          }
- 
-//          ndef.writeNdefMessage(message);
-//          waiting.close();
-//          showToast("写入数据成功.");
-//          return;
-//      } else {
-//          var format = NdefFormatable.get(tag);
-//          if (format != null) {
-//              try {
-//                  format.connect();
-//                  format.format(message);
-//                  showToast("格式化tag并且写入message");
-//                  waiting.close();
-//                  return;
-//              } catch (e) {
-//                  showToast("格式化tag失败.");
-//                  waiting.close();
-//                  return;
-//              }
-//          } else {
-//              showToast("Tag不支持NDEF");
-//              waiting.close();
-//              return;
-//          }
-//      }
-//  } catch (e) {
-//      console.log("error=" + e);
-//      waiting.close();
-//      alert('写入失败');
-//  }
- 
-// }
- 
-function __read(intent) {
-    try {
-        var content = "";
-        waiting.setTitle('请勿移开卡\n正在读取数据...');
-        var tag = plus.android.importClass("android.nfc.Tag");
-        tag = intent.getParcelableExtra(NfcAdapter.EXTRA_TAG);
-        var bytesId = intent.getByteArrayExtra(NfcAdapter.EXTRA_ID);
-        waiting.close();
-        var tagid = bytesToDecimalString(tag.getId())
-        if (typeof _getCardNo === 'function') {
-            _getCardNo(tagid);
-        }
-    } catch (e) {
-        uni.showToast({
-            title: e,
-            icon: 'none'
-        });
-    }
-}
- 
-// function bytesToHexString(inarray) {
-//     var i, j, x;
-//     var hex = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A",
-//         "B", "C", "D", "E", "F"
-//     ];
-//     var out = "";
-//     for (j = 0; j < inarray.length; ++j) {
-//         x = parseInt(inarray[j]) & 0xff;
-//         i = (x >> 4) & 0x0f;
-//         out += hex[i];
-//         i = x & 0x0f;
-//         out += hex[i];
-//     }
-//     return out;
+var NfcAdapter;
+var NdefRecord;
+var NdefMessage;
+var _getCardNo;
+ 
+export default {
+    initNFC() {
+        if (uni.getSystemInfoSync().platform == 'android') {
+            listenNFCStatus()
+        }
+    },
+    readNFC(callback) {
+        if (uni.getSystemInfoSync().platform == 'android') {
+            readData(callback);
+        }
+    },
+    closeNFC() {
+        if (uni.getSystemInfoSync().platform == 'android') {
+            closeReadAndWrite();
+        }
+    }
+}
+ 
+function listenNFCStatus() {
+    try {
+        var main = plus.android.runtimeMainActivity();
+        var Intent = plus.android.importClass('android.content.Intent');
+        var Activity = plus.android.importClass('android.app.Activity');
+        var PendingIntent = plus.android.importClass('android.app.PendingIntent');
+        var IntentFilter = plus.android.importClass('android.content.IntentFilter');
+        NfcAdapter = plus.android.importClass('android.nfc.NfcAdapter');
+        var nfcAdapter = NfcAdapter.getDefaultAdapter(main);
+ 
+        if (nfcAdapter == null) {
+            uni.showToast({
+                title: '设备不支持NFC！',
+                icon: 'none'
+            })
+            return;
+        }
+         
+        if (!nfcAdapter.isEnabled()) {
+            uni.showToast({
+                title: '请在系统设置中先启用NFC功能！',
+                icon: 'none'
+            });
+            return;
+        }
+ 
+        var intent = new Intent(main, main.getClass());
+        intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+        var pendingIntent = PendingIntent.getActivity(main, 0, intent, 0);
+        var ndef = new IntentFilter("android.nfc.action.TECH_DISCOVERED");
+        ndef.addDataType("*/*");
+        var intentFiltersArray = [ndef];
+        var techListsArray = [
+            ["android.nfc.tech.IsoDep"],
+            ["android.nfc.tech.NfcA"],
+            ["android.nfc.tech.NfcB"],
+            ["android.nfc.tech.NfcF"],
+            ["android.nfc.tech.Nfcf"],
+            ["android.nfc.tech.NfcV"],
+            ["android.nfc.tech.NdefFormatable"],
+            ["android.nfc.tech.MifareClassic"],
+            ["android.nfc.tech.MifareUltralight"]
+        ];
+        plus.globalEvent.addEventListener("newintent",
+            function() {
+                setTimeout(handle_nfc_data1, 1000);
+            }, false);
+        plus.globalEvent.addEventListener("pause", function(e) {
+            if (nfcAdapter) {
+                nfcAdapter.disableForegroundDispatch(main);
+            }
+        }, false);
+        plus.globalEvent.addEventListener("resume", function(e) {
+            if (nfcAdapter) {
+                //console.log('resume'); 
+                nfcAdapter.enableForegroundDispatch(main, pendingIntent, intentFiltersArray, techListsArray);
+            }
+        }, false);
+        nfcAdapter.enableForegroundDispatch(main, pendingIntent, intentFiltersArray, techListsArray);
+    } catch (e) {
+        console.error(e);
+    }
+}
+ 
+function handle_nfc_data1() {
+    NdefRecord = plus.android.importClass("android.nfc.NdefRecord");
+    NdefMessage = plus.android.importClass("android.nfc.NdefMessage");
+    var main = plus.android.runtimeMainActivity();
+    var intent = main.getIntent();
+    //console.log("action type:" + intent.getAction()); 
+    if ("android.nfc.action.TECH_DISCOVERED" == intent.getAction()) {
+        if (readyWriteData) {
+            //__write(intent);
+            readyWriteData = false;
+        } else if (readyRead) {
+            __read(intent);
+            readyRead = false;
+        }
+    }
+}
+ 
+function showToast(msg) {
+    plus.nativeUI.toast(msg);
+}
+ 
+// function __write(intent) {
+//  try {
+//      waiting.setTitle('请勿移开标签\n正在写入...');
+//      var text = document.getElementById('text').value;
+//      console.log("text=" + text);
+//      var textBytes = plus.android.invoke(text, "getBytes");
+//      var textRecord = new NdefRecord(NdefRecord.TNF_MIME_MEDIA,
+//          plus.android.invoke("text/plain", "getBytes"), plus.android.invoke("", "getBytes"), textBytes);
+//      var message = new NdefMessage([textRecord]);
+//      var Ndef = plus.android.importClass('android.nfc.tech.Ndef');
+//      var NdefFormatable = plus.android.importClass('android.nfc.tech.NdefFormatable');
+//      var tag = intent.getParcelableExtra(NfcAdapter.EXTRA_TAG);
+//      var ndef = Ndef.get(tag);
+//      if (ndef != null) {
+//          var size = message.toByteArray().length;
+//          console.log("size=" + size);
+//          ndef.connect();
+//          if (!ndef.isWritable()) {
+//              showToast("tag不允许写入");
+//              waiting.close();
+//              return;
+//          }
+//          if (ndef.getMaxSize() < size) {
+//              showToast("文件大小超出容量");
+//              waiting.close();
+//              return;
+//          }
+ 
+//          ndef.writeNdefMessage(message);
+//          waiting.close();
+//          showToast("写入数据成功.");
+//          return;
+//      } else {
+//          var format = NdefFormatable.get(tag);
+//          if (format != null) {
+//              try {
+//                  format.connect();
+//                  format.format(message);
+//                  showToast("格式化tag并且写入message");
+//                  waiting.close();
+//                  return;
+//              } catch (e) {
+//                  showToast("格式化tag失败.");
+//                  waiting.close();
+//                  return;
+//              }
+//          } else {
+//              showToast("Tag不支持NDEF");
+//              waiting.close();
+//              return;
+//          }
+//      }
+//  } catch (e) {
+//      console.log("error=" + e);
+//      waiting.close();
+//      alert('写入失败');
+//  }
+ 
 // }
-function bytesToDecimalString(inarray) {
-    let result = BigInt(0);
-    // 反转数组以适配大端序
-    const reversed = [...inarray].reverse();
-    for (let j = 0; j < reversed.length; j++) {
-        const byte = BigInt(parseInt(reversed[j])) & BigInt(0xff);
-        result = (result << BigInt(8)) | byte;
-    }
-    return result.toString();
-}
- 
-function reverseTwo(str) {
- 
-    var str1 = "";
-    for (var i = 1; i <= str.length; i++) {
-        str1 += str[i - 1];
-        if (i % 2 == 0) {
-            if (i == str.length) {
-                break;
-            }
-            str1 += ":";
-        }
-    }
-    var str2 = "";
-    for (var i = str1.split(":").length - 1; i >= 0; i--) {
-        str2 += str1.split(":")[i];
-    }
-    return str2;
-}
- 
-if (uni.getSystemInfoSync().platform == 'android') {
-    //plus.globalEvent.addEventListener('plusready', listenNFCStatus, false);
-}
- 
-var waiting;
-var readyWriteData = false;
-var readyRead = false;
- 
-function writeData() {
-    var textEle = plus.globalEvent.getElementById('text');
-    if (!textEle.value) {
-        uni.showToast({
-            title: '请输入要写入的内容！',
-            icon: 'none'
-        });
-        return;
-    }
-    readyWriteData = true;
-    waiting = plus.nativeUI.showWaiting("请将卡靠近！");
-}
- 
-function readData(getCardNo) {
-    readyRead = true;
-    _getCardNo = getCardNo
-    waiting = plus.nativeUI.showWaiting("请将卡靠近！", {
-        modal: false
-    });
-}
- 
-function closeReadAndWrite() {
-    readyWriteData = false;
-    readyRead = false;
- 
-    if (waiting) {
-        waiting.close();
-    }
+ 
+function __read(intent) {
+    try {
+        var content = "";
+        waiting.setTitle('请勿移开卡\n正在读取数据...');
+        var tag = plus.android.importClass("android.nfc.Tag");
+        tag = intent.getParcelableExtra(NfcAdapter.EXTRA_TAG);
+        var bytesId = intent.getByteArrayExtra(NfcAdapter.EXTRA_ID);
+        waiting.close();
+        var tagid = bytesToDecimalString(tag.getId())
+        if (typeof _getCardNo === 'function') {
+            _getCardNo(tagid);
+        }
+    } catch (e) {
+        uni.showToast({
+            title: e,
+            icon: 'none'
+        });
+    }
+}
+ 
+// function bytesToHexString(inarray) {
+//     var i, j, x;
+//     var hex = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A",
+//         "B", "C", "D", "E", "F"
+//     ];
+//     var out = "";
+//     for (j = 0; j < inarray.length; ++j) {
+//         x = parseInt(inarray[j]) & 0xff;
+//         i = (x >> 4) & 0x0f;
+//         out += hex[i];
+//         i = x & 0x0f;
+//         out += hex[i];
+//     }
+//     return out;
+// }
+function bytesToDecimalString(inarray) {
+    let result = BigInt(0);
+    // 反转数组以适配大端序
+    const reversed = [...inarray].reverse();
+    for (let j = 0; j < reversed.length; j++) {
+        const byte = BigInt(parseInt(reversed[j])) & BigInt(0xff);
+        result = (result << BigInt(8)) | byte;
+    }
+    return result.toString();
+}
+ 
+function reverseTwo(str) {
+ 
+    var str1 = "";
+    for (var i = 1; i <= str.length; i++) {
+        str1 += str[i - 1];
+        if (i % 2 == 0) {
+            if (i == str.length) {
+                break;
+            }
+            str1 += ":";
+        }
+    }
+    var str2 = "";
+    for (var i = str1.split(":").length - 1; i >= 0; i--) {
+        str2 += str1.split(":")[i];
+    }
+    return str2;
+}
+ 
+if (uni.getSystemInfoSync().platform == 'android') {
+    //plus.globalEvent.addEventListener('plusready', listenNFCStatus, false);
+}
+ 
+var waiting;
+var readyWriteData = false;
+var readyRead = false;
+ 
+function writeData() {
+    var textEle = plus.globalEvent.getElementById('text');
+    if (!textEle.value) {
+        uni.showToast({
+            title: '请输入要写入的内容！',
+            icon: 'none'
+        });
+        return;
+    }
+    readyWriteData = true;
+    waiting = plus.nativeUI.showWaiting("请将卡靠近！");
+}
+ 
+function readData(getCardNo) {
+    readyRead = true;
+    _getCardNo = getCardNo
+    waiting = plus.nativeUI.showWaiting("请将卡靠近！", {
+        modal: false
+    });
+}
+ 
+function closeReadAndWrite() {
+    readyWriteData = false;
+    readyRead = false;
+ 
+    if (waiting) {
+        waiting.close();
+    }
 }

package/w-card/w-card.vue

@@ -52,7 +52,8 @@ const props = defineProps({
 	  type:Object,
 	  default:{
 		  label:null,
-		  show:null
+		  show:null,
+		  clickAction:null
 	  }
   }
 })
@@ -151,6 +152,13 @@ function goto(type: string, item: any = {}, subItem: any = {}) {
       })
       break
     case 'edit':
+	  
+	  if(props.editButtonConfig.clickAction){
+		  props.editButtonConfig.clickAction(props.itemData)
+		  return
+	  }
+	  
+	
       if (props.actionType === 'relation') {
         emits('edit')
 		
@@ -357,6 +365,7 @@ function EditButtonLabel(){
         <wd-button :round="false" size="small" class="btn"  v-if="props.page.buttons.includes('detail')" @click="goto('detail')">
           详情
         </wd-button>
+		<!-- //编辑按钮 -->
         <wd-button :round="false" type="warning" size="small" class="btn"  v-if="isShowEditButton()"
           @click="goto('edit')">
           {{EditButtonLabel()}}
@@ -422,7 +431,7 @@ function EditButtonLabel(){
   }
 
   position: relative; // 添加定位上下文
-  padding-bottom: 80rpx; // 为按钮预留空间
+  padding-bottom: 20rpx; // 为按钮预留空间
 
   .expand-btn-container {
     /* 尺寸调整 */
@@ -434,7 +443,7 @@ function EditButtonLabel(){
     position: absolute;
     right: 50%;
     transform: translateX(50%);
-    bottom: 0;
+    bottom: -23px;
     width: auto !important;
     margin-top: 0;
 

package/w-form-control/w-form-control.vue

@@ -135,7 +135,7 @@
 
 <script setup lang="ts">
 import wSelectPicker from '../w-select-picker/w-select-picker.vue'
-import dayjs from 'dayjs/esm/index'
+import dayjs from 'dayjs/esm/index'
 import { defineProps, ref, defineEmits, computed } from 'vue'
 const props = defineProps({
   subItem: {
@@ -248,12 +248,12 @@ const success = (e: any) => {
   emit('update:modelValue', JSON.stringify({ valid: "new", fileKey: JSON.parse(e.file.response).fileKey, fileName: e.file.name, base: {...e.file } }))
 }
 
-const displayFormat1 = (value:any) => {
-  return dayjs(value[0]).format('YYYY-MM-DD HH:mm:ss') + ' ~ ' + dayjs(value[1]).format('YYYY-MM-DD HH:mm:ss')
+const displayFormat1 = (value:any) => {
+  return dayjs(value[0]).format('YYYY-MM-DD HH:mm:ss') + ' ~ ' + dayjs(value[1]).format('YYYY-MM-DD HH:mm:ss')
 }
 
-const displayFormat2=(value:any) => {
-  return dayjs(value[0]).format('YYYY-MM-DD') + ' ~ ' + dayjs(value[1]).format('YYYY-MM-DD')
+const displayFormat2=(value:any) => {
+  return dayjs(value[0]).format('YYYY-MM-DD') + ' ~ ' + dayjs(value[1]).format('YYYY-MM-DD')
 }
 
 //wSelectPicker组件确定事件

package/w-select-picker/index.scss

@@ -1,185 +1,185 @@
-@import 'wot-design-uni/components/common/abstracts/variable';
-@import 'wot-design-uni/components/common/abstracts/mixin';
-
-.wot-theme-dark {
-  @include b(select-picker) {
-    @include when(border) {
-      .wd-select-picker__cell {
-        @include halfPixelBorder('top', $-cell-padding, $-dark-border-color);
-      }
-    }
-
-    @include e(cell) {
-      background-color: $-dark-background2;
-      color: $-dark-color;
-      @include when(disabled) {
-        .wd-select-picker__value {
-          color: $-dark-color3;
-        }
-      }
-    }
-
-    @include e(label) {
-      color: $-dark-color;
-    }
-    @include e(value) {
-      color: $-dark-color;
-      @include m(placeholder) {
-        color: $-dark-color-gray;
-      }
-    }
-
-    :deep(.wd-select-picker__arrow),
-    :deep(.wd-select-picker__close),
-    :deep(.wd-select-picker__clear) {
-      color: $-dark-color;
-    }
-
-  }
-
-}
-
-@include b(select-picker) {
-  @include when(border) {
-    .wd-select-picker__cell {
-      @include halfPixelBorder('top', $-cell-padding);
-    }
-  }
-  @include e(cell) {
-    position: relative;
-    display: flex;
-    padding: $-cell-wrapper-padding $-cell-padding;
-    align-items: flex-start;
-    background-color: $-color-white;
-    text-decoration: none;
-    color: $-cell-title-color;
-    font-size: $-cell-title-fs;
-    overflow: hidden;
-    line-height: $-cell-line-height;
-  }
-  @include e(cell) {
-    @include when(disabled) {
-      .wd-select-picker__value {
-        color: $-input-disabled-color;
-      }
-    }
-    @include when(align-right) {
-      .wd-select-picker__value {
-        text-align: right;
-      }
-    }
-    @include when(error) {
-      .wd-select-picker__value {
-        color: $-input-error-color;
-      }
-      :deep(.wd-select-picker__arrow) {
-        color: $-input-error-color;
-      }
-    }
-    @include when(large) {
-      font-size: $-cell-title-fs-large;
-
-      :deep(.wd-select-picker__arrow),
-      :deep(.wd-select-picker__clear) {
-        font-size: $-cell-icon-size-large;
-      }
-    }
-  }
-  @include e(error-message){
-    color: $-form-item-error-message-color;
-    font-size: $-form-item-error-message-font-size;
-    line-height: $-form-item-error-message-line-height;
-    text-align: left;
-    vertical-align: middle;
-  }
-  @include e(label) {
-    position: relative;
-    width: $-input-cell-label-width;
-    color: $-cell-title-color;
-    margin-right: $-cell-padding;
-    box-sizing: border-box;
-
-    @include when(required) {
-      padding-left: 12px;
-
-      &::after {
-        position: absolute;
-        left: 0;
-        top: 2px;
-        content: '*';
-        font-size: $-cell-required-size;
-        line-height: 1.1;
-        color: $-cell-required-color;
-      }
-    }
-  }
-  @include e(value-wraper) {
-    display: flex;
-  }
-  @include e(value) {
-    flex: 1;
-    margin-right: 10px;
-    color: $-cell-value-color;
-    
-    @include when(ellipsis) {
-      @include lineEllipsis;
-    }
-    @include m(placeholder) {
-      color: $-input-placeholder-color;
-    }
-  }
-  @include e(body) {
-    flex: 1;
-  }
-  @include edeep(arrow, clear) {
-    display: block;
-    font-size: $-cell-icon-size;
-    color: $-cell-arrow-color;
-    line-height: $-cell-line-height;
-  }
-
-  @include edeep(clear) {
-    color: $-cell-clear-color;
-  }
- 
-  @include e(loading) {
-    position: absolute;
-    display: flex;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    left: 0;
-    align-items: center;
-    justify-content: center;
-    z-index: 3;
-    background: $-picker-loading-bg;
-  }
-  // selectPiceker多出的样式
-  @include edeep(header) {
-    height: 72px;
-    line-height: 72px;
-  }
-  @include e(wrapper) {
-    padding: 0 10px;
-    position: relative;
-    max-height: 356px;
-    box-sizing: border-box;
-    overflow: auto;
-
-    @include when(filterable) {
-      height: 314px;
-      max-height: 314px;
-    }
-
-    @include when(loading) {
-      overflow: hidden;
-    }
-  }
-  @include e(text-active) {
-    color: $-color-theme;
-  }
-
-  @include e(footer) {
-    padding: 24px 15px;
-  }
-}
+@import 'wot-design-uni/components/common/abstracts/variable';
+@import 'wot-design-uni/components/common/abstracts/mixin';
+
+.wot-theme-dark {
+  @include b(select-picker) {
+    @include when(border) {
+      .wd-select-picker__cell {
+        @include halfPixelBorder('top', $-cell-padding, $-dark-border-color);
+      }
+    }
+
+    @include e(cell) {
+      background-color: $-dark-background2;
+      color: $-dark-color;
+      @include when(disabled) {
+        .wd-select-picker__value {
+          color: $-dark-color3;
+        }
+      }
+    }
+
+    @include e(label) {
+      color: $-dark-color;
+    }
+    @include e(value) {
+      color: $-dark-color;
+      @include m(placeholder) {
+        color: $-dark-color-gray;
+      }
+    }
+
+    :deep(.wd-select-picker__arrow),
+    :deep(.wd-select-picker__close),
+    :deep(.wd-select-picker__clear) {
+      color: $-dark-color;
+    }
+
+  }
+
+}
+
+@include b(select-picker) {
+  @include when(border) {
+    .wd-select-picker__cell {
+      @include halfPixelBorder('top', $-cell-padding);
+    }
+  }
+  @include e(cell) {
+    position: relative;
+    display: flex;
+    padding: $-cell-wrapper-padding $-cell-padding;
+    align-items: flex-start;
+    background-color: $-color-white;
+    text-decoration: none;
+    color: $-cell-title-color;
+    font-size: $-cell-title-fs;
+    overflow: hidden;
+    line-height: $-cell-line-height;
+  }
+  @include e(cell) {
+    @include when(disabled) {
+      .wd-select-picker__value {
+        color: $-input-disabled-color;
+      }
+    }
+    @include when(align-right) {
+      .wd-select-picker__value {
+        text-align: right;
+      }
+    }
+    @include when(error) {
+      .wd-select-picker__value {
+        color: $-input-error-color;
+      }
+      :deep(.wd-select-picker__arrow) {
+        color: $-input-error-color;
+      }
+    }
+    @include when(large) {
+      font-size: $-cell-title-fs-large;
+
+      :deep(.wd-select-picker__arrow),
+      :deep(.wd-select-picker__clear) {
+        font-size: $-cell-icon-size-large;
+      }
+    }
+  }
+  @include e(error-message){
+    color: $-form-item-error-message-color;
+    font-size: $-form-item-error-message-font-size;
+    line-height: $-form-item-error-message-line-height;
+    text-align: left;
+    vertical-align: middle;
+  }
+  @include e(label) {
+    position: relative;
+    width: $-input-cell-label-width;
+    color: $-cell-title-color;
+    margin-right: $-cell-padding;
+    box-sizing: border-box;
+
+    @include when(required) {
+      padding-left: 12px;
+
+      &::after {
+        position: absolute;
+        left: 0;
+        top: 2px;
+        content: '*';
+        font-size: $-cell-required-size;
+        line-height: 1.1;
+        color: $-cell-required-color;
+      }
+    }
+  }
+  @include e(value-wraper) {
+    display: flex;
+  }
+  @include e(value) {
+    flex: 1;
+    margin-right: 10px;
+    color: $-cell-value-color;
+    
+    @include when(ellipsis) {
+      @include lineEllipsis;
+    }
+    @include m(placeholder) {
+      color: $-input-placeholder-color;
+    }
+  }
+  @include e(body) {
+    flex: 1;
+  }
+  @include edeep(arrow, clear) {
+    display: block;
+    font-size: $-cell-icon-size;
+    color: $-cell-arrow-color;
+    line-height: $-cell-line-height;
+  }
+
+  @include edeep(clear) {
+    color: $-cell-clear-color;
+  }
+ 
+  @include e(loading) {
+    position: absolute;
+    display: flex;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    align-items: center;
+    justify-content: center;
+    z-index: 3;
+    background: $-picker-loading-bg;
+  }
+  // selectPiceker多出的样式
+  @include edeep(header) {
+    height: 72px;
+    line-height: 72px;
+  }
+  @include e(wrapper) {
+    padding: 0 10px;
+    position: relative;
+    max-height: 356px;
+    box-sizing: border-box;
+    overflow: auto;
+
+    @include when(filterable) {
+      height: 314px;
+      max-height: 314px;
+    }
+
+    @include when(loading) {
+      overflow: hidden;
+    }
+  }
+  @include e(text-active) {
+    color: $-color-theme;
+  }
+
+  @include e(footer) {
+    padding: 24px 15px;
+  }
+}

package/w-select-picker/types.ts

@@ -1,105 +1,105 @@
-import type { ComponentPublicInstance, ExtractPropTypes, PropType } from 'vue'
-import { baseProps, makeArrayProp, makeBooleanProp, makeNumberProp, makeRequiredProp, makeStringProp } from 'wot-design-uni/components/common/props'
-import type { FormItemRule } from 'wot-design-uni/components/wd-form/types'
-
-export type SelectPickerType = 'checkbox' | 'radio'
-
-export const selectPickerProps = {
-  ...baseProps,
-  /** 选择器左侧文案 */
-  label: String,
-  /** 设置左侧标题宽度 */
-  labelWidth: makeStringProp('33%'),
-  /** 禁用 */
-  disabled: makeBooleanProp(false),
-  /** 只读 */
-  readonly: Boolean,
-  /** 选择器占位符 */
-  placeholder: String,
-  /** 弹出层标题 */
-  title: String,
-  /** 选择器的值靠右展示 */
-  alignRight: makeBooleanProp(false),
-  /** 是否为错误状态，错误状态时右侧内容为红色 */
-  error: makeBooleanProp(false),
-  /** 必填样式 */
-  required: makeBooleanProp(false),
-  /** 使用 label 插槽时设置该选项 */
-  useLabelSlot: makeBooleanProp(false),
-  /** 使用默认插槽时设置该选项 */
-  useDefaultSlot: makeBooleanProp(false),
-  /** 设置选择器大小 */
-  size: String,
-  /** 选中的颜色（单/复选框） */
-  checkedColor: String,
-  /** 最小选中的数量（仅在复选框类型下生效，`type`类型为`checkbox`） */
-  min: makeNumberProp(0),
-  /** 最大选中的数量，0 为无限数量，默认为 0（仅在复选框类型下生效，`type`类型为`checkbox`） */
-  max: makeNumberProp(0),
-  /** 设置 picker 内部的选项组尺寸大小 （单/复选框） */
-  selectSize: String,
-  /** 加载中 */
-  // loading: makeBooleanProp(false),
-  /** 加载的颜色，只能使用十六进制的色值写法，且不能使用缩写 */
-  loadingColor: makeStringProp('#4D80F0'),
-  /** 点击遮罩是否关闭 */
-  closeOnClickModal: makeBooleanProp(true),
-  /** 选中项，`type`类型为`checkbox`时，类型为 array；`type`为`radio` 时 ，类型为 number / boolean / string */
-  modelValue: makeRequiredProp([String, Number, Boolean, Array] as PropType<string | number | boolean | (string | number | boolean)[]>),
-  /** 选择器数据，一维数组 */
-  columns: makeArrayProp<Record<string, any>>(),
-  /** 单复选选择器类型 */
-  type: makeStringProp<SelectPickerType>('checkbox'),
-  /** 选项对象中，value 对应的 key */
-  valueKey: makeStringProp('value'),
-  /** 选项对象中，展示的文本对应的 key */
-  labelKey: makeStringProp('label'),
-  /** 确认按钮文案 */
-  confirmButtonText: String,
-  /** 自定义展示文案的格式化函数，返回一个字符串 */
-  displayFormat: Function as PropType<SelectPickerDisplayFormat>,
-  /** 确定前校验函数，接收 (value, resolve) 参数，通过 resolve 继续执行 picker，resolve 接收 1 个 boolean 参数 */
-  beforeConfirm: Function as PropType<SelectPickerBeforeConfirm>,
-  /** 弹窗层级 */
-  zIndex: makeNumberProp(15),
-  /** 弹出面板是否设置底部安全距离（iphone X 类型的机型） */
-  safeAreaInsetBottom: makeBooleanProp(true),
-  /** 可搜索（目前只支持本地搜索） */
-  filterable: makeBooleanProp(false),
-  /** 搜索框占位符 */
-  filterPlaceholder: String,
-  /** 是否超出隐藏 */
-  ellipsis: makeBooleanProp(false),
-  /** 重新打开是否滚动到选中项 */
-  scrollIntoView: makeBooleanProp(true),
-  /** 表单域 `model` 字段名，在使用表单校验功能的情况下，该属性是必填的 */
-  prop: String,
-  /** 表单验证规则，结合`wd-form`组件使用 */
-  rules: makeArrayProp<FormItemRule>(),
-  /** 自定义内容样式类 */
-  customContentClass: makeStringProp(''),
-  /** 自定义标签样式类 */
-  customLabelClass: makeStringProp(''),
-  /** 自定义值样式类 */
-  customValueClass: makeStringProp(''),
-  /** 是否显示确认按钮（radio类型生效），默认值为：true */
-  showConfirm: makeBooleanProp(true),
-  /**
-   * 显示清空按钮
-   */
-  clearable: makeBooleanProp(false)
-}
-export type SelectPickerProps = ExtractPropTypes<typeof selectPickerProps>
-
-export type SelectPickerDisplayFormat = (items: string | number | boolean | (string | number | boolean)[], columns: Record<string, any>[]) => string
-
-export type SelectPickerBeforeConfirm = (value: string | number | boolean | (string | number | boolean)[], resolve: (isPass: boolean) => void) => void
-
-export type SelectPickerExpose = {
-  // 打开picker弹框
-  open: () => void
-  // 关闭picker弹框
-  close: () => void
-}
-
-export type SelectPickerInstance = ComponentPublicInstance<SelectPickerExpose, SelectPickerProps>
+import type { ComponentPublicInstance, ExtractPropTypes, PropType } from 'vue'
+import { baseProps, makeArrayProp, makeBooleanProp, makeNumberProp, makeRequiredProp, makeStringProp } from 'wot-design-uni/components/common/props'
+import type { FormItemRule } from 'wot-design-uni/components/wd-form/types'
+
+export type SelectPickerType = 'checkbox' | 'radio'
+
+export const selectPickerProps = {
+  ...baseProps,
+  /** 选择器左侧文案 */
+  label: String,
+  /** 设置左侧标题宽度 */
+  labelWidth: makeStringProp('33%'),
+  /** 禁用 */
+  disabled: makeBooleanProp(false),
+  /** 只读 */
+  readonly: Boolean,
+  /** 选择器占位符 */
+  placeholder: String,
+  /** 弹出层标题 */
+  title: String,
+  /** 选择器的值靠右展示 */
+  alignRight: makeBooleanProp(false),
+  /** 是否为错误状态，错误状态时右侧内容为红色 */
+  error: makeBooleanProp(false),
+  /** 必填样式 */
+  required: makeBooleanProp(false),
+  /** 使用 label 插槽时设置该选项 */
+  useLabelSlot: makeBooleanProp(false),
+  /** 使用默认插槽时设置该选项 */
+  useDefaultSlot: makeBooleanProp(false),
+  /** 设置选择器大小 */
+  size: String,
+  /** 选中的颜色（单/复选框） */
+  checkedColor: String,
+  /** 最小选中的数量（仅在复选框类型下生效，`type`类型为`checkbox`） */
+  min: makeNumberProp(0),
+  /** 最大选中的数量，0 为无限数量，默认为 0（仅在复选框类型下生效，`type`类型为`checkbox`） */
+  max: makeNumberProp(0),
+  /** 设置 picker 内部的选项组尺寸大小 （单/复选框） */
+  selectSize: String,
+  /** 加载中 */
+  // loading: makeBooleanProp(false),
+  /** 加载的颜色，只能使用十六进制的色值写法，且不能使用缩写 */
+  loadingColor: makeStringProp('#4D80F0'),
+  /** 点击遮罩是否关闭 */
+  closeOnClickModal: makeBooleanProp(true),
+  /** 选中项，`type`类型为`checkbox`时，类型为 array；`type`为`radio` 时 ，类型为 number / boolean / string */
+  modelValue: makeRequiredProp([String, Number, Boolean, Array] as PropType<string | number | boolean | (string | number | boolean)[]>),
+  /** 选择器数据，一维数组 */
+  columns: makeArrayProp<Record<string, any>>(),
+  /** 单复选选择器类型 */
+  type: makeStringProp<SelectPickerType>('checkbox'),
+  /** 选项对象中，value 对应的 key */
+  valueKey: makeStringProp('value'),
+  /** 选项对象中，展示的文本对应的 key */
+  labelKey: makeStringProp('label'),
+  /** 确认按钮文案 */
+  confirmButtonText: String,
+  /** 自定义展示文案的格式化函数，返回一个字符串 */
+  displayFormat: Function as PropType<SelectPickerDisplayFormat>,
+  /** 确定前校验函数，接收 (value, resolve) 参数，通过 resolve 继续执行 picker，resolve 接收 1 个 boolean 参数 */
+  beforeConfirm: Function as PropType<SelectPickerBeforeConfirm>,
+  /** 弹窗层级 */
+  zIndex: makeNumberProp(15),
+  /** 弹出面板是否设置底部安全距离（iphone X 类型的机型） */
+  safeAreaInsetBottom: makeBooleanProp(true),
+  /** 可搜索（目前只支持本地搜索） */
+  filterable: makeBooleanProp(false),
+  /** 搜索框占位符 */
+  filterPlaceholder: String,
+  /** 是否超出隐藏 */
+  ellipsis: makeBooleanProp(false),
+  /** 重新打开是否滚动到选中项 */
+  scrollIntoView: makeBooleanProp(true),
+  /** 表单域 `model` 字段名，在使用表单校验功能的情况下，该属性是必填的 */
+  prop: String,
+  /** 表单验证规则，结合`wd-form`组件使用 */
+  rules: makeArrayProp<FormItemRule>(),
+  /** 自定义内容样式类 */
+  customContentClass: makeStringProp(''),
+  /** 自定义标签样式类 */
+  customLabelClass: makeStringProp(''),
+  /** 自定义值样式类 */
+  customValueClass: makeStringProp(''),
+  /** 是否显示确认按钮（radio类型生效），默认值为：true */
+  showConfirm: makeBooleanProp(true),
+  /**
+   * 显示清空按钮
+   */
+  clearable: makeBooleanProp(false)
+}
+export type SelectPickerProps = ExtractPropTypes<typeof selectPickerProps>
+
+export type SelectPickerDisplayFormat = (items: string | number | boolean | (string | number | boolean)[], columns: Record<string, any>[]) => string
+
+export type SelectPickerBeforeConfirm = (value: string | number | boolean | (string | number | boolean)[], resolve: (isPass: boolean) => void) => void
+
+export type SelectPickerExpose = {
+  // 打开picker弹框
+  open: () => void
+  // 关闭picker弹框
+  close: () => void
+}
+
+export type SelectPickerInstance = ComponentPublicInstance<SelectPickerExpose, SelectPickerProps>

package/w-table/w-table.vue

@@ -46,7 +46,8 @@ const props = defineProps({
   	 type:Object,
   	 default:{
   	 		label:"",
-  	 		show:null
+  	 		show:null,
+			clickAction:null
   	 }
   }
 })