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

package/{dist/api → api}/WMS/Controllers/CommonController/index.ts

@@ -1 +1 @@
-export { GetLatestApkVersion, GetLatestApkVersionQuery } from './GetLatestApkVersion';
+export { GetLatestApkVersion, GetLatestApkVersionQuery } from './GetLatestApkVersion';

package/{dist/api → api}/WMS/Controllers/WhController/ListVO.ts

@@ -6,33 +6,33 @@ import { keys } from '../../models';
 
 /** 请求参数. */
 export class ListVOQuery {
-    /** 是否可用 */
+    /** 是否可用. */
     public activeFlg?: number | null;
-    /** 地址编号 */
+    /** 地址编号. */
     public adrId?: string | null;
-    /** 地址名 */
+    /** 地址名. */
     public adrnam?: string | null;
-    /** 公司代码 */
+    /** 公司代码. */
     public comCod?: string | null;
-    /** 默认仓库 */
+    /** 默认仓库. */
     public defWhFlg?: number | null;
     /** 主键. */
     public id?: string | null;
-    /** 所属地/国编号 */
+    /** 所属地/国编号. */
     public orgcod?: string | null;
-    /** 永久调整托盘 */
+    /** 永久调整托盘. */
     public permAdjLod?: string | null;
-    /** 永久调整箱 */
+    /** 永久调整箱. */
     public permAdjSub?: string | null;
-    /** 永久创建托盘 */
+    /** 永久创建托盘. */
     public permCreLod?: string | null;
-    /** 永久创建箱 */
+    /** 永久创建箱. */
     public permCreSub?: string | null;
-    /** 版本 */
+    /** 版本. */
     public version?: number | null;
-    /** 仓库名称 */
+    /** 仓库名称. */
     public whDsc?: string | null;
-    /** 仓库编号 */
+    /** 仓库编号. */
     public whId?: string | null;
     /** 排序字段. */
     public column?: string | null;
@@ -75,7 +75,7 @@ export class ListVOQuery {
 
 /**
  * wh-分页列表查询VO
-wh-分页列表查询VO
+wh-分页列表查询VO.
  *
  * @param config 请求配置.
  * @param option 请求选项.

package/{dist/api → api}/WMS/Controllers/WhController/index.ts

@@ -1 +1 @@
-export { ListVO, ListVOQuery } from './ListVO';
+export { ListVO, ListVOQuery } from './ListVO';

package/{dist/api → api}/WMS/Controllers/WorkstationController/List.ts

@@ -32,7 +32,7 @@ export class ListQuery {
 }
 
 /**
- * 工作站-分页列表查询
+ * 工作站-分页列表查询.
  *
  * @param config 请求配置.
  * @param option 请求选项.

package/{dist/api → api}/WMS/index.ts

@@ -1,2 +1,2 @@
-export * as WMSAPI from './Controllers';
-export * as WMSDEF from './models';
+export * as WMSAPI from './Controllers';
+export * as WMSDEF from './models';

package/{dist/api → api}/WMS/models.ts

@@ -165,35 +165,35 @@ export class SysUserWarehouseDTO {
     }
 }
 
-/** 仓库数据传输对象 */
+/** 仓库数据传输对象. */
 export class WhDTO {
-    /** 是否可用 */
+    /** 是否可用. */
     public activeFlg?: number | null;
-    /** 地址编号 */
+    /** 地址编号. */
     public adrId?: string | null;
-    /** 地址名 */
+    /** 地址名. */
     public adrnam?: string | null;
-    /** 公司代码 */
+    /** 公司代码. */
     public comCod?: string | null;
-    /** 默认仓库 */
+    /** 默认仓库. */
     public defWhFlg?: number | null;
     /** 主键. */
     public id?: string | null;
-    /** 所属地/国编号 */
+    /** 所属地/国编号. */
     public orgcod?: string | null;
-    /** 永久调整托盘 */
+    /** 永久调整托盘. */
     public permAdjLod?: string | null;
-    /** 永久调整箱 */
+    /** 永久调整箱. */
     public permAdjSub?: string | null;
-    /** 永久创建托盘 */
+    /** 永久创建托盘. */
     public permCreLod?: string | null;
-    /** 永久创建箱 */
+    /** 永久创建箱. */
     public permCreSub?: string | null;
-    /** 版本 */
+    /** 版本. */
     public version?: number | null;
-    /** 仓库名称 */
+    /** 仓库名称. */
     public whDsc?: string | null;
-    /** 仓库编号 */
+    /** 仓库编号. */
     public whId?: string | null;
 
     public constructor(obj?: WhDTO) {
@@ -222,23 +222,23 @@ export class WhDTO {
     }
 }
 
-/** 工作站区域数据传输对象 */
+/** 工作站区域数据传输对象. */
 export class WorkstationAreaDTO {
-    /** 主键 */
+    /** 主键. */
     public id?: string | null;
-    /** 创建日期 */
+    /** 创建日期. */
     public insDt?: string | null;
-    /** 创建用户 */
+    /** 创建用户. */
     public insUsrId?: string | null;
-    /** 修改日期 */
+    /** 修改日期. */
     public modUsrId?: string | null;
-    /** 修改用户 */
+    /** 修改用户. */
     public moddte?: string | null;
-    /** 仓库 */
+    /** 仓库. */
     public whId?: string | null;
-    /** 工作区 */
+    /** 工作区. */
     public wrkare?: string | null;
-    /** 工作区描述 */
+    /** 工作区描述. */
     public wrkareDsc?: string | null;
 
     public constructor(obj?: WorkstationAreaDTO) {
@@ -261,39 +261,63 @@ export class WorkstationAreaDTO {
     }
 }
 
-/** 工作站数据传输对象 */
+/** 工作站数据传输对象. */
 export class WorkstationDTO {
-    /** 工作站 */
+    /** 工作站. */
     public devcod?: string | null;
-    /** 主工作区 */
+    /** 工作站描述. */
+    public devcodDsc?: string | null;
+    /** 主工作区. */
     public hmewrkare?: string | null;
-    /** 主键 */
+    /** 主工作区描述. */
+    public hmewrkareDsc?: string | null;
+    /** 主键. */
     public id?: string | null;
-    /** 创建日期 */
+    /** 创建日期. */
     public insDt?: string | null;
-    /** 创建用户 */
+    /** 创建用户. */
     public insUsrId?: string | null;
-    /** 修改日期 */
+    /** 标签打印机(Label Printer Address). */
+    public lblPrtadr?: string | null;
+    /** 标签打印机名称. */
+    public lblPrtadrDsc?: string | null;
+    /** 便携标签打印机(Mobile Printer Address). */
+    public mobPrtadr?: string | null;
+    /** 便携标签打印机名称. */
+    public mobPrtadrDsc?: string | null;
+    /** 修改日期. */
     public modUsrId?: string | null;
-    /** 修改用户 */
+    /** 修改用户. */
     public moddte?: string | null;
-    /** 仓库 */
+    /** 纸张打印机(Paper Printer Address). */
+    public papPrtadr?: string | null;
+    /** 纸张打印机名称. */
+    public papPrtadrDsc?: string | null;
+    /** 仓库. */
     public whId?: string | null;
-    /** 工作站与工作区域关系 */
-    public workstationAreas?: Array<WorkstationAreaDTO> | null;
+    /** 工作站与工作区域关系. */
+    public workstationAndAreaRelationshipDTOList?: Array<WorkstationAreaDTO> | null;
 
     public constructor(obj?: WorkstationDTO) {
         keys(obj ?? {}).forEach((key: PropertyKey) => {
             switch (key) {
                 case 'devcod':
+                case 'devcodDsc':
                 case 'hmewrkare':
+                case 'hmewrkareDsc':
                 case 'id':
                 case 'insDt':
                 case 'insUsrId':
+                case 'lblPrtadr':
+                case 'lblPrtadrDsc':
+                case 'mobPrtadr':
+                case 'mobPrtadrDsc':
                 case 'modUsrId':
                 case 'moddte':
+                case 'papPrtadr':
+                case 'papPrtadrDsc':
                 case 'whId':
-                case 'workstationAreas':
+                case 'workstationAndAreaRelationshipDTOList':
                     Reflect.set(this, key, Reflect.get(obj ?? {}, key));
                     break;
                 default:

package/{dist/api → api}/api.ts

@@ -1 +1 @@
-export { WMSAPI as WMS } from './WMS';
+export { WMSAPI as WMS } from './WMS';

package/{dist/api → api}/def.ts

@@ -1 +1 @@
-export { WMSDEF as WMS } from './WMS';
+export { WMSDEF as WMS } from './WMS';

package/{dist/api → api}/index.ts

@@ -1,2 +1,2 @@
-export * as API from './api';
-export * as DEF from './def';
+export * as API from './api';
+export * as DEF from './def';

package/{dist/component → component}/KgStation/KgStation.vue

@@ -3,7 +3,17 @@
         <UniPopupDialog :before-close="true" title="选择工作站" @close="onClose" @confirm="onOk">
             <div class="row">
                 <div class="label">工作站:</div>
-                <div class="value">
+                <div class="value devcod">
+                    <UniEasyinput
+                        v-model="devcodInputValue"
+                        :focus="isFocusMap.devcodInputValue"
+                        :placeholder="currentDevcodDsc"
+                        :placeholder-style="devcodPlaceholderStyle"
+                        trim
+                        @blur="onDevcodInputValueBlur"
+                        @focus="onDevcodInputValueFocus"
+                        @confirm="findDevmstByInputValue"
+                    />
                     <UniDataSelect :localdata="stationDatas" v-model="currentDevcod" :clear="true" />
                 </div>
             </div>
@@ -18,8 +28,8 @@
 </template>
 
 <script lang="ts" setup>
-    import { UniDataSelect, UniPopup, UniPopupDialog } from '../../uni';
-    import { computed, ref, watch } from 'vue';
+    import { UniDataSelect, UniEasyinput, UniPopup, UniPopupDialog } from '../../uni';
+    import { computed, nextTick, ref, watch } from 'vue';
     import { useKgStation } from './index.hooks';
     import { WorkstationDTO } from '../../api/WMS/models';
     import { API } from '../../api';
@@ -41,24 +51,46 @@
     /** 所有工作站. */
     const stations = ref<Array<WorkstationDTO>>([]);
 
+    /**
+     * 工作站的输入框输入的值, 当输入框失去焦点或者回车时, 会根据这个值去匹配工作站编号, 如果匹配成功, 则选中该匹配的工作站, 否则清空该值并提升工作站不存在.
+     */
+    const devcodInputValue = ref('');
+
+    /**
+     * 工作站的输入框的占位符字符的样式.
+     */
+    const devcodPlaceholderStyle = ref('color: #3ee');
+
     /**
      * 工作站下拉列表.
      */
-    const stationDatas = computed<Array<{ value: string; text: string }>>(() => stations.value.map((i) => ({ text: i.devcod ?? '', value: i.devcod ?? '' })));
+    const stationDatas = computed<Array<{ text: string; value: string }>>(() =>
+        stations.value.map((i) => ({ text: i.devcodDsc ?? i.devcod ?? '', value: i.devcod ?? '' })),
+    );
 
     /**
      * 工作区下拉列表.
      */
-    const areaDatas = computed<Array<{ value: string; text: string }>>(
+    const areaDatas = computed<Array<{ text: string; value: string }>>(
         () =>
             stations.value
                 .find((i) => i.devcod === currentDevcod.value)
-                ?.workstationAreas?.map((i) => ({
+                ?.workstationAndAreaRelationshipDTOList?.map((i) => ({
                     text: i.wrkareDsc ?? i.wrkare ?? '',
                     value: i.wrkare ?? '',
                 })) ?? [],
     );
 
+    /**
+     * 当前选择的工作站编号的描述.
+     */
+    const currentDevcodDsc = computed(() => stationDatas.value.find((i) => i.value === currentDevcod.value)?.text ?? '');
+
+    /**
+     * <p>是否聚焦.</p>
+     * <p>每个 key 对应一个输入框, 每个 value 表示该输入框当前是否聚焦.</p>
+     */
+    const isFocusMap = ref<Record<string, boolean>>({ devcodInputValue: true });
     // ----------------------------------------------------------------------------------------------------
     //endregion
 
@@ -69,12 +101,10 @@
         if (!value) {
             currentHmewrkare.value = '';
         } else {
-            console.log('11', value, currentDevcod.value);
             // 当「当前选择的工作站编号」变更时, 选择它的默认的工作区,
             const currentStation = stations.value.find((i) => i.devcod === currentDevcod.value);
             if (currentStation) {
                 currentHmewrkare.value = currentStation.hmewrkare ?? '';
-                console.log('22', currentHmewrkare.value);
             }
         }
     });
@@ -83,6 +113,57 @@
 
     //region FUNCTION
     // ----------------------------------------------------------------------------------------------------
+    /**
+     * 设置聚焦.
+     *
+     * @param key 要聚焦哪个输入框.
+     */
+    function setFocus(key: string) {
+        // 错误的输入框,
+        if (!key || !(key in isFocusMap.value)) {
+            return;
+        }
+
+        Object.keys(isFocusMap.value).forEach((key) => (isFocusMap.value[key] = false));
+        nextTick().then(() => (isFocusMap.value[key] = true));
+    }
+
+    /**
+     * 工作站的输入框失去焦点.
+     */
+    async function onDevcodInputValueBlur() {
+        devcodPlaceholderStyle.value = 'color: #333';
+
+        await nextTick();
+        await findDevmstByInputValue();
+    }
+
+    /**
+     * 工作站的输入框聚焦.
+     */
+    function onDevcodInputValueFocus() {
+        devcodPlaceholderStyle.value = 'color: #999';
+    }
+
+    /**
+     * 根据输入的值(作为工作站编号), 查找工作站.
+     */
+    async function findDevmstByInputValue() {
+        if (!devcodInputValue.value) {
+            return;
+        }
+
+        const station = stations.value.find((i) => i.devcod === devcodInputValue.value);
+        if (station) {
+            currentDevcod.value = devcodInputValue.value;
+            devcodInputValue.value = '';
+        } else {
+            devcodInputValue.value = '';
+            await uni.showToast({ icon: 'none', title: '工作站不存在' });
+            setFocus('devcodInputValue');
+        }
+    }
+
     /**
      * 取消.
      */
@@ -121,7 +202,15 @@
      */
     async function requestStations(): Promise<void> {
         try {
-            stations.value = (await API.WMS.WorkstationController.List({ params: { pageNo: 1, pageSize: 999 } }))?.records ?? [];
+            stations.value =
+                (
+                    await API.WMS.WorkstationController.List({
+                        params: {
+                            pageNo: 1,
+                            pageSize: 999,
+                        },
+                    })
+                )?.records ?? [];
         } catch (e) {
             console.error(e);
         }
@@ -133,7 +222,12 @@
 </script>
 
 <style scoped>
+    :deep(.uni-popup__wrapper) {
+        width: calc(100% - 8px);
+    }
+
     :deep(.uni-popup-dialog) {
+        width: 100%;
         font-size: 13px;
     }
 
@@ -173,4 +267,21 @@
         flex: 1;
         min-width: 0;
     }
+
+    :deep(.uni-popup-dialog) .uni-dialog-content > .row > .value.devcod {
+        position: relative;
+    }
+
+    :deep(.uni-popup-dialog) .uni-dialog-content > .row > .value.devcod > .uni-easyinput {
+        color: rgb(51, 51, 51);
+        position: absolute;
+        left: 0;
+        top: 0;
+        z-index: 2;
+        width: calc(100% - 26px);
+    }
+
+    :deep(.uni-popup-dialog) .uni-dialog-content > .row > .value.devcod > .uni-easyinput > .uni-easyinput__content {
+        border-radius: 3px 0 0 3px;
+    }
 </style>

package/{dist/component → component}/KgStation/index.hooks.ts

@@ -54,7 +54,7 @@ export function useKgStation(): IUseKgStation {
     });
 
     return {
-        area: computed(() => station.value?.workstationAreas?.find((i) => i.wrkare === station.value?.hmewrkare) ?? null),
+        area: computed(() => station.value?.workstationAndAreaRelationshipDTOList?.find((i) => i.wrkare === station.value?.hmewrkare) ?? null),
         station: station,
         stations: computed(() => store.getStations),
         store: store,

package/{dist/component → component}/KgUpdatePopup/KgUpdatePopup.vue

@@ -45,7 +45,7 @@
     /** 下载进度. [0, 100] 之间的某个数值, 表示百分比的分子. */
     const downloadProgress = ref<number>(0);
     /** 最新版本. */
-    const version = ref<number>(0);
+    const version = ref<string>('0.0.0');
     /** 下载进度的计时器, 用来模拟下载进度. */
     const downloadProgressTimer = ref<number>(-1);
     /** 退订弹窗打开事件. */

package/{dist/component → component}/KgWarehouse/KgWarehouse.vue

@@ -28,7 +28,7 @@
     /** 选项列表. */
     const warehouseDatas = ref<Array<{ text: string; value: string }>>([]);
     /** 用户仓库列表. */
-    const userWarehouses = computed<Array<SysUserWarehouseDTO>>(() => appStore.getUserWarehouses);
+    const userWarehouses = computed<Array<SysUserWarehouseDTO> | undefined>(() => appStore.getUserWarehouses);
 
     /** 确定. */
     function onOk() {

package/{dist/index.css → index.css}

@@ -2,6 +2,10 @@ uni-button {
     border-radius: 3px !important;
 }
 
+uni-button:after {
+    border-radius: 6px !important;
+}
+
 .kg-tab-bar-sibling {
     padding-bottom: 50px !important;
 }
@@ -26,18 +30,44 @@ uni-button {
     background-color: rgba(17, 17, 17, 0.9);
 }
 
+/* region H5 */
 /* #ifdef H5 */
 
 .uni-nav-bar-text {
     font-size: 16px !important;
 }
 
+.uni-modal__bd {
+    padding: 12px 6px;
+    min-height: auto;
+    color: #000000e6;
+}
+
+.uni-modal__hd {
+    padding: 6px;
+    border-bottom: 1px solid #d9d9d9;
+}
+
 /* #endif */
+/* endregion */
 
+/* region APP-PLUS */
 /* #ifdef APP-PLUS */
 
 .uni-nav-bar-text {
     font-size: 17px !important;
 }
 
+.uni-modal__bd {
+    padding: 12px 6px;
+    min-height: auto;
+    color: #000000e6;
+}
+
+.uni-modal__hd {
+    padding: 6px;
+    border-bottom: 1px solid #d9d9d9;
+}
+
 /* #endif */
+/* endregion */

package/lodash-es.ts

@@ -0,0 +1 @@
+export * from 'lodash-es';

package/package.json

@@ -1,38 +1,14 @@
 {
     "name": "@kengic/uni",
-    "version": "0.6.3-beta.6",
+    "version": "0.6.3-beta.60",
     "scripts": {
-        "build": "npm run switch-node-version && rimraf dist && vue-tsc && vite build",
-        "------ -------------------------------------------": "",
-        "publish:all:major": "npm run bump-version:major && npm run publish:all",
-        "publish:all:minor": "npm run bump-version:minor && npm run publish:all",
-        "publish:all:patch": "npm run bump-version:patch && npm run publish:all",
-        "publish:all:beta": "npm run bump-version:beta && npm run publish:all",
-        "--------------------------------------------------": "",
-        "gen:apis:WMS": "npm run switch-node-version && kengic-pont generate-apis --config kg.config.ts --origin WMS",
-        "- ------------------------------------------------": "",
-        "copy-to:luotao.smartfactory.product.wms.wms--dev-3.2": "npm run build && node scripts/copy-to.luotao.smartfactory.product.wms.wms--dev-3.2.mjs --experimental-default-type=module",
-        "copy-to:luotao.wms-pda--focus": "npm run build && node scripts/copy-to.luotao.wms-pda--focus.mjs --experimental-default-type=module",
-        "----------- --------------------------------------": "",
-        "bump-to:luotao.smartfactory.product.wms.wms--dev-3.2": "npm run switch-node-version && node scripts/bump-to.luotao.smartfactory.product.wms.wms--dev-3.2.mjs --experimental-default-type=module",
-        "bump-to:luotao.wms-pda--focus": "npm run switch-node-version && node scripts/bump-to.luotao.wms-pda--focus.mjs --experimental-default-type=module",
-        "-- -----------------------------------------------": "",
-        "cnpm:sync": "npx cnpm --yes sync @kengic/uni",
-        "--- ----------------------------------------------": "",
-        "switch-node-version": "nvm use 20.11.0 && corepack enable && corepack prepare pnpm@7.30.5 --activate",
-        "---- ---------------------------------------------": "",
-        "bump-version:major": "npm run switch-node-version && node scripts/bump.mjs major --experimental-default-type=module",
-        "bump-version:minor": "npm run switch-node-version && node scripts/bump.mjs minor --experimental-default-type=module",
-        "bump-version:patch": "npm run switch-node-version && node scripts/bump.mjs patch --experimental-default-type=module",
-        "bump-version:beta": "npm run switch-node-version && node scripts/bump.mjs beta --experimental-default-type=module",
-        "----- --------------------------------------------": "",
-        "publish:all": "npm run switch-node-version && node scripts/publish.mjs --experimental-default-type=module",
-        "publish:npm": "npm run switch-node-version && npmrc kengic && npm publish ./ --registry https://registry.npmjs.org/ --access public"
+        "postinstall": "node ./script/postinstall.mjs"
     },
     "dependencies": {
         "@dcloudio/types": "~3.3.3",
         "@dcloudio/uni-app": "3.0.0-alpha-3080220230428001",
-        "@kengic/pont": "1.2.15",
+        "@dcloudio/uni-i18n": "3.0.0-alpha-3080220230428001",
+        "@kengic/pont": "1.2.17-beta.7",
         "@types/lodash-es": "4.17.7",
         "@types/node": "18.16.3",
         "@types/semver": "7.3.13",
@@ -42,31 +18,24 @@
         "@vueuse/shared": "8.9.4",
         "ant-design-vue": "3.2.20",
         "chalk": "4.1.2",
+        "dayjs": "1.11.10",
         "less": "4.1.3",
         "lodash-es": "4.17.21",
         "pinia": "2.0.35",
-        "prettier": "3.2.5",
+        "prettier": "3.3.3",
         "rimraf": "~3.0.2",
         "rollup": "~2.79.1",
         "sass": "1.62.1",
         "sass-loader": "10.4.1",
-        "semver": "7.5.0",
+        "semver": "7.5.4",
+        "tsx": "3.12.3",
         "typescript": "4.9.5",
         "uuid": "~9.0.1",
         "vite": "4.3.4",
         "vue": "3.2.47",
         "vue-tsc": "1.8.27"
     },
-    "main": "./dist/index.ts",
-    "module": "./dist/index.ts",
-    "types": "./dist/index.ts",
-    "prettier": {
-        "endOfLine": "auto",
-        "printWidth": 160,
-        "semi": true,
-        "singleQuote": true,
-        "tabWidth": 4,
-        "trailingComma": "all",
-        "vueIndentScriptAndStyle": true
-    }
+    "main": "./index.ts",
+    "module": "./index.ts",
+    "types": "./index.ts"
 }