@kengic/uni 0.6.3-beta.7 → 0.7.0

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}/KgNavBar/KgNavBar.vue

@@ -15,7 +15,7 @@
 
 <script lang="ts" name="KgNavBar" setup>
     import { computed, ref } from 'vue';
-    import { UniIcons, UniNavBar } from '../../uni';
+    import { UniIcons, UniNavBar } from '../../uni-ui';
     import { Kg } from '../../util';
     import { KgUpdatePopup } from '../KgUpdatePopup';
 

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,13 +28,13 @@
 </template>
 
 <script lang="ts" setup>
-import { UniDataSelect, UniPopup, UniPopupDialog } from '../../uni';
-import { computed, ref, watch } from 'vue';
-import { useKgStation } from './index.hooks';
-import { WorkstationDTO } from '../../api/WMS/models';
-import { API } from '../../api';
+    import { UniDataSelect, UniEasyinput, UniPopup, UniPopupDialog } from '../../uni-ui';
+    import { computed, nextTick, ref, watch } from 'vue';
+    import { useKgStation } from './index.hooks';
+    import { WorkstationDTO } from '../../api/WMS/models';
+    import { API } from '../../api';
 
-const emit = defineEmits(['ok']);
+    const emit = defineEmits(['ok']);
 
     const kgStation = useKgStation();
 
@@ -41,26 +51,46 @@ const emit = defineEmits(['ok']);
     /** 所有工作站. */
     const stations = ref<Array<WorkstationDTO>>([]);
 
+    /**
+     * 工作站的输入框输入的值, 当输入框失去焦点或者回车时, 会根据这个值去匹配工作站编号, 如果匹配成功, 则选中该匹配的工作站, 否则清空该值并提升工作站不存在.
+     */
+    const devcodInputValue = ref('');
+
+    /**
+     * 工作站的输入框的占位符字符的样式.
+     */
+    const devcodPlaceholderStyle = ref('color: #3ee');
+
     /**
      * 工作站下拉列表.
      */
-    const stationDatas = computed<Array<{ value: string; text: string }>>(() =>
+    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
 
@@ -71,12 +101,10 @@ const emit = defineEmits(['ok']);
         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);
             }
         }
     });
@@ -85,6 +113,57 @@ const emit = defineEmits(['ok']);
 
     //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');
+        }
+    }
+
     /**
      * 取消.
      */
@@ -123,7 +202,15 @@ const emit = defineEmits(['ok']);
      */
     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);
         }
@@ -135,7 +222,12 @@ const emit = defineEmits(['ok']);
 </script>
 
 <style scoped>
+    :deep(.uni-popup__wrapper) {
+        width: calc(100% - 8px);
+    }
+
     :deep(.uni-popup-dialog) {
+        width: 100%;
         font-size: 13px;
     }
 
@@ -175,4 +267,21 @@ const emit = defineEmits(['ok']);
         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}/KgTabBar/KgTabBar.vue

@@ -14,7 +14,7 @@
 
 <script lang="ts" name="KgTabBar" setup>
     import { onMounted, ref } from 'vue';
-    import { UniIcons } from '../../uni';
+    import { UniIcons } from '../../uni-ui';
     import { Kg } from '../../util';
     import { v4 as uuid } from 'uuid';
 

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

@@ -20,7 +20,7 @@
 
 <script lang="ts" name="KgUpdatePopup" setup>
     import { computed, onMounted, onUnmounted, PropType, ref } from 'vue';
-    import { UniPopup, UniPopupDialog } from '../../uni';
+    import { UniPopup, UniPopupDialog } from '../../uni-ui';
     import { useAppStore } from '../../store/app.store';
     import { Kg } from '../../util';
 
@@ -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

@@ -7,7 +7,7 @@
 </template>
 
 <script lang="ts" setup>
-    import { UniDataCheckbox, UniPopup, UniPopupDialog } from '../../uni';
+    import { UniDataCheckbox, UniPopup, UniPopupDialog } from '../../uni-ui';
     import { API } from '../../api';
     import { computed, ref } from 'vue';
     import { SysUserWarehouseDTO, WhDTO } from '../../api/WMS/models';
@@ -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/{dist/index.ts → index.ts}

@@ -4,5 +4,5 @@ export * from './config';
 export * from './const';
 export * from './service';
 export * from './store/app.store';
-export * from './uni';
+export * from './uni-ui';
 export * from './util';

