@kengic/uni 0.6.3-beta.4 → 0.6.3-beta.6

package/dist/service/http-client.ts

@@ -2,6 +2,7 @@ import { useAppStore } from '../store/app.store';
 import { Kg } from '../util';
 import { KG_DYNAMIC_QUERY_OPERATOR, KG_HTTP_HEADERS } from '../const';
 import { useKgWarehouse } from '../component/KgWarehouse/index.hooks';
+import { useKgStation } from '../component/KgStation';
 
 /*
  * 对请求做统一的拦截.
@@ -13,7 +14,7 @@ uni.addInterceptor('request', {
         const appStore = useAppStore();
 
         args.header['Authorization'] = appStore.getToken;
-        // TODO 支持其他语言
+        // TODO LT 支持其他语言
         args.header['Accept-Language'] = 'zh_CN'.replace('_', '-');
         args.header['X-Access-Token'] = appStore.getToken;
 
@@ -68,9 +69,20 @@ type IRequestOptions = Omit<UniApp.RequestOptions, 'url'> & {
      */
     dynamicQueryOperatorModel?: Record<string, KG_DYNAMIC_QUERY_OPERATOR>;
 
-    /** 是否不显示错误消息提示. */
+    /**
+     * 是否不显示错误消息提示.
+     *
+     * @default false
+     */
     isSuppressError?: boolean;
 
+    /**
+     * 是否不显示成功消息提示.
+     *
+     * @default false
+     */
+    isSuppressSuccess?: boolean;
+
     /** 是否处理请求结果. */
     isTransformResponse?: boolean;
 
@@ -100,6 +112,13 @@ function handleSuccess<T = any>(
     reject: (reason?: any) => void,
     options?: IRequestOptions,
 ) {
+    // 显示后端成功消息
+    if (!options?.isSuppressSuccess) {
+        if ((response.data as any).message) {
+            uni.showToast({ icon: 'none', title: (response.data as any).message });
+        }
+    }
+
     if (options?.isTransformResponse === false) {
         resolve(response.data as any);
     } else {
@@ -129,7 +148,7 @@ function handleError<T = any>(
     if (!isSuppressError) {
         // @ts-ignore
         const message = (response.data as any)?.message || response?.errMsg || '请求出错';
-        uni.showToast({ title: message, icon: 'none', duration: 3000 });
+        uni.showToast({ duration: 3000, icon: 'none', title: message });
     }
 
     reject(response);
@@ -229,9 +248,9 @@ const _httpClient: IHttpClient = {
                 header[KG_QUERY_SQL] = encodeURIComponent(decodeURIComponent(String(header[KG_QUERY_SQL])));
             }
 
-            // 仓库编号
-            const warehouseId = useKgWarehouse().warehouse.value?.whId ?? '';
-            header[KG_HTTP_HEADERS.KG_WAREHOUSE] = encodeURIComponent(warehouseId);
+            header[KG_HTTP_HEADERS.KG_WAREHOUSE] = encodeURIComponent(useKgWarehouse().warehouse.value?.whId ?? '');
+            header[KG_HTTP_HEADERS.KG_WORK_STATION] = encodeURIComponent(useKgStation().station.value?.devcod ?? '');
+            header[KG_HTTP_HEADERS.KG_WORK_AREA] = encodeURIComponent(useKgStation().station.value?.hmewrkare ?? '');
 
             uni.request({
                 ...(options ?? {}),

package/dist/uni/uni-ui/uni-data-select/uni-data-select.vue

@@ -7,7 +7,7 @@
                     <view v-if="current" class="uni-select__input-text">{{ textShow }}</view>
                     <view v-else class="uni-select__input-text uni-select__input-placeholder">{{ typePlaceholder }} </view>
                     <view v-if="current && clear && !disabled" @click.stop="clearVal">
-                        <uni-icons type="clear" color="#c0c4cc" size="14" />
+                        <uni-icons type="clear" color="#c0c4cc" size="16" />
                     </view>
                     <view v-else style="display: flex; align-items: center; justify-content: center">
                         <view :class="showSelector ? 'ant-design--caret-up-filled' : 'ant-design--caret-down-filled'" />

package/dist/uni/uni-ui/uni-easyinput/common.js

@@ -23,6 +23,7 @@ export const debounce = function (func, wait = 1000, immediate = true) {
         }
     };
 };
+
 /**
  * @desc 函数节流
  * @param func 函数

package/dist/uni/uni-ui/uni-easyinput/uni-easyinput.vue

@@ -3,54 +3,6 @@
         <view class="uni-easyinput__content" :class="inputContentClass" :style="inputContentStyle">
             <uni-icons v-if="prefixIcon" class="content-clear-icon" :type="prefixIcon" color="#c0c4cc" @click="onClickIcon('prefix')" size="16"></uni-icons>
             <slot name="left"></slot>
-            <!-- #ifdef MP-ALIPAY -->
-            <textarea
-                :enableNative="enableNative"
-                v-if="type === 'textarea'"
-                class="uni-easyinput__content-textarea"
-                :class="{ 'input-padding': inputBorder }"
-                :name="name"
-                :value="val"
-                :placeholder="placeholder"
-                :placeholderStyle="placeholderStyle"
-                :disabled="disabled"
-                placeholder-class="uni-easyinput__placeholder-class"
-                :maxlength="inputMaxlength"
-                :focus="focused"
-                :autoHeight="autoHeight"
-                :cursor-spacing="cursorSpacing"
-                :adjust-position="adjustPosition"
-                @input="onInput"
-                @blur="_Blur"
-                @focus="_Focus"
-                @confirm="onConfirm"
-                @keyboardheightchange="onkeyboardheightchange"
-            ></textarea>
-            <input
-                :enableNative="enableNative"
-                v-else
-                :type="type === 'password' ? 'text' : type"
-                class="uni-easyinput__content-input"
-                :style="inputStyle"
-                :name="name"
-                :value="val"
-                :password="!showPassword && type === 'password'"
-                :placeholder="placeholder"
-                :placeholderStyle="placeholderStyle"
-                placeholder-class="uni-easyinput__placeholder-class"
-                :disabled="disabled"
-                :maxlength="inputMaxlength"
-                :focus="focused"
-                :confirmType="confirmType"
-                :cursor-spacing="cursorSpacing"
-                :adjust-position="adjustPosition"
-                @focus="_Focus"
-                @blur="_Blur"
-                @input="onInput"
-                @confirm="onConfirm"
-                @keyboardheightchange="onkeyboardheightchange"
-            />
-            <!-- #endif -->
             <!-- #ifndef MP-ALIPAY -->
             <textarea
                 v-if="type === 'textarea'"
@@ -60,7 +12,7 @@
                 :value="val"
                 :placeholder="placeholder"
                 :placeholderStyle="placeholderStyle"
-                :disabled="disabled"
+                :disabled="disabled || readonly"
                 placeholder-class="uni-easyinput__placeholder-class"
                 :maxlength="inputMaxlength"
                 :focus="focused"
@@ -84,7 +36,7 @@
                 :placeholder="placeholder"
                 :placeholderStyle="placeholderStyle"
                 placeholder-class="uni-easyinput__placeholder-class"
-                :disabled="disabled"
+                :disabled="disabled || readonly"
                 :maxlength="inputMaxlength"
                 :focus="focused"
                 :confirmType="confirmType"
@@ -98,8 +50,8 @@
             />
             <!-- #endif -->
 
+            <!-- 开启密码时显示小眼睛 -->
             <template v-if="type === 'password' && passwordIcon">
-                <!-- 开启密码时显示小眼睛 -->
                 <uni-icons
                     v-if="isVal"
                     class="content-clear-icon"
@@ -248,6 +200,14 @@
                 type: Boolean,
                 default: false,
             },
+
+            /**
+             * <p>是否只读, 跟 disabled 的区别是: 会显示清空图标.</p>
+             */
+            readonly: {
+                type: Boolean,
+                default: false,
+            },
             maxlength: {
                 type: [Number, String],
                 default: 140,
@@ -362,7 +322,7 @@
                     'is-input-border': this.inputBorder,
                     'is-input-error-border': this.inputBorder && this.msg,
                     'is-textarea': this.type === 'textarea',
-                    'is-disabled': this.disabled,
+                    'is-disabled': this.disabled || this.readonly,
                     'is-focused': this.focusShow,
                 });
             },
@@ -371,7 +331,7 @@
                 const borderColor = this.inputBorder && this.msg ? '#dd524d' : focusColor;
                 return obj2strStyle({
                     'border-color': borderColor || '#e5e5e5',
-                    'background-color': this.disabled ? this.styles.disableColor : this.styles.backgroundColor,
+                    'background-color': this.disabled || this.readonly ? this.styles.disableColor : this.styles.backgroundColor,
                 });
             },
             // input右侧样式
