@kengic/uni 0.6.3-beta.0 → 0.6.3-beta.2

package/dist/uni/uni-ui/uni-popup-dialog/keypress.js

@@ -1,45 +1,45 @@
 // #ifdef H5
 export default {
-  name: 'Keypress',
-  props: {
-    disable: {
-      type: Boolean,
-      default: false
-    }
-  },
-  mounted () {
-    const keyNames = {
-      esc: ['Esc', 'Escape'],
-      tab: 'Tab',
-      enter: 'Enter',
-      space: [' ', 'Spacebar'],
-      up: ['Up', 'ArrowUp'],
-      left: ['Left', 'ArrowLeft'],
-      right: ['Right', 'ArrowRight'],
-      down: ['Down', 'ArrowDown'],
-      delete: ['Backspace', 'Delete', 'Del']
-    }
-    const listener = ($event) => {
-      if (this.disable) {
-        return
-      }
-      const keyName = Object.keys(keyNames).find(key => {
-        const keyName = $event.key
-        const value = keyNames[key]
-        return value === keyName || (Array.isArray(value) && value.includes(keyName))
-      })
-      if (keyName) {
-        // 避免和其他按键事件冲突
-        setTimeout(() => {
-          this.$emit(keyName, {})
-        }, 0)
-      }
-    }
-    document.addEventListener('keyup', listener)
-    this.$once('hook:beforeDestroy', () => {
-      document.removeEventListener('keyup', listener)
-    })
-  },
-	render: () => {}
-}
+    name: 'Keypress',
+    props: {
+        disable: {
+            type: Boolean,
+            default: false,
+        },
+    },
+    mounted() {
+        const keyNames = {
+            esc: ['Esc', 'Escape'],
+            tab: 'Tab',
+            enter: 'Enter',
+            space: [' ', 'Spacebar'],
+            up: ['Up', 'ArrowUp'],
+            left: ['Left', 'ArrowLeft'],
+            right: ['Right', 'ArrowRight'],
+            down: ['Down', 'ArrowDown'],
+            delete: ['Backspace', 'Delete', 'Del'],
+        };
+        const listener = ($event) => {
+            if (this.disable) {
+                return;
+            }
+            const keyName = Object.keys(keyNames).find((key) => {
+                const keyName = $event.key;
+                const value = keyNames[key];
+                return value === keyName || (Array.isArray(value) && value.includes(keyName));
+            });
+            if (keyName) {
+                // 避免和其他按键事件冲突
+                setTimeout(() => {
+                    this.$emit(keyName, {});
+                }, 0);
+            }
+        };
+        document.addEventListener('keyup', listener);
+        this.$once('hook:beforeDestroy', () => {
+            document.removeEventListener('keyup', listener);
+        });
+    },
+    render: () => {},
+};
 // #endif

package/dist/uni/uni-ui/uni-popup-dialog/uni-popup-dialog.vue

@@ -28,6 +28,7 @@
     import popup from '../uni-popup/popup.js';
     import { initVueI18n } from '@dcloudio/uni-i18n';
     import messages from '../uni-popup/i18n';
