@kengic/uni 0.6.3-beta.5 → 0.6.3-beta.50

package/{dist/uni → uni}/uni-ui/uni-easyinput/uni-easyinput.vue

@@ -148,7 +148,7 @@
 
     export default {
         name: 'UniEasyinput',
-        emits: ['click', 'iconClick', 'update:modelValue', 'input', 'focus', 'blur', 'confirm', 'clear', 'eyes', 'change', 'keyboardheightchange'],
+        emits: ['click', 'iconClick', 'update:modelValue', 'focus', 'blur', 'confirm', 'clear', 'eyes', 'change', 'keyboardheightchange'],
         model: {
             prop: 'modelValue',
             event: 'update:modelValue',
@@ -419,9 +419,6 @@
                 }
                 if (this.errMsg) this.errMsg = '';
                 this.val = value;
-                // TODO 兼容 vue2
-                this.$emit('input', value);
-                // TODO　兼容　vue3
                 this.$emit('update:modelValue', value);
             },
 

package/{dist/uni → uni}/uni-ui/uni-pagination/uni-pagination.vue

@@ -26,8 +26,8 @@
 		</view>
 		<view class="uni-pagination__num uni-pagination__num-flex-none">
 			<view class="uni-pagination__num-current">
-				<text class="uni-pagination__num-current-text is-pc-hide current-index-text">{{ currentIndex }}</text>
-				<text class="uni-pagination__num-current-text is-pc-hide">/{{ maxPage || 0 }}</text>
+				<text class="uni-pagination__num-current-text is-pc-hide current-index-text">{{ currentIndex }}&nbsp;</text>
+				<text class="uni-pagination__num-current-text is-pc-hide">/&nbsp;{{ maxPage || 0 }}</text>
 				<!-- #ifndef APP-NVUE -->
 				<view v-for="(item, index) in paper" :key="index" :class="{ 'page--active': item === currentIndex }"
 					class="uni-pagination__num-tag tag--active is-phone-hide" @click.top="selectPage(item, index)">
@@ -341,10 +341,14 @@
 		justify-content: center;
 		align-items: center;
 		text-align: center;
-		border-radius: 5px;
+		border-radius: 3px;
 		// border-width: 1px;
 		// border-style: solid;
 		// border-color: $uni-border-color;
