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

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"
@@ -196,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',
@@ -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右侧样式
@@ -459,9 +419,6 @@
                 }
                 if (this.errMsg) this.errMsg = '';
                 this.val = value;
-                // TODO 兼容 vue2
-                this.$emit('input', value);
-                // TODO　兼容　vue3
                 this.$emit('update:modelValue', value);
             },
 
@@ -527,9 +484,6 @@
              */
             onClear(event) {
                 this.val = '';
-                // TODO 兼容 vue2
-                this.$emit('input', '');
-                // TODO 兼容 vue2
                 // TODO　兼容　vue3
                 this.$emit('update:modelValue', '');
                 // 点击叉号触发
@@ -582,7 +536,7 @@
         position: relative;
         text-align: left;
         color: #333;
-        font-size: 14px;
+        font-size: 13px;
     }
 
     .uni-easyinput__content {
@@ -609,7 +563,7 @@
         overflow: hidden;
         flex: 1;
         line-height: 1;
-        font-size: 14px;
+        font-size: 13px;
         height: 24px;
         // min-height: 36px;
 
@@ -621,17 +575,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 +601,7 @@
         overflow: hidden;
         flex: 1;
         line-height: 1.5;
-        font-size: 14px;
+        font-size: 13px;
         margin: 6px;
         margin-left: 0;
         height: 80px;
@@ -737,7 +690,7 @@
 
         .uni-easyinput__placeholder-class {
             color: #d5d5d5;
-            font-size: 12px;
+            font-size: 13px;
         }
     }
 </style>

package/dist/util/kg.ts

@@ -128,7 +128,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('.');
@@ -383,7 +383,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/package.json