+
     const { t } = initVueI18n(messages);
     /**
      * PopUp 弹出层-对话框样式
@@ -37,12 +38,12 @@
      * @property {String} placeholder input 模式下输入提示
      * @property {String} type = [success|warning|info|error] 主题样式
      *  @value success 成功
-     * 	@value warning 提示
-     * 	@value info 消息
-     * 	@value error 错误
+     *    @value warning 提示
+     *    @value info 消息
+     *    @value error 错误
      * @property {String} mode = [base|input] 模式、
-     * 	@value base 基础对话框
-     * 	@value input 可输入对话框
+     *    @value base 基础对话框
+     *    @value input 可输入对话框
      * @property {String} content 对话框内容
      * @property {Boolean} beforeClose 是否拦截取消事件
      * @event {Function} confirm 点击确认按钮触发
@@ -174,7 +175,7 @@
 <style lang="scss">
     .uni-popup-dialog {
         width: 300px;
-        border-radius: 11px;
+        border-radius: 4px;
         background-color: #fff;
     }
 
@@ -185,6 +186,10 @@
         flex-direction: row;
         justify-content: center;
         padding-top: 25px;
+        border-bottom: 1px solid #e5e5e5;
+        height: 40px;
+        line-height: 40px;
+        padding: 0;
     }
 
     .uni-dialog-title-text {
@@ -199,7 +204,7 @@
         flex-direction: row;
         justify-content: center;
         align-items: center;
-        padding: 20px;
+        padding: 6px;
     }
 
     .uni-dialog-content-text {

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

@@ -217,7 +217,6 @@
 				if (!this.IsPC()) return
 				if (this.userRated) return
 				if (this.userMouseFristMove) {
-					console.log('---mousemove----', this.valueSync);
 					this.userLastRate = this.valueSync
 					this.userMouseFristMove = false
 				}
@@ -281,7 +280,7 @@
 					} else {
 						value = index + 1
 					}
-					
+
 					value = Math.max(0.5, Math.min(value, _this.max))
 					_this.valueSync = value
 					_this._onChange()

package/dist/util/kg.ts

@@ -1,7 +1,7 @@
 import { cloneDeep, isArray, isNil, isObjectLike, reduce } from 'lodash-es';
 import { toRaw, unref } from 'vue';
 import { API } from '../api';
-import { useKgWarehouse } from '../component';
+import { useKgStation, useKgWarehouse } from '../component';
 import { useAppStore } from '../store/app.store';
 import { KG_DYNAMIC_QUERY_OPERATOR } from '../const';
 
@@ -10,9 +10,31 @@ import { KG_DYNAMIC_QUERY_OPERATOR } from '../const';
  */
 export class Kg {
     /**
-     * 处理请求参数.
-     *     1. 填充通用参数的值
-     *         a. 仓库: '{WAREHOUSE}'
+     * 判断当前登录用户是否是管理员.
+     * @return {} 如果当前登录用户是管理员则返回 true, 否则返回 false.
+     */
+    public static isAdminUser(): boolean {
+        const appStore = useAppStore();
+
+        if (appStore.getUser?.username === 'admin') {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * <p>处理请求参数.</p>
+     * <ol>
+     *     <li>填充通用参数的值:
+     *         <ul>
+     *             <li>{WAREHOUSE}: 当前仓库编号</li>
+     *             <li>{WORK_STATION}: 当前工作站</li>
+     *             <li>{WORK_AREA}: 当前工作区</li>
+     *         </ul>
+     *     </li>
+     * </ol>
+     *
      * @param params 请求参数.
      */
     public static parseParams(params?: Record<string, any> | null): any {
@@ -144,12 +166,16 @@ export class Kg {
         // 若参数值包含变量, 填充这些变量
         if (result) {
             const placeholder = result[2];
-            // 去掉首尾的 {}
-            const key = result[2].slice(1, -1);
 
             switch (placeholder) {
                 case '{WAREHOUSE}':
-                    return value.replace('{WAREHOUSE}', useKgWarehouse().warehouse.value?.whId ?? '');
+                    return value.replace(placeholder, useKgWarehouse().warehouse.value?.whId ?? '');
+
+                case '{WORK_STATION}':
+                    return value.replace(placeholder, useKgStation().station.value?.devcod ?? '');
+
+                case '{WORK_AREA}':
+                    return value.replace(placeholder, useKgStation().station.value?.hmewrkare ?? '');
 
                 default:
                     break;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kengic/uni",
-    "version": "0.6.3-beta.0",
+    "version": "0.6.3-beta.2",
     "scripts": {
         "build": "npm run switch-node-version && rimraf dist && vue-tsc && vite build",
         "------ -------------------------------------------": "",
@@ -32,7 +32,7 @@
     "dependencies": {
         "@dcloudio/types": "~3.3.3",
         "@dcloudio/uni-app": "3.0.0-alpha-3080220230428001",
-        "@kengic/pont": "1.2.14",
+        "@kengic/pont": "1.2.15-beta.0",
         "@types/lodash-es": "4.17.7",
         "@types/node": "18.16.3",
         "@types/semver": "7.3.13",