@@ -527,9 +487,6 @@
              */
             onClear(event) {
                 this.val = '';
-                // TODO 兼容 vue2
-                this.$emit('input', '');
-                // TODO 兼容 vue2
                 // TODO　兼容　vue3
                 this.$emit('update:modelValue', '');
                 // 点击叉号触发
@@ -582,7 +539,7 @@
         position: relative;
         text-align: left;
         color: #333;
-        font-size: 14px;
+        font-size: 13px;
     }
 
     .uni-easyinput__content {
@@ -609,7 +566,7 @@
         overflow: hidden;
         flex: 1;
         line-height: 1;
-        font-size: 14px;
+        font-size: 13px;
         height: 24px;
         // min-height: 36px;
 
@@ -621,17 +578,16 @@
         & ::-ms-clear {
             display: none;
         }
-
-        & ::-o-clear {
-            display: none;
-        }
-
         /*endif*/
     }
 
+    :deep(.uni-easyinput__content-input) .uni-input-input {
+        padding-bottom: 1px;
+    }
+
     .uni-easyinput__placeholder-class {
         color: #999;
-        font-size: 12px;
+        font-size: 13px;
         // font-weight: 200;
     }
 
@@ -648,7 +604,7 @@
         overflow: hidden;
         flex: 1;
         line-height: 1.5;
-        font-size: 14px;
+        font-size: 13px;
         margin: 6px;
         margin-left: 0;
         height: 80px;
@@ -737,7 +693,7 @@
 
         .uni-easyinput__placeholder-class {
             color: #d5d5d5;
-            font-size: 12px;
+            font-size: 13px;
         }
     }
 </style>

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kengic/uni",
-    "version": "0.6.3-beta.4",
+    "version": "0.6.3-beta.6",
     "scripts": {
         "build": "npm run switch-node-version && rimraf dist && vue-tsc && vite build",
         "------ -------------------------------------------": "",