package/lodash-es.ts

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

package/package.json

@@ -1,70 +1,48 @@
 {
     "name": "@kengic/uni",
-    "version": "0.6.3-beta.7",
+    "version": "0.7.0",
     "scripts": {
-        "build": "npm run switch-node-version && rimraf dist && vue-tsc && vite build",
-        "------ -------------------------------------------": "",
-        "publish:all:major": "npm run bump:major && npm run publish:all",
-        "publish:all:minor": "npm run bump:minor && npm run publish:all",
-        "publish:all:patch": "npm run bump:patch && npm run publish:all",
-        "publish:all:beta": "npm run bump: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",
-        "----------- --------------------------------------": "",
-        "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",
-        "-- -----------------------------------------------": "",
-        "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:major": "npm run switch-node-version && node scripts/bump.mjs major --experimental-default-type=module",
-        "bump:minor": "npm run switch-node-version && node scripts/bump.mjs minor --experimental-default-type=module",
-        "bump:patch": "npm run switch-node-version && node scripts/bump.mjs patch --experimental-default-type=module",
-        "bump: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/types": "3.3.3",
         "@dcloudio/uni-app": "3.0.0-alpha-3080220230428001",
-        "@kengic/pont": "1.2.15",
-        "@types/lodash-es": "4.17.7",
+        "@dcloudio/uni-app-plus": "3.0.0-alpha-3080220230428001",
+        "@dcloudio/uni-automator": "3.0.0-alpha-3080220230428001",
+        "@dcloudio/uni-cli-shared": "3.0.0-alpha-3080220230428001",
+        "@dcloudio/uni-components": "3.0.0-alpha-3080220230428001",
+        "@dcloudio/uni-h5": "3.0.0-alpha-3080220230428001",
+        "@dcloudio/uni-i18n": "3.0.0-alpha-3080220230428001",
+        "@dcloudio/uni-stacktracey": "3.0.0-alpha-3080220230428001",
+        "@dcloudio/vite-plugin-uni": "3.0.0-alpha-3080220230428001",
+        "@kengic/pont": "1.2.17-beta.7",
+        "@types/lodash-es": "4.17.12",
         "@types/node": "18.16.3",
         "@types/semver": "7.3.13",
-        "@types/uuid": "~9.0.7",
+        "@types/uuid": "11.0.0",
         "@vitejs/plugin-vue": "4.2.1",
         "@vueuse/core": "8.9.4",
         "@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",
-        "rimraf": "~3.0.2",
-        "rollup": "~2.79.1",
+        "lodash-es": "4.17.22",
+        "pinia": "2.0.36",
+        "prettier": "3.7.4",
+        "rimraf": "6.1.2",
+        "rollup": "2.79.2",
         "sass": "1.62.1",
-        "sass-loader": "10.4.1",
-        "semver": "7.5.0",
+        "sass-loader": "10.5.2",
+        "semver": "7.7.3",
+        "tsx": "4.21.0",
         "typescript": "4.9.5",
-        "uuid": "~9.0.1",
-        "vite": "4.3.4",
+        "uuid": "13.0.0",
+        "vite": "4.3.9",
         "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"
 }

package/script/postinstall.mjs

@@ -0,0 +1,121 @@
+import fs from 'fs';
+
+/**
+ * 获取当前时间.
+ */
+function now() {
+    return `[${new Date(Date.now() + 1000 * 60 * 60 * 8).toISOString().substring(0, 23).replace('T', ' ')}] [@kengic/uni] POST INSTALL | `;
+}
+
+/**
+ * 打印日志.
+ *
+ * @param message 日志消息.
+ */
+function log(message) {
+    console.log(`${now()}${message}`);
+}
+
+/**
+ * 项目的根目录.
+ */
+const PROJECT_DIR_01 = '../../../../../../..';
+const PROJECT_DIR_02 = '../../../../../..';
+
+//region 同步依赖
+//----------------------------------------------------------------------------------------------------
+log(``);
+log(`当前目录 | ${process.cwd()}`);
+
+let json01 = null;
+
+try {
+    log(`开始读取组件的 package.json`);
+    json01 = (await import(`../package.json`, { with: { type: 'json' } })).default;
+    log(`成功读取组件的 package.json`);
+} catch (e) {
+    log(`失败读取组件的 package.json`);
+    throw e;
+}
+
+let json02 = null;
+
+try {
+    log(`开始读取项目的 package.json`);
+    json02 = (await import(`${PROJECT_DIR_01}/package.json`, { with: { type: 'json' } })).default;
+    log(`成功读取项目的 package.json`);
+} catch (e) {
+    log(`失败读取项目的 package.json`);
+    throw e;
+}
+
+if (json01 && json02) {
+    for (let key of Object.keys(json01.dependencies)) {
+        json02.dependencies[key] = json01.dependencies[key];
+    }
+
+    // 排序,
+    json02.dependencies = Object.fromEntries(Object.entries(json02.dependencies).sort(([a], [b]) => a.localeCompare(b)));
+
+    log(`开始写入项目的 package.json`);
+    fs.writeFileSync(`${PROJECT_DIR_02}/package.json`, `${JSON.stringify(json02, null, 4)}\n`, {});
+    log(`成功写入项目的 package.json`);
+}
+//----------------------------------------------------------------------------------------------------
+//endregion
+
+//region 移除多余的控制台消息
+//----------------------------------------------------------------------------------------------------
+// vite-plugin-uni 中的编译器版本号不对, 手动修复
+{
+    const filepath = `${PROJECT_DIR_02}/node_modules/@dcloudio/vite-plugin-uni/package.json`;
+    const json = JSON.parse(fs.readFileSync(filepath, { encoding: 'utf8' }));
+    const version = json['version'].split('-')[json['version'].split('-').length - 1].substring(0, 5).replaceAll('0', '.');
+    const compilerVersion = json['uni-app']['compilerVersion'];
+    if (version !== compilerVersion) {
+        json['uni-app']['compilerVersion'] = version;
+        fs.writeFileSync(filepath, `${JSON.stringify(json, null, 2)}\n`, {});
+    }
+}
+
+// 移除 uni-cloud 的广告
+{
+    const filepath = `${PROJECT_DIR_02}/node_modules/.pnpm/node_modules/@dcloudio/uni-cloud/lib/uni.plugin.js`;
+    let text = fs.readFileSync(filepath, { encoding: 'utf8' });
+    text = text.replaceAll(/'欢迎(.*)?'/g, '');
+    fs.writeFileSync(filepath, text, {});
+}
+
+// 修改 uni-cli-shared 控制台的消息
+{
+    {
+        const filepath = `${PROJECT_DIR_02}/node_modules/@dcloudio/uni-cli-shared/dist/messages/en.js`;
+        let text = fs.readFileSync(filepath, { encoding: 'utf8' });
+        text = text.replaceAll("'DONE  Build complete.'", "'打包完成'");
+        text = text.replaceAll("'Compiling...'", "'正在编译...'");
+        text = text.replaceAll("'正在编译中...'", "'正在编译...'");
+        text = text.replaceAll("'Run method: open {devtools}, import {outputDir} run.'", "''");
+        text = text.replaceAll("'Compiler version: {version}'", "'框架版本: {version}'");
+        text = text.replaceAll("'运行方式：打开 {devtools}, 导入 {outputDir} 运行。'", "''");
+        text = text.replaceAll(
+            "'Please note that in running mode, due to log output, sourcemap, and uncompressed source code, the performance and package size are not as good as release mode.'",
+            "''",
+        );
+        fs.writeFileSync(filepath, text, {});
+    }
+
+    {
+        const filepath = `${PROJECT_DIR_02}/node_modules/@dcloudio/uni-cli-shared/dist/messages/zh_CN.js`;
+        let text = fs.readFileSync(filepath, { encoding: 'utf8' });
+        text = text.replaceAll("'DONE  Build complete.'", "'打包完成'");
+        text = text.replaceAll("'Compiling...'", "'正在编译...'");
+        text = text.replaceAll("'正在编译中...'", "'正在编译...'");
+        text = text.replaceAll("'Run method: open {devtools}, import {outputDir} run.'", "''");
+        text = text.replaceAll("'编译器版本：{version}'", "'框架版本: {version}'");
+        text = text.replaceAll("'运行方式：打开 {devtools}, 导入 {outputDir} 运行。'", "''");
+        text = text.replaceAll("'请注意运行模式下，因日志输出、sourcemap 以及未压缩源码等原因，性能和包体积，均不及发行模式。'", "''");
+        fs.writeFileSync(filepath, text, {});
+    }
+}
+//----------------------------------------------------------------------------------------------------
+//endregion