+        border: 1px solid #ececec !important;
+        border-radius: 3px !important;
+        border-bottom: 1px solid #d3d3d3 !important;
+        background: #fefefe !important;
 	}
 
 	.uni-pagination__child-btn {
@@ -387,7 +391,7 @@
 		line-height: 30px;
 		// border: 1px red solid;
 		color: #999;
-		border-radius: 4px;
+		border-radius: 3px;
 		// border-width: 1px;
 		// border-style: solid;
 		// border-color: $uni-border-color;

package/{dist/uni → uni}/uni-ui/uni-segmented-control/uni-segmented-control.vue

@@ -122,13 +122,13 @@
 
 	.segmented-control__item--button--first {
 		border-left-width: 1px;
-		border-top-left-radius: 5px;
-		border-bottom-left-radius: 5px;
+		border-top-left-radius: 3px;
+		border-bottom-left-radius: 3px;
 	}
 
 	.segmented-control__item--button--last {
-		border-top-right-radius: 5px;
-		border-bottom-right-radius: 5px;
+		border-top-right-radius: 3px;
+		border-bottom-right-radius: 3px;
 	}
 
 	.segmented-control__item--text {

package/uni/uni-ui/uni-swipe-action-item/uni-swipe-action-item.vue

@@ -0,0 +1,403 @@
+<template>
+    <!-- 在微信小程序 app vue端 h5 使用wxs 实现-->
+    <!-- #ifdef APP-VUE || MP-WEIXIN || H5 -->
+    <view class="uni-swipe">
+        <!--  #ifdef MP-WEIXIN || VUE3 -->
+        <view
+            class="uni-swipe_box"
+            :change:prop="wxsswipe.showWatch"
+            :prop="is_show"
+            :data-threshold="threshold"
+            :data-disabled="disabled"
+            @touchstart="wxsswipe.touchstart"
+            @touchmove="wxsswipe.touchmove"
+            @touchend="wxsswipe.touchend"
+        >
+            <!-- #endif -->
+            <!--  #ifndef MP-WEIXIN || VUE3 -->
+            <view
+                class="uni-swipe_box"
+                :change:prop="renderswipe.showWatch"
+                :prop="is_show"
+                :data-threshold="threshold"
+                :data-disabled="disabled + ''"
+                @touchstart="renderswipe.touchstart"
+                @touchmove="renderswipe.touchmove"
+                @touchend="renderswipe.touchend"
+            >
+                <!-- #endif -->
+                <!-- 在微信小程序 app vue端 h5 使用wxs 实现-->
+                <view class="uni-swipe_button-group button-group--left">
+                    <slot name="left">
+                        <view
+                            v-for="(item, index) in leftOptions"
+                            :key="index"
+                            :style="{
+                                backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD',
+                            }"
+                            class="uni-swipe_button button-hock"
+                            @touchstart="appTouchStart"
+                            @touchend="appTouchEnd($event, index, item, 'left')"
+                            @click.stop="onClickForPC(index, item, 'left')"
+                        >
+                            <text
+                                class="uni-swipe_button-text"
+                                :style="{
+                                    color: item.style && item.style.color ? item.style.color : '#FFFFFF',
+                                    fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px',
+                                }"
+                                >{{ item.text }}</text
+                            >
+                        </view>
+                    </slot>
+                </view>
+                <view class="uni-swipe_text--center">
+                    <slot></slot>
+                </view>
+                <view class="uni-swipe_button-group button-group--right">
+                    <slot name="right">
+                        <view
+                            v-for="(item, index) in rightOptions"
+                            :key="index"
+                            :style="{
+                                backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD',
+                            }"
+                            class="uni-swipe_button button-hock"
+                            @touchstart="appTouchStart"
+                            @touchend="appTouchEnd($event, index, item, 'right')"
+                            @click.stop="onClickForPC(index, item, 'right')"
+                            ><text
+                                class="uni-swipe_button-text"
+                                :style="{
+                                    color: item.style && item.style.color ? item.style.color : '#FFFFFF',
+                                    fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px',
+                                }"
+                                >{{ item.text }}</text
+                            >
+                        </view>
+                    </slot>
+                </view>
+            </view>
+        </view>
+        <!-- #endif -->
+        <!-- app nvue端 使用 bindingx -->
+        <!-- #ifdef APP-NVUE -->
+        <view ref="selector-box--hock" class="uni-swipe" @horizontalpan="touchstart" @touchend="touchend">
+            <view ref="selector-left-button--hock" class="uni-swipe_button-group button-group--left">
+                <slot name="left">
+                    <view
+                        v-for="(item, index) in leftOptions"
+                        :key="index"
+                        :style="{
+                            backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD',
+                        }"
+                        class="uni-swipe_button button-hock"
+                        @click.stop="onClick(index, item, 'left')"
+                        ><text
+                            class="uni-swipe_button-text"
+                            :style="{
+                                color: item.style && item.style.color ? item.style.color : '#FFFFFF',
+                                fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px',
+                            }"
+                            >{{ item.text }}</text
+                        >
+                    </view>
+                </slot>
+            </view>
+            <view ref="selector-right-button--hock" class="uni-swipe_button-group button-group--right">
+                <slot name="right">
+                    <view
+                        v-for="(item, index) in rightOptions"
+                        :key="index"
+                        :style="{
+                            backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD',
+                        }"
+                        class="uni-swipe_button button-hock"
+                        @click.stop="onClick(index, item, 'right')"
+                        ><text
+                            class="uni-swipe_button-text"
+                            :style="{
+                                color: item.style && item.style.color ? item.style.color : '#FFFFFF',
+                                fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px',
+                            }"
+                            >{{ item.text }}</text
+                        >
+                    </view>
+                </slot>
+            </view>
+            <view ref="selector-content--hock" class="uni-swipe_box">
+                <slot></slot>
+            </view>
+        </view>
+        <!-- #endif -->
+        <!-- 其他平台使用 js ，长列表性能可能会有影响-->
+        <!-- #ifdef MP-ALIPAY || MP-BAIDU || MP-TOUTIAO || MP-QQ -->
+        <view class="uni-swipe">
+            <view
+                class="uni-swipe_box"
+                @touchstart="touchstart"
+                @touchmove="touchmove"
+                @touchend="touchend"
+                :style="{ transform: moveLeft }"
+                :class="{ ani: ani }"
+            >
+                <view class="uni-swipe_button-group button-group--left" :class="[elClass]">
+                    <slot name="left">
+                        <view
+                            v-for="(item, index) in leftOptions"
+                            :key="index"
+                            :style="{
+                                backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD',
+                                fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px',
+                            }"
+                            class="uni-swipe_button button-hock"
+                            @touchstart="appTouchStart"
+                            @touchend="appTouchEnd($event, index, item, 'left')"
+                            ><text class="uni-swipe_button-text" :style="{ color: item.style && item.style.color ? item.style.color : '#FFFFFF' }">{{
+                                item.text
+                            }}</text>
+                        </view>
+                    </slot>
+                </view>
+                <slot></slot>
+                <view class="uni-swipe_button-group button-group--right" :class="[elClass]">
+                    <slot name="right">
+                        <view
+                            v-for="(item, index) in rightOptions"
+                            :key="index"
+                            :style="{
+                                backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD',
+                                fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px',
+                            }"
+                            @touchstart="appTouchStart"
+                            @touchend="appTouchEnd($event, index, item, 'right')"
+                            class="uni-swipe_button button-hock"
+                            ><text class="uni-swipe_button-text" :style="{ color: item.style && item.style.color ? item.style.color : '#FFFFFF' }">{{
+                                item.text
+                            }}</text>
+                        </view>
+                    </slot>
+                </view>
+            </view>
+        </view>
+    </view>
+    <!-- #endif -->
+</template>
+
+<script>
+    import mpwxs from './mpwxs';
+    import bindingx from './bindingx.js';
+    import mpother from './mpother';
+
+    /**
+     * SwipeActionItem 滑动操作子组件
+     * @description 通过滑动触发选项的容器
+     * @tutorial https://ext.dcloud.net.cn/plugin?id=181
+     * @property {Boolean} show = [left|right｜none] 	开启关闭组件，auto-close = false 时生效
+     * @property {Boolean} disabled = [true|false] 		是否禁止滑动
+     * @property {Boolean} autoClose = [true|false] 	滑动打开当前组件，是否关闭其他组件
+     * @property {Number}  threshold 					滑动缺省值
+     * @property {Array} leftOptions 					左侧选项内容及样式
+     * @property {Array} rgihtOptions 					右侧选项内容及样式
+     * @event {Function} click 							点击选项按钮时触发事件，e = {content,index} ，content（点击内容）、index（下标)
+     * @event {Function} change 						组件打开或关闭时触发，left\right\none
+     */
+
+    export default {
+        mixins: [mpwxs, bindingx, mpother],
+        emits: ['click', 'change'],
+        props: {
+            // 控制开关
+            show: {
+                type: String,
+                default: 'none',
+            },
+
+            // 禁用
+            disabled: {
+                type: Boolean,
+                default: false,
+            },
+
+            // 是否自动关闭
+            autoClose: {
+                type: Boolean,
+                default: true,
+            },
+
+            // 滑动缺省距离
+            threshold: {
+                type: Number,
+                default: 20,
+            },
+
+            // 左侧按钮内容
+            leftOptions: {
+                type: Array,
+                default() {
+                    return [];
+                },
+            },
+
+            // 右侧按钮内容
+            rightOptions: {
+                type: Array,
+                default() {
+                    return [];
+                },
+            },
+        },
+        // #ifndef VUE3
+        // TODO vue2
+        destroyed() {
+            if (this.__isUnmounted) return;
+            this.uninstall();
+        },
+        // #endif
+        // #ifdef VUE3
+        // TODO vue3
+        unmounted() {
+            this.__isUnmounted = true;
+            this.uninstall();
+        },
+        // #endif
+
+        methods: {
+            uninstall() {
+                if (this.swipeaction) {
+                    this.swipeaction.children.forEach((item, index) => {
+                        if (item === this) {
+                            this.swipeaction.children.splice(index, 1);
+                        }
+                    });
+                }
+            },
+            /**
+             * 获取父元素实例
+             */
+            getSwipeAction(name = 'uniSwipeAction') {
+                let parent = this.$parent;
+                let parentName = parent.$options.name;
+                while (parentName !== name) {
+                    parent = parent.$parent;
+                    if (!parent) return false;
+                    parentName = parent.$options.name;
+                }
+                return parent;
+            },
+        },
+    };
+</script>
+<style lang="scss">
+    .uni-swipe {
+        position: relative;
+        /* #ifndef APP-NVUE */
+        overflow: hidden;
+        /* #endif */
+    }
+
+    .uni-swipe_box {
+        /* #ifndef APP-NVUE */
+        display: flex;
+        flex-shrink: 0;
+        // touch-action: none;
+        /* #endif */
+        position: relative;
+    }
+
+    .uni-swipe_content {
+        // border: 1px red solid;
+    }
+
+    .uni-swipe_text--center {
+        width: 100%;
+        /* #ifndef APP-NVUE */
+        cursor: grab;
+        /* #endif */
+    }
+
+    .uni-swipe_button-group {
+        /* #ifndef APP-NVUE */
+        box-sizing: border-box;
+        display: flex;
+        /* #endif */
+        flex-direction: row;
+        position: absolute;
+        top: 0;
+        bottom: 0;
+        /* #ifdef H5 */
+        cursor: pointer;
+        /* #endif */
+    }
+
+    .button-group--left {
+        left: 0;
+        transform: translateX(-100%);
+    }
+
+    .button-group--right {
+        right: 0;
+        transform: translateX(100%);
+    }
+
+    .uni-swipe_button {
+        /* #ifdef APP-NVUE */
+        flex: 1;
+        /* #endif */
+        /* #ifndef APP-NVUE */
+        display: flex;
+        /* #endif */
+        flex-direction: row;
+        justify-content: center;
+        align-items: center;
+        padding: 0 20px;
+    }
+
+    .uni-swipe_button-text {
+        /* #ifndef APP-NVUE */
+        flex-shrink: 0;
+        /* #endif */
+        font-size: 14px;
+    }
+
+    .ani {
+        transition-property: transform;
+        transition-duration: 0.3s;
+        transition-timing-function: cubic-bezier(0.165, 0.84, 0.44, 1);
+    }
+
+    /* #ifdef MP-ALIPAY */
+    .movable-area {
+        /* width: 100%; */
+        height: 45px;
+    }
+
+    .movable-view {
+        display: flex;
+        /* justify-content: center; */
+        position: relative;
+        flex: 1;
+        height: 45px;
+        z-index: 2;
+    }
+
+    .movable-view-button {
+        display: flex;
+        flex-shrink: 0;
+        flex-direction: row;
+        height: 100%;
+        background: #c0c0c0;
+    }
+
+    /* .transition {
+		transition: all 0.3s;
+	} */
+
+    .movable-view-box {
+        flex-shrink: 0;
+        height: 100%;
+        background-color: #fff;
+    }
+
+    /* #endif */
+</style>