@@ -1,38 +1,34 @@
 {
     "name": "@kengic/uni",
-    "version": "0.6.3-beta.2",
+    "version": "0.6.3-beta.20",
     "scripts": {
-        "build": "npm run switch-node-version && rimraf dist && vue-tsc && vite build",
+        "build": "npm run use-node && 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",
+        "publish:major": "npm run bump:major && tsx script/publish.ts",
+        "publish:minor": "npm run bump:minor && tsx script/publish.ts",
+        "publish:patch": "npm run bump:patch && tsx script/publish.ts",
+        "publish:beta": "npm run bump:beta && tsx script/publish.ts",
         "--------------------------------------------------": "",
-        "gen:apis:WMS": "npm run switch-node-version && kengic-pont generate-apis --config kg.config.ts --origin WMS",
+        "gen:apis:WMS": "npm run use-node && 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",
+        "copy-to:luotao.smartfactory.product.wms.wms--dev-3.2": "npm run build && npx tsx script/copy-to.luotao.smartfactory.product.wms.wms--dev-3.2.ts",
+        "bump-to:luotao.smartfactory.product.wms.wms--dev-3.2": "npm run use-node && npx tsx script/bump-to.luotao.smartfactory.product.wms.wms--dev-3.2.ts",
         "-- -----------------------------------------------": "",
         "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",
+        "use-node": "npm cache clean -f && nvm use 18.20.4 && corepack enable && corepack use pnpm@9.12.1",
         "---- ---------------------------------------------": "",
-        "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",
+        "bump:major": "npm run use-node && npx tsx script/bump.ts major",
+        "bump:minor": "npm run use-node && npx tsx script/bump.ts minor",
+        "bump:patch": "npm run use-node && npx tsx script/bump.ts patch",
+        "bump:beta": "npm run use-node && npx tsx script/bump.ts beta",
         "----- --------------------------------------------": "",
-        "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"
+        "publish:npm": "npm run use-node && npmrc kengic && npm publish ./ --registry https://registry.npmjs.org/ --access public"
     },
     "dependencies": {
         "@dcloudio/types": "~3.3.3",
         "@dcloudio/uni-app": "3.0.0-alpha-3080220230428001",
-        "@kengic/pont": "1.2.15-beta.0",
+        "@kengic/pont": "1.2.17-beta.1",
         "@types/lodash-es": "4.17.7",
         "@types/node": "18.16.3",
         "@types/semver": "7.3.13",
@@ -45,12 +41,13 @@
         "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",

package/script/bump-to.luotao.smartfactory.product.wms.wms--dev-3.2.ts

@@ -0,0 +1,3 @@
+import { bumpVersionToProjects } from './bump-to.ts';
+
+['file:///D:/proj/kg/smartfactory.product.wms.wms--dev-3.2/wms-pda'].forEach((projectPath) => bumpVersionToProjects(projectPath, []));

package/script/bump-to.ts

@@ -0,0 +1,38 @@
+import fs from 'fs';
+import chalk from 'chalk';
+
+/**
+ * 更新前端项目中包的版本号.
+ * 当我们升级了这些包的版本后, 可以使用该方法快速将新的版本号同步到前端项目中去.
+ *
+ * @param projectPath 前端项目目录.
+ * @param excludes 要排除的包.
+ */
+function bumpVersionToProjects(projectPath, excludes = []) {
+    // file:///D:/foo/...
+    const pkgPath = `${projectPath}/package.json`;
+    // D:/foo/...
+    const absolutePkgPath = pkgPath.replace('file:///', '');
+
+    import(pkgPath, { with: { type: 'json' } })
+        .then(({ default: projectJSON }) => {
+            import('../package.json', { with: { type: 'json' } })
+                .then(({ default: packageJSON }) => {
+                    const { version, name } = packageJSON;
+                    if (projectJSON.dependencies[name]) {
+                        projectJSON.dependencies[name] = version;
+                    }
+
+                    fs.writeFileSync(absolutePkgPath, `${JSON.stringify(projectJSON, null, 4)}\n`, {});
+                    console.log(chalk.green(`版本更新成功`) + ' | ' + chalk.blue(version) + ' | ' + absolutePkgPath);
+                })
+                .catch((e) => {
+                    console.log(e);
+                });
+        })
+        .catch((e) => {
+            console.error(e);
+        });
+}
+
+export { bumpVersionToProjects };

package/script/bump.ts

@@ -0,0 +1,35 @@
+import fs from 'fs';
+import semver from 'semver';
+
+// ----------------------------------------------------------------------------------------------------
+// 自动更新所有包的版本号
+// ----------------------------------------------------------------------------------------------------
+
+import('../package.json').then(({ default: json }) => {
+    const type = process.argv[2];
+    let version = json.version;
+
+    switch (type) {
+        case 'major':
+            version = semver.inc(version, 'major');
+            break;
+        case 'minor':
+            version = semver.inc(version, 'minor');
+            break;
+        case 'patch':
+            version = semver.inc(version, 'patch');
+            break;
+        case 'beta':
+            version = semver.inc(version, 'prerelease', 'beta');
+            break;
+        default:
+            throw new Error('INVALID SEMVER TYPE');
+    }
+
+    import('../package.json').then(({ default: json }) => {
+        json.version = version;
+        fs.writeFileSync('./package.json', `${JSON.stringify(json, null, 4)}\n`, {});
+    });
+});
+
+export {};

package/script/copy-to.luotao.smartfactory.product.wms.wms--dev-3.2.ts

@@ -0,0 +1,3 @@
+import { copyToProject } from './copy-to.ts';
+
+['D:/proj/kg/smartfactory.product.wms.wms--dev-3.2/wms-pda'].forEach((projectPath) => copyToProject(projectPath));

package/script/copy-to.ts

@@ -0,0 +1,23 @@
+import fs from 'fs';
+import path from 'path';
+
+/**
+ * 开发时, 需要将打包后的文件复制到项目的 node_modules 目录下进行测试.
+ *
+ * @param projectPath 前端项目目录.
+ */
+function copyToProject(projectPath) {
+    const cacheDir = path.join(projectPath, '/node_modules/.vite/');
+    if (fs.existsSync(cacheDir)) {
+        fs.rmSync(cacheDir, { recursive: true, force: true });
+    }
+
+    const dir = path.join(projectPath, '/node_modules/@kengic/uni/dist/');
+    if (fs.existsSync(dir)) {
+        fs.rmSync(dir, { recursive: true, force: true });
+    }
+
+    fs.cpSync('./dist/', dir, { recursive: true });
+}
+
+export { copyToProject };

package/script/publish.ts

@@ -0,0 +1,20 @@
+import chalk from 'chalk';
+import { execSync } from 'child_process';
+import { name, version } from '../package.json';
+
+/*
+ * 使用下面的脚本来简化打包发布流程.
+ */
+
+const PKGNAME = `${name}@${version}`;
+
+execSync('npm cache clean -f', { cwd: './', stdio: 'ignore' });
+execSync('pnpm install', { cwd: './', stdio: 'ignore' });
+console.log(`${chalk.blueBright('INSTALL ')}| ${PKGNAME}`);
+
+execSync('npm run build', { cwd: './', stdio: 'ignore' });
+console.log(`${chalk.blueBright('  BUILD ')}| ${PKGNAME}`);
+
+execSync('npm run publish:npm', { cwd: './', stdio: 'ignore' });
+console.log(`${chalk.blueBright('PUBLISH ')}| ${PKGNAME}`);
+console.log('');

package/dist/src/index.d.ts

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

package/dist/uni/uni-ui/README.md

@@ -1 +0,0 @@
-## 最近一次同步的提交是 196a983af765287f539c071c0fbf6919e68a6a94

package/dist/uni/uni-ui/uni-scss/readme.md

@@ -1,4 +0,0 @@
-`uni-sass` 是 `uni-ui`提供的一套全局样式 ，通过一些简单的类名和`sass`变量，实现简单的页面布局操作，比如颜色、边距、圆角等。
-
-### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-sass)
-#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839