sard-uniapp 1.10.2 → 1.10.4

package/README.md

@@ -114,7 +114,7 @@ npm run release
 - 提交
 - 给提交打标签
 - 运行 `npm run buildAndRelease` 打包组件库并发布到 npm
-- 发布到 uniapp 插件市场
+- 使用 HBuilderX 发布到 uniapp 插件市场
 - 运行 `npm run push` 推送代码和标签
 - 运行 `npm run build:site` 打包文档（如果文档有修改）
 - 运行 `npm run deploy` 部署文档（如果文档有修改）

package/changelog.md

@@ -1,9 +1,19 @@
-## [1.10.2](https://github.com/sutras/sard-uniapp/compare/v1.10.1...v1.10.2) (2025-02-14)
+## [1.10.4](https://github.com/sutras/sard-uniapp/compare/v1.10.3...v1.10.4) (2025-02-19)
+
+
+### Bug Fixes
+
+* 使用 [@import](https://github.com/import) 导入scss, 兼容mp-alipay ([1830610](https://github.com/sutras/sard-uniapp/commit/1830610e17b29fd5f7e362d5c04a0ebcbb1ac772))
+
+
+
+## [1.10.3](https://github.com/sutras/sard-uniapp/compare/v1.10.1...v1.10.3) (2025-02-19)
 
 
 ### Bug Fixes
 
 * 修复 cascader, cascader-input 组件 ([e964e40](https://github.com/sutras/sard-uniapp/commit/e964e400452e873713a95b9a07cbe4e1459113cc))
+* 确保 DatetimePickerInput value 格式化, 移除sass警告 ([e8e326d](https://github.com/sutras/sard-uniapp/commit/e8e326d9db1b96bd542bff5a1a60276083d53fba))
 
 
 

package/components/calendar/calendar.vue

@@ -67,12 +67,15 @@
     type="compact"
     @confirm="onPickerConfirm"
   >
-    <sar-datetime-picker
-      type="yM"
-      v-model="pickerValue"
-      :min="minDate"
-      :max="maxDate"
-    />
+    <template #visible="{ already }">
+      <sar-datetime-picker
+        v-if="already"
+        type="yM"
+        v-model="pickerValue"
+        :min="minDate"
+        :max="maxDate"
+      />
+    </template>
   </sar-popout>
 </template>
 

package/components/datetime-picker-input/datetime-picker-input.vue

@@ -115,8 +115,9 @@ export default  _defineComponent({
       return maxDate2 < minDate.value ? new Date(minDate.value) : maxDate2;
     });
     const onConfirm = () => {
-      if (isNullish(popoutValue.value)) {
-        popoutValue.value = getInitialValue(minDate.value, maxDate.value);
+      if (!popoutValue.value) {
+        const initialValue = getInitialValue(minDate.value, maxDate.value);
+        popoutValue.value = props.valueFormat ? formatDate(initialValue, props.valueFormat) : initialValue;
       }
       innerValue.value = popoutValue.value;
       emit("update:model-value", popoutValue.value);

package/components/input/index.scss

@@ -50,6 +50,7 @@
     border-width: 0;
     font-size: var(--sar-input-control-font-size);
     line-height: var(--sar-input-control-line-height);
+    background-color: transparent;
 
     @include m(input) {
       height: var(--sar-input-control-input-height);

package/components/input/input.vue

@@ -54,6 +54,7 @@
         @keyboardheightchange="onKeyboardheightchange"
         :auto-height="autoHeight"
         :style="controlStyle"
+        :show-count="false"
       />
       <input
         v-else

package/components/popout/popout.vue

@@ -18,15 +18,16 @@
             :loading="loading.cancel"
             @click="onCancel"
           >
-            <slot name="cancel">
-              {{ cancelText || t('cancel') }}
-            </slot>
+            <template v-if="cancelText">{{ cancelText }}</template>
+            <slot v-else-if="$slots.cancel" name="cancel"></slot>
+            <template v-else>{{ t('cancel') }}</template>
           </sar-button>
         </view>
         <view :class="bem.e('title')">
-          <slot name="title">
+          <template v-if="title">
             <text :class="bem.e('title-text')">{{ title }}</text>
-          </slot>
+          </template>
+          <slot v-else-if="$slots.title" name="title"></slot>
         </view>
         <view v-if="type === 'compact'" :class="bem.e('button-wrap')">
           <sar-button
@@ -37,9 +38,9 @@
             :disabled="confirmDisabled"
             @click="onConfirm"
           >
-            <slot name="confirm">
-              {{ confirmText || t('confirm') }}
-            </slot>
+            <template v-if="confirmText">{{ confirmText }}</template>
+            <slot v-else-if="$slots.confirm" name="confirm"></slot>
+            <template v-else>{{ t('confirm') }}</template>
           </sar-button>
         </view>
         <view
@@ -63,9 +64,9 @@
           :loading="loading.cancel"
           @click="onCancel"
         >
-          <slot name="cancel">
-            {{ cancelText || t('cancel') }}
-          </slot>
+          <template v-if="cancelText">{{ cancelText }}</template>
+          <slot v-else-if="$slots.cancel" name="cancel"></slot>
+          <template v-else>{{ t('cancel') }}</template>
         </sar-button>
         <sar-button
           v-if="showConfirm"
@@ -76,9 +77,9 @@
           :disabled="confirmDisabled"
           @click="onConfirm"
         >
-          <slot name="confirm">
-            {{ confirmText || t('confirm') }}
-          </slot>
+          <template v-if="confirmText">{{ confirmText }}</template>
+          <slot v-else-if="$slots.confirm" name="confirm"></slot>
+          <template v-else>{{ t('confirm') }}</template>
         </sar-button>
       </view>
     </view>

package/components/qrcode/qrcode.vue

@@ -119,7 +119,7 @@ export default  _defineComponent({
       const moduleSize = size / (map.length + props.quietZoneModules * 2);
       const margin = moduleSize * props.quietZoneModules;
       const context = canvas.getContext("2d");
-      const path2D = canvas.createPath2D ? canvas.createPath2D() : new Path2D();
+      const path2D = context.createPath2D ? context.createPath2D() : canvas.createPath2D ? canvas.createPath2D() : new Path2D();
       map.forEach((row, rowIndex) => {
         row.forEach((col, colIndex) => {
           if (col === 1) {

package/components/style/functions.scss

@@ -1,15 +1,18 @@
 @use 'sass:color';
 @use 'sass:math';
+@use 'sass:string';
+@use 'sass:list';
+@use 'sass:map';
 @use './configuration' as *;
 
 // scss原生并没有提供字符串的替换函数，需自己编写函数来实现这个功能
 @function str-replace($string, $search, $replace) {
-  $index: str-index($string, $search);
+  $index: string.index($string, $search);
 
   @if $index {
-    @return str-slice($string, 1, $index - 1) + $replace +
+    @return string.slice($string, 1, $index - 1) + $replace +
       str-replace(
-        str-slice($string, $index + str-length($search)),
+        string.slice($string, $index + string.length($search)),
         $search,
         $replace
       );
@@ -25,13 +28,10 @@
 
 // 把一个数四舍五入到指定位数小数
 @function tofixed($n, $digits: 0) {
-  @return math.div(round($n * math.pow(10, $digits)), math.pow(10, $digits));
-}
-
-// 从一个颜色提取出rgb组成一个字符串，通过赋值给一个css变量，
-// 以便将此变量和一个透明度组成一个rgba从而实现自定义一个颜色的透明度。
-@function extractRGB($color) {
-  @return '#{color.red($color)},#{color.green($color)},#{color.blue($color)}';
+  @return math.div(
+    math.round($n * math.pow(10, $digits)),
+    math.pow(10, $digits)
+  );
 }
 
 @function bem-ns($str) {
@@ -49,24 +49,69 @@
   @return $result;
 }
 
+// 兼容旧版本
 @function str-split($string, $separator) {
   // empty array/list
   $split-arr: ();
   // first index of separator in string
-  $index: str-index($string, $separator);
+  $index: string.index($string, $separator);
   // loop through string
   @while $index != null {
     // get the substring from the first character to the separator
-    $item: str-slice($string, 1, $index - 1);
+    $item: string.slice($string, 1, $index - 1);
     // push item to array
-    $split-arr: append($split-arr, $item);
+    $split-arr: list.append($split-arr, $item);
     // remove item and separator from string
-    $string: str-slice($string, $index + 1);
+    $string: string.slice($string, $index + 1);
     // find new index of separator
-    $index: str-index($string, $separator);
+    $index: string.index($string, $separator);
   }
   // add the remaining string to list (the last item)
-  $split-arr: append($split-arr, $string);
+  $split-arr: list.append($split-arr, $string);
 
   @return $split-arr;
 }
+
+@function three-to-six($str) {
+  $first: string.slice($str, 1, 1);
+  $second: string.slice($str, 2, 2);
+  $three: string.slice($str, 3, 3);
+
+  @return $first + $first + $second + $second + $three + $three;
+}
+
+$map-hex-decimal: (
+  '0': 0,
+  '1': 1,
+  '2': 2,
+  '3': 3,
+  '4': 4,
+  '5': 5,
+  '6': 6,
+  '7': 7,
+  '8': 8,
+  '9': 9,
+  'a': 10,
+  'b': 11,
+  'c': 12,
+  'd': 13,
+  'e': 14,
+  'f': 15,
+);
+
+@function hex-to-decimal($hex) {
+  $hex: string.to-lower-case($hex);
+  @return map.get($map-hex-decimal, string.slice($hex, 1, 1)) * 16 +
+    map.get($map-hex-decimal, string.slice($hex, 2, 2));
+}
+
+@function hex-to-rgb($hex) {
+  $hex: str-replace(#{$hex}, '#', '');
+  $hex: if(string.length($hex) == 3, three-to-six($hex), $hex);
+
+  $first: string.slice($hex, 1, 2);
+  $second: string.slice($hex, 3, 4);
+  $three: string.slice($hex, 5, 6);
+
+  @return '#{hex-to-decimal($first)},#{hex-to-decimal($second)},#{hex-to-decimal($three)}';
+}

package/components/style/variables.scss

@@ -18,17 +18,17 @@ page {
   --sar-black: #{$sar-black};
 
   // # 灰度值 rgb
-  --sar-white-rgb: #{extractRGB($sar-white)};
-  --sar-gray-100-rgb: #{extractRGB($sar-gray-100)};
-  --sar-gray-200-rgb: #{extractRGB($sar-gray-200)};
-  --sar-gray-300-rgb: #{extractRGB($sar-gray-300)};
-  --sar-gray-400-rgb: #{extractRGB($sar-gray-400)};
-  --sar-gray-500-rgb: #{extractRGB($sar-gray-500)};
-  --sar-gray-600-rgb: #{extractRGB($sar-gray-600)};
-  --sar-gray-700-rgb: #{extractRGB($sar-gray-700)};
-  --sar-gray-800-rgb: #{extractRGB($sar-gray-800)};
-  --sar-gray-900-rgb: #{extractRGB($sar-gray-900)};
-  --sar-black-rgb: #{extractRGB($sar-black)};
+  --sar-white-rgb: #{hex-to-rgb($sar-white)};
+  --sar-gray-100-rgb: #{hex-to-rgb($sar-gray-100)};
+  --sar-gray-200-rgb: #{hex-to-rgb($sar-gray-200)};
+  --sar-gray-300-rgb: #{hex-to-rgb($sar-gray-300)};
+  --sar-gray-400-rgb: #{hex-to-rgb($sar-gray-400)};
+  --sar-gray-500-rgb: #{hex-to-rgb($sar-gray-500)};
+  --sar-gray-600-rgb: #{hex-to-rgb($sar-gray-600)};
+  --sar-gray-700-rgb: #{hex-to-rgb($sar-gray-700)};
+  --sar-gray-800-rgb: #{hex-to-rgb($sar-gray-800)};
+  --sar-gray-900-rgb: #{hex-to-rgb($sar-gray-900)};
+  --sar-black-rgb: #{hex-to-rgb($sar-black)};
 
   // # 基础颜色
   --sar-blue: #{$sar-blue};
@@ -43,16 +43,16 @@ page {
   --sar-cyan: #{$sar-cyan};
 
   // # 基础颜色 rgb
-  --sar-blue-rgb: #{extractRGB($sar-blue)};
-  --sar-indigo-rgb: #{extractRGB($sar-indigo)};
-  --sar-purple-rgb: #{extractRGB($sar-purple)};
-  --sar-pink-rgb: #{extractRGB($sar-pink)};
-  --sar-red-rgb: #{extractRGB($sar-red)};
-  --sar-orange-rgb: #{extractRGB($sar-orange)};
-  --sar-yellow-rgb: #{extractRGB($sar-yellow)};
-  --sar-green-rgb: #{extractRGB($sar-green)};
-  --sar-teal-rgb: #{extractRGB($sar-teal)};
-  --sar-cyan-rgb: #{extractRGB($sar-cyan)};
+  --sar-blue-rgb: #{hex-to-rgb($sar-blue)};
+  --sar-indigo-rgb: #{hex-to-rgb($sar-indigo)};
+  --sar-purple-rgb: #{hex-to-rgb($sar-purple)};
+  --sar-pink-rgb: #{hex-to-rgb($sar-pink)};
+  --sar-red-rgb: #{hex-to-rgb($sar-red)};
+  --sar-orange-rgb: #{hex-to-rgb($sar-orange)};
+  --sar-yellow-rgb: #{hex-to-rgb($sar-yellow)};
+  --sar-green-rgb: #{hex-to-rgb($sar-green)};
+  --sar-teal-rgb: #{hex-to-rgb($sar-teal)};
+  --sar-cyan-rgb: #{hex-to-rgb($sar-cyan)};
 
   // # 主题色
   --sar-primary: var(--sar-blue);

package/components/table/table.vue

@@ -69,7 +69,7 @@ export default  _defineComponent({
     onMounted(() => {
       nextTick(setTableRect);
     });
-    uni.onWindowResize(setTableRect);
+    uni.onWindowResize?.(setTableRect);
     const fixedRow = computed(() => {
       return !isNullish(props.height);
     });
@@ -97,5 +97,5 @@ export default  _defineComponent({
 </script>
 
 <style lang="scss">
-@import './index.scss';
+@use './index.scss';
 </style>

package/components/tag/index.scss

@@ -1,4 +1,5 @@
 @use 'sass:list';
+@use 'sass:map';
 @use '../style/base' as *;
 
 $sar-tag-sizes: (
@@ -53,9 +54,9 @@ $sar-tag-sizes: (
   // 尺寸
   @each $size, $value in $sar-tag-sizes {
     @include m($size) {
-      padding: map-get($value, padding);
-      font-size: map-get($value, font-size);
-      border-radius: map-get($value, border-radius);
+      padding: map.get($value, padding);
+      font-size: map.get($value, font-size);
+      border-radius: map.get($value, border-radius);
     }
   }
 

package/package.json

@@ -2,7 +2,7 @@
   "id": "sard-uniapp",
   "name": "sard-uniapp",
   "displayName": "sard-uniapp",
-  "version": "1.10.2",
+  "version": "1.10.4",
   "description": "sard-uniapp 是一套基于 Uniapp + Vue3 框架开发的兼容多端的 UI 组件库",
   "main": "index.js",
   "scripts": {
@@ -71,24 +71,24 @@
     "@commitlint/config-conventional": "^17.8.1",
     "@commitlint/prompt-cli": "^17.8.1",
     "@dcloudio/types": "^3.4.14",
-    "@dcloudio/uni-app": "3.0.0-alpha-4030120241021001",
-    "@dcloudio/uni-app-plus": "3.0.0-alpha-4030120241021001",
-    "@dcloudio/uni-automator": "3.0.0-alpha-4030120241021001",
-    "@dcloudio/uni-cli-shared": "3.0.0-alpha-4030120241021001",
-    "@dcloudio/uni-components": "3.0.0-alpha-4030120241021001",
-    "@dcloudio/uni-h5": "3.0.0-alpha-4030120241021001",
-    "@dcloudio/uni-mp-alipay": "3.0.0-alpha-4030120241021001",
-    "@dcloudio/uni-mp-baidu": "3.0.0-alpha-4030120241021001",
-    "@dcloudio/uni-mp-jd": "3.0.0-alpha-4030120241021001",
-    "@dcloudio/uni-mp-kuaishou": "3.0.0-alpha-4030120241021001",
-    "@dcloudio/uni-mp-lark": "3.0.0-alpha-4030120241021001",
-    "@dcloudio/uni-mp-qq": "3.0.0-alpha-4030120241021001",
-    "@dcloudio/uni-mp-toutiao": "3.0.0-alpha-4030120241021001",
-    "@dcloudio/uni-mp-weixin": "3.0.0-alpha-4030120241021001",
-    "@dcloudio/uni-mp-xhs": "3.0.0-alpha-4030120241021001",
-    "@dcloudio/uni-quickapp-webview": "3.0.0-alpha-4030120241021001",
-    "@dcloudio/uni-stacktracey": "3.0.0-alpha-4030120241021001",
-    "@dcloudio/vite-plugin-uni": "3.0.0-alpha-4030120241021001",
+    "@dcloudio/uni-app": "3.0.0-4040520250104002",
+    "@dcloudio/uni-app-plus": "3.0.0-4040520250104002",
+    "@dcloudio/uni-automator": "3.0.0-4040520250104002",
+    "@dcloudio/uni-cli-shared": "3.0.0-4040520250104002",
+    "@dcloudio/uni-components": "3.0.0-4040520250104002",
+    "@dcloudio/uni-h5": "3.0.0-4040520250104002",
+    "@dcloudio/uni-mp-alipay": "3.0.0-4040520250104002",
+    "@dcloudio/uni-mp-baidu": "3.0.0-4040520250104002",
+    "@dcloudio/uni-mp-jd": "3.0.0-4040520250104002",
+    "@dcloudio/uni-mp-kuaishou": "3.0.0-4040520250104002",
+    "@dcloudio/uni-mp-lark": "3.0.0-4040520250104002",
+    "@dcloudio/uni-mp-qq": "3.0.0-4040520250104002",
+    "@dcloudio/uni-mp-toutiao": "3.0.0-4040520250104002",
+    "@dcloudio/uni-mp-weixin": "3.0.0-4040520250104002",
+    "@dcloudio/uni-mp-xhs": "3.0.0-4040520250104002",
+    "@dcloudio/uni-quickapp-webview": "3.0.0-4040520250104002",
+    "@dcloudio/uni-stacktracey": "3.0.0-4040520250104002",
+    "@dcloudio/vite-plugin-uni": "3.0.0-4040520250104002",
     "@esbuild/darwin-x64": "^0.21.5",
     "@gunny/perf-test": "^0.1.3",
     "@rollup/rollup-darwin-x64": "^4.24.0",
@@ -99,7 +99,7 @@
     "@typescript-eslint/parser": "^5.62.0",
     "@vitejs/plugin-vue": "^4.6.2",
     "@vitejs/plugin-vue-jsx": "^3.1.0",
-    "@vue/runtime-core": "^3.5.12",
+    "@vue/runtime-core": "^3.5.13",
     "@vue/test-utils": "^2.4.6",
     "consola": "^3.2.3",
     "conventional-changelog-cli": "^4.1.0",
@@ -116,17 +116,17 @@
     "prettier": "^2.8.8",
     "region-data": "^1.2.3",
     "sard-cli": "^1.0.9",
-    "sass": "^1.49.11",
+    "sass": "^1.69.7",
     "tel-area-code": "^1.0.1",
     "ts-custom-error": "^3.3.1",
     "tsx": "^4.19.2",
     "typescript": "~5.6.2",
     "typescript-eslint": "^8.17.0",
-    "vite": "6.0.6",
+    "vite": "5.2.8",
     "vite-plugin-eslint": "^1.8.1",
     "vitest": "^1.6.0",
-    "vue": "^3.5.12",
-    "vue-i18n": "^9.14.1",
+    "vue": "^3.5.13",
+    "vue-i18n": "^9.14.2",
     "vue-tsc": "^2.0.29"
   },
   "author": "wuzhitao",
@@ -219,5 +219,8 @@
   },
   "pnpm": {
     "overrides": {}
+  },
+  "dependencies": {
+    "@dcloudio/uni-app-harmony": "3.0.0-4040520250104002"
   }
 }