package/{dist/util → util}/kg.ts

@@ -4,6 +4,7 @@ import { API } from '../api';
 import { useKgStation, useKgWarehouse } from '../component';
 import { useAppStore } from '../store/app.store';
 import { KG_DYNAMIC_QUERY_OPERATOR } from '../const';
+import dayjs, { Dayjs } from 'dayjs';
 
 /**
  * 通用工具.
@@ -35,9 +36,10 @@ export class Kg {
      *     </li>
      * </ol>
      *
+     * @param $dayjs.
      * @param params 请求参数.
      */
-    public static parseParams(params?: Record<string, any> | null): any {
+    public static parseParams($dayjs: typeof dayjs | null | undefined, params?: Record<string, any> | null): any {
         let _params = toRaw(unref(params))!;
 
         if (!_params || !isObjectLike(_params)) {
@@ -51,8 +53,13 @@ export class Kg {
                 const value = _params[key];
 
                 switch (true) {
+                    case !!$dayjs && isArray(value) && value.length === 2 && $dayjs.isDayjs(value[0]) && $dayjs.isDayjs(value[1]): {
+                        resultParams[key] = value;
+                        break;
+                    }
+
                     case isObjectLike(value):
-                        resultParams[key] = this.parseParams(value);
+                        resultParams[key] = this.parseParams($dayjs, value);
                         break;
 
                     case typeof value === 'string':
@@ -128,7 +135,7 @@ export class Kg {
         const patch: number = Number(oldVersionSegments[2]);
 
         try {
-            const newVersion = await API.WMS.CommonController.GetLatestApkVersion({}, { timeout: 5 * 1000 });
+            const newVersion = await API.WMS.CommonController.GetLatestApkVersion({}, { timeout: 5 * 1000, isSuppressSuccess: true });
 
             // 最新版本
             const newVersionSegments = newVersion.split('.');
@@ -195,11 +202,12 @@ export class Kg {
      * @param param.params 请求参数.
      */
     public static getQueryHeaders(param: {
+        $dayjs?: typeof dayjs;
         dynamicQueryExcludeProperties: Array<string> | null | undefined;
         dynamicQueryOperatorModel: Record<string, any> | null | undefined;
         params: Record<string, any> | null | undefined;
     }) {
-        const { params, dynamicQueryExcludeProperties, dynamicQueryOperatorModel } = param ?? {};
+        const { $dayjs, params, dynamicQueryExcludeProperties, dynamicQueryOperatorModel } = param ?? {};
 
         let _params = cloneDeep(toRaw(unref(params ?? {})));
 
@@ -211,7 +219,8 @@ export class Kg {
         // 特殊字段, 这些特殊字段的值不做处理, 保持原样
         const SPECIAL_FIELD_KEYS = ['pageNo', 'pageSize', 'column', 'order'];
 
-        const _paramsForWhereSql: Record<string, any> = {};
+        const _paramsForQueryWhereSql: Record<string, any> = {};
+
         Object.keys(_params)
             .sort()
             .forEach((key) => {
@@ -235,16 +244,55 @@ export class Kg {
                 let operator: string = dynamicQueryOperatorModel?.[key] ?? KG_DYNAMIC_QUERY_OPERATOR.EQ;
 
                 switch (true) {
+                    //region 日期范围
+                    //----------------------------------------------------------------------------------------------------
+                    case !!$dayjs && isArray(value) && value.length === 2 && $dayjs.isDayjs(value[0]) && $dayjs.isDayjs(value[1]): {
+                        let _stringValue = '';
+
+                        switch (operator) {
+                            case 'BETWEEN':
+                            default: {
+                                const _leftValue = value[0] as Dayjs;
+                                const _rightValue = value[1] as Dayjs;
+
+                                // 左侧日期的字符串
+                                let _leftStringValue = '';
+                                if (_leftValue && _leftValue.isValid()) {
+                                    _leftStringValue = _leftValue.format('YYYY-MM-DD 00:00:00');
+                                }
+
+                                // 右侧日期的字符串
+                                let _rightStringValue = '';
+                                if (_rightValue && _rightValue.isValid()) {
+                                    _rightStringValue = _rightValue.add(1, 'day').format('YYYY-MM-DD 00:00:00');
+                                }
+
+                                if (_leftStringValue) {
+                                    _stringValue += ` AND (${_key} >= '${_leftStringValue}')`;
+                                }
+
+                                if (_rightStringValue) {
+                                    _stringValue += ` AND (${_key} < '${_rightStringValue}')`;
+                                }
+                                break;
+                            }
+                        }
+
+                        _paramsForQueryWhereSql[key] = _stringValue;
+                        break;
+                    }
+                    //endregion
+
                     // array
                     case Array.isArray(value): {
                         if (value.length === 0) {
-                            _paramsForWhereSql[key] = undefined;
+                            _paramsForQueryWhereSql[key] = undefined;
                             break;
                         }
 
                         const _value = value.map((i: any) => `N'${String(i)}'`).join(', ');
 
-                        _paramsForWhereSql[key] = ` AND (${_key} IN (${_value}))`;
+                        _paramsForQueryWhereSql[key] = ` AND (${_key} IN (${_value}))`;
                         break;
                     }
 
@@ -257,7 +305,7 @@ export class Kg {
                     case typeof value === 'string': {
                         // 空白字符
                         if (value.trim() === '') {
-                            _paramsForWhereSql[key] = undefined;
+                            _paramsForQueryWhereSql[key] = undefined;
                             break;
                         }
 
@@ -291,7 +339,7 @@ export class Kg {
                             }
                         }
 
-                        _paramsForWhereSql[key] = _strValue;
+                        _paramsForQueryWhereSql[key] = _strValue;
 
                         break;
                     }
@@ -333,7 +381,7 @@ export class Kg {
                             }
                         }
 
-                        _paramsForWhereSql[key] = _strValue;
+                        _paramsForQueryWhereSql[key] = _strValue;
 
                         break;
                     }
@@ -355,14 +403,14 @@ export class Kg {
                             }
                         }
 
-                        _paramsForWhereSql[key] = _strValue;
+                        _paramsForQueryWhereSql[key] = _strValue;
 
                         break;
                     }
 
                     // null, undefined
                     default: {
-                        _paramsForWhereSql[key] = value;
+                        _paramsForQueryWhereSql[key] = value;
 
                         break;
                     }
@@ -370,7 +418,7 @@ export class Kg {
             });
 
         const whereSqlSegment = reduce(
-            _paramsForWhereSql,
+            _paramsForQueryWhereSql,
             (sql, value) => {
                 if (!value) {
                     return sql;
@@ -383,7 +431,7 @@ export class Kg {
 
         //region WHERE
         // ----------------------------------------------------------------------------------------------------
-        let whereSql = `WHERE (1 = 1)${whereSqlSegment}`;
+        let whereSql = `WHERE (1 = 1)${whereSqlSegment}`.replace('(1 = 1) AND ', '');
         whereSql = encodeURIComponent(whereSql);
         //endregion
 

package/CHANGELOG.md

@@ -1,15 +0,0 @@
-# 0.6.0
-
-1. 优化导入路径
-
-    ```typescript
-    // 旧
-    // --------------------------------------------------
-    import { UniEasyinput } from '@kengic/uni/dist';
-
-    // 新
-    // --------------------------------------------------
-    import { UniEasyinput } from '@kengic/uni';
-    ```
-
----

package/README.md

@@ -1 +0,0 @@
-# @kengic/uni

package/dist/src/index.d.ts

@@ -1 +0,0 @@
-export {};