diff --git a/apps/hand-factory/App.vue b/apps/hand-factory/App.vue
index 2ca721a..a75bf5d 100644
--- a/apps/hand-factory/App.vue
+++ b/apps/hand-factory/App.vue
@@ -4,9 +4,9 @@
import updateManager from "@/utils/update.js";
export default {
- onLaunch: function() {
+ onLaunch: function() {
this.initApp()
- updateManager.checkUpdate();
+ updateManager.checkUpdate();
},
methods: {
// 初始化应用
diff --git a/apps/hand-factory/api/wms/coil.js b/apps/hand-factory/api/wms/coil.js
new file mode 100644
index 0000000..193f592
--- /dev/null
+++ b/apps/hand-factory/api/wms/coil.js
@@ -0,0 +1,66 @@
+import request from '@/utils/request'
+
+// 查询钢卷物料表列表
+export function listMaterialCoil(query) {
+ return request({
+ url: '/wms/materialCoil/list',
+ method: 'get',
+ params: query
+ })
+}
+
+export function exportMaterialCoil(query) {
+ return request({
+ url: '/wms/materialCoil/export',
+ method: 'get',
+ params: query
+ })
+}
+
+export function getMaterialCoil(CoilMaterialId) {
+ return request({
+ url: '/wms/materialCoil/' + CoilMaterialId,
+ method: 'get'
+ })
+}
+
+export function addMaterialCoil(data) {
+ return request({
+ url: '/wms/materialCoil',
+ method: 'post',
+ data: data
+ })
+}
+
+export function updateMaterialCoil(data) {
+ return request({
+ url: '/wms/materialCoil',
+ method: 'put',
+ data: data
+ })
+}
+
+// 简单更新钢卷物料表
+export function updateMaterialCoilSimple(data) {
+ return request({
+ url: '/wms/materialCoil/update',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除钢卷物料表
+export function delMaterialCoil(CoilMaterialId) {
+ return request({
+ url: '/wms/materialCoil/' + CoilMaterialId,
+ method: 'delete'
+ })
+}
+
+// 钢卷溯源查询
+export function getMaterialCoilTrace(CoilMaterialId) {
+ return request({
+ url: '/wms/materialCoil/trace/' + CoilMaterialId,
+ method: 'get'
+ })
+}
diff --git a/apps/hand-factory/api/wms/product.js b/apps/hand-factory/api/wms/product.js
new file mode 100644
index 0000000..da91a7c
--- /dev/null
+++ b/apps/hand-factory/api/wms/product.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询产品列表
+export function listProduct(query) {
+ return request({
+ url: '/wms/product/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询产品详细
+export function getProduct(productId) {
+ return request({
+ url: '/wms/product/' + productId,
+ method: 'get'
+ })
+}
+
+// 新增产品
+export function addProduct(data) {
+ return request({
+ url: '/wms/product',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改产品
+export function updateProduct(data) {
+ return request({
+ url: '/wms/product',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除产品
+export function delProduct(productId) {
+ return request({
+ url: '/wms/product/' + productId,
+ method: 'delete'
+ })
+}
diff --git a/apps/hand-factory/api/wms/rawMaterial.js b/apps/hand-factory/api/wms/rawMaterial.js
new file mode 100644
index 0000000..b8f5cad
--- /dev/null
+++ b/apps/hand-factory/api/wms/rawMaterial.js
@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+// 查询原材料列表
+export function listRawMaterial(query) {
+ return request({
+ url: '/wms/rawMaterial/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询原材料详细
+export function getRawMaterial(rawMaterialId) {
+ return request({
+ url: '/wms/rawMaterial/' + rawMaterialId,
+ method: 'get'
+ })
+}
+
+// 新增原材料
+export function addRawMaterial(data) {
+ return request({
+ url: '/wms/rawMaterial',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改原材料
+export function updateRawMaterial(data) {
+ return request({
+ url: '/wms/rawMaterial',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除原材料
+export function delRawMaterial(rawMaterialId) {
+ return request({
+ url: '/wms/rawMaterial/' + rawMaterialId,
+ method: 'delete'
+ })
+}
+
+export function listRawMaterialWithDemand(query) {
+ return request({
+ url: '/wms/rawMaterial//listWithDemand',
+ method: 'get',
+ params: query
+ })
+}
diff --git a/apps/hand-factory/api/wms/warehouse.js b/apps/hand-factory/api/wms/warehouse.js
new file mode 100644
index 0000000..963d563
--- /dev/null
+++ b/apps/hand-factory/api/wms/warehouse.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询仓库/库区/库位自关联列表
+export function listWarehouse(query) {
+ return request({
+ url: '/wms/warehouse/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询仓库/库区/库位自关联详细
+export function getWarehouse(warehouseId) {
+ return request({
+ url: '/wms/warehouse/' + warehouseId,
+ method: 'get'
+ })
+}
+
+// 新增仓库/库区/库位自关联
+export function addWarehouse(data) {
+ return request({
+ url: '/wms/warehouse',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改仓库/库区/库位自关联
+export function updateWarehouse(data) {
+ return request({
+ url: '/wms/warehouse',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除仓库/库区/库位自关联
+export function delWarehouse(warehouseId) {
+ return request({
+ url: '/wms/warehouse/' + warehouseId,
+ method: 'delete'
+ })
+}
diff --git a/apps/hand-factory/components/klp-product-select/klp-product-select.vue b/apps/hand-factory/components/klp-product-select/klp-product-select.vue
new file mode 100644
index 0000000..cba12ec
--- /dev/null
+++ b/apps/hand-factory/components/klp-product-select/klp-product-select.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/apps/hand-factory/components/klp-shutdown-statistic/klp-shutdown-statistic.vue b/apps/hand-factory/components/klp-shutdown-statistic/klp-shutdown-statistic.vue
index c420bf5..3c2e189 100644
--- a/apps/hand-factory/components/klp-shutdown-statistic/klp-shutdown-statistic.vue
+++ b/apps/hand-factory/components/klp-shutdown-statistic/klp-shutdown-statistic.vue
@@ -335,13 +335,10 @@ export default {
switch (this.activeTab) {
case "day":
return this.startDate;
- break;
case "month":
return `${this.startDate} 至 ${this.endDate}`;
- break;
case "year":
return `${this.startDate} 至 ${this.endDate}`;
- break;
default:
return "";
}
diff --git a/apps/hand-factory/components/lines/acidity.vue b/apps/hand-factory/components/lines/acidity.vue
index 40851f0..3103a57 100644
--- a/apps/hand-factory/components/lines/acidity.vue
+++ b/apps/hand-factory/components/lines/acidity.vue
@@ -1,12 +1,13 @@
-
+ > -->
+
@@ -95,28 +96,15 @@
+
+
\ No newline at end of file
diff --git a/apps/hand-factory/components/panels/code/merge.vue b/apps/hand-factory/components/panels/code/merge.vue
new file mode 100644
index 0000000..41f5105
--- /dev/null
+++ b/apps/hand-factory/components/panels/code/merge.vue
@@ -0,0 +1,12 @@
+
+
+ 合并
+
+
+
+
+
+
\ No newline at end of file
diff --git a/apps/hand-factory/components/panels/code/trace.vue b/apps/hand-factory/components/panels/code/trace.vue
new file mode 100644
index 0000000..44da829
--- /dev/null
+++ b/apps/hand-factory/components/panels/code/trace.vue
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/apps/hand-factory/components/panels/code/typing.vue b/apps/hand-factory/components/panels/code/typing.vue
new file mode 100644
index 0000000..35d21fa
--- /dev/null
+++ b/apps/hand-factory/components/panels/code/typing.vue
@@ -0,0 +1,238 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/apps/hand-factory/components/panels/klp-tabs/klp-tabs.vue b/apps/hand-factory/components/panels/klp-tabs/klp-tabs.vue
new file mode 100644
index 0000000..b6be938
--- /dev/null
+++ b/apps/hand-factory/components/panels/klp-tabs/klp-tabs.vue
@@ -0,0 +1,48 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/apps/hand-factory/pages/code/code.vue b/apps/hand-factory/pages/code/code.vue
index 1ad98d3..2e0a019 100644
--- a/apps/hand-factory/pages/code/code.vue
+++ b/apps/hand-factory/pages/code/code.vue
@@ -1,174 +1,117 @@
-
-
-
-
- {{ title }}
-
-
-
-
-
-
-
+
+
+
+
+ {{ item.label }}
+
+
-
-
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/apps/hand-factory/uni_modules/uni-data-select/changelog.md b/apps/hand-factory/uni_modules/uni-data-select/changelog.md
index 016e3d2..1681eae 100644
--- a/apps/hand-factory/uni_modules/uni-data-select/changelog.md
+++ b/apps/hand-factory/uni_modules/uni-data-select/changelog.md
@@ -1,3 +1,15 @@
+## 1.1.0(2025-08-19)
+- 新增 插槽 selected empty option
+- 新增 mutiple 属性,支持多选功能
+- 新增 wrap 属性,支持选中的文字超过一行显示
+- 新增 align 属性,支持修改选中的文字显示的位置
+- 新增 hideRight 属性,支持隐藏右侧所有按钮
+- 新增 mode 属性,支持修改边框样式
+- 新增 事件 open close clear
+## 1.0.10(2025-04-14)
+- 修复 清除按钮不展示问题
+## 1.0.9(2025-03-26)
+- 优化 默认背景为白色与整体组件保持风格统一
## 1.0.8(2024-03-28)
- 修复 在vue2下:style动态绑定导致编译失败的bug
## 1.0.7(2024-01-20)
diff --git a/apps/hand-factory/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue b/apps/hand-factory/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
index edab65a..85b2d7b 100644
--- a/apps/hand-factory/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
+++ b/apps/hand-factory/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
@@ -2,30 +2,59 @@
{{label + ':'}}
-
-
- {{textShow}}
- {{typePlaceholder}}
-
+
+
+
+
+
+
+
+ {{textShow}}
+
+ {{typePlaceholder}}
+
+
-
+
-
-
-
-
- {{emptyTips}}
-
-
- {{formatItemName(item)}}
-
-
-
+
+
+
+
+
+
+
+
+
+
+ {{emptyTips}}
+
+
+
+
+
+
+
+
+
+ {{formatItemName(item)}}
+
+
+
+
+
+
+
+
+
@@ -36,22 +65,56 @@
* DataChecklist 数据选择器
* @description 通过数据渲染的下拉框组件
* @tutorial https://uniapp.dcloud.io/component/uniui/uni-data-select
- * @property {String} value 默认值
+ * @property {String|Array} value 默认值,多选时为数组
* @property {Array} localdata 本地数据 ,格式 [{text:'',value:''}]
* @property {Boolean} clear 是否可以清空已选项
* @property {Boolean} emptyText 没有数据时显示的文字 ,本地数据无效
* @property {String} label 左侧标题
* @property {String} placeholder 输入框的提示文字
* @property {Boolean} disabled 是否禁用
+ * @property {Boolean} multiple 是否多选模式
+ * @property {Boolean} wrap 是否允许选中文本换行显示
* @property {String} placement 弹出位置
* @value top 顶部弹出
* @value bottom 底部弹出(default)
+ * @property {String} align 选择文字的位置
+ * @value left 显示左侧
+ * @value center 显示中间
+ * @value right 显示 右侧
+ * @property {Boolean} hideRight 是否隐藏右侧按钮
+ * @property {String} mode 边框样式
+ * @value default 四周边框
+ * @value underline 下边框
+ * @value none 无边框
* @event {Function} change 选中发生变化触发
+ * @event {Function} open 选择框开启时触发
+ * @event {Function} close 选择框关闭时触发
+ * @event {Function} clear 点击清除按钮之后触发
*/
export default {
name: "uni-data-select",
mixins: [uniCloud.mixinDatacom || {}],
+ emits: [
+ 'open',
+ 'close',
+ 'update:modelValue',
+ 'input',
+ 'clear',
+ 'change'
+ ],
+ model: {
+ prop: 'modelValue',
+ event: 'update:modelValue'
+ },
+ options: {
+ // #ifdef MP-TOUTIAO
+ virtualHost: false,
+ // #endif
+ // #ifndef MP-TOUTIAO
+ virtualHost: true
+ // #endif
+ },
props: {
localdata: {
type: Array,
@@ -60,11 +123,11 @@
}
},
value: {
- type: [String, Number],
+ type: [String, Number, Array],
default: ''
},
modelValue: {
- type: [String, Number],
+ type: [String, Number, Array],
default: ''
},
label: {
@@ -99,7 +162,27 @@
placement: {
type: String,
default: 'bottom'
- }
+ },
+ multiple: {
+ type: Boolean,
+ default: false
+ },
+ wrap: {
+ type: Boolean,
+ default: false
+ },
+ align:{
+ type: String,
+ default: "left"
+ },
+ hideRight: {
+ type: Boolean,
+ default: false
+ },
+ mode:{
+ type: String,
+ default: 'default'
+ }
},
data() {
return {
@@ -133,20 +216,35 @@
common
},
valueCom() {
- // #ifdef VUE3
- return this.modelValue;
- // #endif
- // #ifndef VUE3
- return this.value;
- // #endif
+ if (this.value === '') return this.modelValue
+ if (this.modelValue === '') return this.value
+ return this.value
},
textShow() {
// 长文本显示
- let text = this.current;
- if (text.length > 10) {
- return text.slice(0, 25) + '...';
+ if (this.multiple) {
+ const currentValues = this.getCurrentValues();
+ if (Array.isArray(currentValues) && currentValues.length > 0) {
+ const selectedItems = this.mixinDatacomResData.filter(item => currentValues.includes(item.value));
+ return selectedItems.map(item => this.formatItemName(item)).join(', ');
+ } else {
+ return ''; // 空数组时返回空字符串,显示占位符
+ }
+ } else {
+ return this.current;
}
- return text;
+ },
+ shouldShowClear() {
+ if (this.multiple) {
+ const currentValues = this.getCurrentValues();
+ return Array.isArray(currentValues) && currentValues.length > 0;
+ } else {
+ return !!this.current;
+ }
+ },
+ shouldWrap() {
+ // 只有在多选模式、开启换行、且有内容时才应用换行样式
+ return this.multiple && this.wrap && !!this.textShow;
},
getOffsetByPlacement() {
switch (this.placement) {
@@ -155,10 +253,38 @@
case 'bottom':
return "top:calc(100% + 12px);";
}
+ },
+ slotSelected(){
+ // #ifdef VUE2
+ return this.$scopedSlots ? this.$scopedSlots.selected : false
+ // #endif
+ // #ifdef VUE3
+ return this.$slots ? this.$slots.selected : false
+ // #endif
+ },
+ slotEmpty(){
+ // #ifdef VUE2
+ return this.$scopedSlots ? this.$scopedSlots.empty : false
+ // #endif
+ // #ifdef VUE3
+ return this.$slots ? this.$slots.empty : false
+ // #endif
+ },
+ slotOption(){
+ // #ifdef VUE2
+ return this.$scopedSlots ? this.$scopedSlots.option : false
+ // #endif
+ // #ifdef VUE3
+ return this.$slots ? this.$slots.option : false
+ // #endif
}
},
-
watch: {
+ showSelector:{
+ handler(val,old){
+ val ? this.$emit('open') : this.$emit('close')
+ }
+ },
localdata: {
immediate: true,
handler(val, old) {
@@ -178,9 +304,20 @@
}
}
},
-
},
methods: {
+ getSelectedItems() {
+ const currentValues = this.getCurrentValues();
+ let _minxData = this.mixinDatacomResData
+ // #ifdef MP-WEIXIN || MP-TOUTIAO
+ _minxData = JSON.parse(JSON.stringify(this.mixinDatacomResData))
+ // #endif
+ if (this.multiple) {
+ return _minxData.filter(item => currentValues.includes(item.value)) || [];
+ } else {
+ return _minxData.filter(item => item.value === currentValues) || [];
+ }
+ },
debounce(fn, time = 100) {
let timer = null
return function(...args) {
@@ -190,6 +327,23 @@
}, time)
}
},
+ // 检查项目是否已选中
+ isSelected(item) {
+ if (this.multiple) {
+ const currentValues = this.getCurrentValues();
+ return Array.isArray(currentValues) && currentValues.includes(item.value);
+ } else {
+ return this.getCurrentValues() === item.value;
+ }
+ },
+ // 获取当前选中的值
+ getCurrentValues() {
+ if (this.multiple) {
+ return Array.isArray(this.valueCom) ? this.valueCom : (this.valueCom ? [this.valueCom] : []);
+ } else {
+ return this.valueCom;
+ }
+ },
// 执行数据库查询
query() {
this.mixinDatacomEasyGet();
@@ -201,7 +355,7 @@
}
},
initDefVal() {
- let defValue = ''
+ let defValue = this.multiple ? [] : ''
if ((this.valueCom || this.valueCom === 0) && !this.isDisabled(this.valueCom)) {
defValue = this.valueCom
} else {
@@ -212,47 +366,105 @@
if (strogeValue || strogeValue === 0) {
defValue = strogeValue
} else {
- let defItem = ''
+ let defItem = this.multiple ? [] : ''
if (this.defItem > 0 && this.defItem <= this.mixinDatacomResData.length) {
- defItem = this.mixinDatacomResData[this.defItem - 1].value
+ defItem = this.multiple ? [this.mixinDatacomResData[this.defItem - 1].value] : this.mixinDatacomResData[this.defItem - 1].value
}
defValue = defItem
}
- if (defValue || defValue === 0) {
+ if (defValue || defValue === 0 || (this.multiple && Array.isArray(defValue) && defValue.length > 0)) {
this.emit(defValue)
}
}
- const def = this.mixinDatacomResData.find(item => item.value === defValue)
- this.current = def ? this.formatItemName(def) : ''
+
+ if (this.multiple) {
+ const selectedValues = Array.isArray(defValue) ? defValue : (defValue ? [defValue] : []);
+ const selectedItems = this.mixinDatacomResData.filter(item => selectedValues.includes(item.value));
+ this.current = selectedItems.map(item => this.formatItemName(item));
+ } else {
+ const def = this.mixinDatacomResData.find(item => item.value === defValue)
+ this.current = def ? this.formatItemName(def) : ''
+ }
},
/**
- * @param {[String, Number]} value
+ * @param {[String, Number, Array]} value
* 判断用户给的 value 是否同时为禁用状态
*/
isDisabled(value) {
- let isDisabled = false;
-
- this.mixinDatacomResData.forEach(item => {
- if (item.value === value) {
- isDisabled = item.disable
- }
- })
-
- return isDisabled;
+ if (Array.isArray(value)) {
+ // 对于数组,如果任意一个值被禁用,则认为整体被禁用
+ return value.some(val => {
+ return this.mixinDatacomResData.some(item => item.value === val && item.disable);
+ });
+ } else {
+ let isDisabled = false;
+ this.mixinDatacomResData.forEach(item => {
+ if (item.value === value) {
+ isDisabled = item.disable
+ }
+ })
+ return isDisabled;
+ }
},
-
clearVal() {
- this.emit('')
+ const emptyValue = this.multiple ? [] : '';
+ this.emit(emptyValue)
+ this.current = this.multiple ? [] : ''
if (this.collection) {
this.removeCache()
}
+ this.$emit('clear')
+ },
+ checkBoxChange(res){
+ let range = res.detail.value
+
+ let currentValues = range && range.length > 0? range.map((item)=>{
+ const index = parseInt(item, 10);
+
+ if (isNaN(index)) {
+ console.error(`无效索引: ${item}`);
+ }
+
+ if (index < 0 || index >= this.mixinDatacomResData.length) {
+ console.error(`索引越界: ${index}`);
+ }
+
+ return this.mixinDatacomResData[index].value;
+ }) : []
+ const selectedItems = this.mixinDatacomResData.filter(dataItem => currentValues.includes(dataItem.value));
+ this.current = selectedItems.map(dataItem => this.formatItemName(dataItem));
+
+ this.emit(currentValues);
},
change(item) {
if (!item.disable) {
- this.showSelector = false
- this.current = this.formatItemName(item)
- this.emit(item.value)
+ if (this.multiple) {
+ // 多选模式
+ let currentValues = this.getCurrentValues();
+ if (!Array.isArray(currentValues)) {
+ currentValues = currentValues ? [currentValues] : [];
+ }
+
+ const itemValue = item.value;
+ const index = currentValues.indexOf(itemValue);
+
+ if (index > -1) {
+ currentValues.splice(index, 1);
+ } else {
+ currentValues.push(itemValue);
+ }
+
+ const selectedItems = this.mixinDatacomResData.filter(dataItem => currentValues.includes(dataItem.value));
+ this.current = selectedItems.map(dataItem => this.formatItemName(dataItem));
+
+ this.emit(currentValues);
+ } else {
+ // 单选模式
+ this.showSelector = false
+ this.current = this.formatItemName(item)
+ this.emit(item.value)
+ }
}
},
emit(val) {
@@ -330,6 +542,11 @@
$uni-main-color: #333 !default;
$uni-secondary-color: #909399 !default;
$uni-border-3: #e5e5e5;
+ $uni-primary: #2979ff !default;
+ $uni-success: #4cd964 !default;
+ $uni-warning: #f0ad4e !default;
+ $uni-error: #dd524d !default;
+ $uni-info: #909399 !default;
/* #ifndef APP-NVUE */
@media screen and (max-width: 500px) {
@@ -352,6 +569,7 @@
}
.uni-stat-box {
+ background-color: #fff;
width: 100%;
flex: 1;
}
@@ -370,9 +588,16 @@
margin-right: 5px;
}
+ .border-bottom {
+ border-bottom: solid 1px $uni-border-3;
+ }
+
+ .border-default {
+ border: 1px solid $uni-border-3;
+ }
+
.uni-select {
font-size: 14px;
- border: 1px solid $uni-border-3;
box-sizing: border-box;
border-radius: 4px;
padding: 0 5px;
@@ -384,15 +609,20 @@
/* #endif */
flex-direction: row;
align-items: center;
- border-bottom: solid 1px $uni-border-3;
width: 100%;
flex: 1;
- height: 35px;
+ min-height: 35px;
&--disabled {
background-color: #f5f7fa;
cursor: not-allowed;
}
+
+ &--wrap {
+ height: auto;
+ min-height: 35px;
+ // align-items: flex-start;
+ }
}
.uni-select__label {
@@ -404,7 +634,8 @@
}
.uni-select__input-box {
- height: 35px;
+ // height: 35px;
+ width: 0px;
position: relative;
/* #ifndef APP-NVUE */
display: flex;
@@ -412,6 +643,24 @@
flex: 1;
flex-direction: row;
align-items: center;
+
+ &--wrap {
+ .uni-select__input-text {
+ margin-right: 8px;
+ }
+ }
+
+ .padding-top-bottom {
+ padding-top: 5px;
+ padding-bottom: 5px;
+ }
+
+ .slot-content {
+ width: 100%;
+ display: flex;
+ flex-direction: row;
+ flex-wrap: wrap;
+ }
}
.uni-select__input {
@@ -463,15 +712,18 @@
display: flex;
cursor: pointer;
/* #endif */
+ flex-direction: row;
+ align-items: center;
line-height: 35px;
font-size: 14px;
- text-align: center;
/* border-bottom: solid 1px $uni-border-3; */
padding: 0px 10px;
}
- .uni-select__selector-item:hover {
- background-color: #f9f9f9;
+
+
+ .uni-select__selector-item-check {
+ margin-left: auto;
}
.uni-select__selector-empty:last-child,
@@ -490,15 +742,14 @@
.uni-popper__arrow_bottom,
.uni-popper__arrow_bottom::after,
.uni-popper__arrow_top,
- .uni-popper__arrow_top::after,
- {
- position: absolute;
- display: block;
- width: 0;
- height: 0;
- border-color: transparent;
- border-style: solid;
- border-width: 6px;
+ .uni-popper__arrow_top::after {
+ position: absolute;
+ display: block;
+ width: 0;
+ height: 0;
+ border-color: transparent;
+ border-style: solid;
+ border-width: 6px;
}
.uni-popper__arrow_bottom {
@@ -544,11 +795,22 @@
text-overflow: ellipsis;
-o-text-overflow: ellipsis;
overflow: hidden;
+
+ &--wrap {
+ white-space: normal;
+ text-overflow: initial;
+ -o-text-overflow: initial;
+ overflow: visible;
+ word-wrap: break-word;
+ word-break: break-all;
+ // line-height: 1.5;
+ }
}
.uni-select__input-placeholder {
color: $uni-base-color;
font-size: 12px;
+ margin: 1px 0;
}
.uni-select--mask {
@@ -559,4 +821,17 @@
left: 0;
z-index: 2;
}
+
+ .align-left {
+ text-align: left;
+ }
+
+ .align-center {
+ text-align: center;
+ }
+
+ .align-right {
+ text-align: right;
+ }
+
diff --git a/apps/hand-factory/uni_modules/uni-data-select/package.json b/apps/hand-factory/uni_modules/uni-data-select/package.json
index 5864594..4033502 100644
--- a/apps/hand-factory/uni_modules/uni-data-select/package.json
+++ b/apps/hand-factory/uni_modules/uni-data-select/package.json
@@ -1,7 +1,7 @@
{
"id": "uni-data-select",
"displayName": "uni-data-select 下拉框选择器",
- "version": "1.0.8",
+ "version": "1.1.0",
"description": "通过数据驱动的下拉框选择器",
"keywords": [
"uni-ui",
@@ -12,12 +12,14 @@
],
"repository": "https://github.com/dcloudio/uni-ui",
"engines": {
- "HBuilderX": "^3.1.1"
+ "HBuilderX": "^3.1.1",
+ "uni-app": "^4.45",
+ "uni-app-x": ""
},
"directories": {
"example": "../../temps/example_temps"
},
-"dcloudext": {
+ "dcloudext": {
"sale": {
"regular": {
"price": "0.00"
@@ -35,52 +37,70 @@
"permissions": "无"
},
"npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
- "type": "component-vue"
+ "type": "component-vue",
+ "darkmode": "x",
+ "i18n": "x",
+ "widescreen": "x"
},
"uni_modules": {
- "dependencies": ["uni-load-more"],
+ "dependencies": [
+ "uni-load-more"
+ ],
"encrypt": [],
"platforms": {
"cloud": {
- "tcb": "y",
- "aliyun": "y",
- "alipay": "n"
+ "tcb": "√",
+ "aliyun": "√",
+ "alipay": "√"
},
"client": {
- "App": {
- "app-vue": "u",
- "app-nvue": "n"
+ "uni-app": {
+ "vue": {
+ "vue2": "√",
+ "vue3": "√"
+ },
+ "web": {
+ "safari": "√",
+ "chrome": "√"
+ },
+ "app": {
+ "vue": "√",
+ "nvue": "-",
+ "android": "√",
+ "ios": "√",
+ "harmony": "√"
+ },
+ "mp": {
+ "weixin": "√",
+ "alipay": "√",
+ "toutiao": "√",
+ "baidu": "-",
+ "kuaishou": "-",
+ "jd": "-",
+ "harmony": "-",
+ "qq": "-",
+ "lark": "-"
+ },
+ "quickapp": {
+ "huawei": "-",
+ "union": "-"
+ }
},
- "H5-mobile": {
- "Safari": "y",
- "Android Browser": "y",
- "微信浏览器(Android)": "y",
- "QQ浏览器(Android)": "y"
- },
- "H5-pc": {
- "Chrome": "y",
- "IE": "y",
- "Edge": "y",
- "Firefox": "y",
- "Safari": "y"
- },
- "小程序": {
- "微信": "y",
- "阿里": "u",
- "百度": "u",
- "字节跳动": "u",
- "QQ": "u",
- "京东": "u"
- },
- "快应用": {
- "华为": "u",
- "联盟": "u"
- },
- "Vue": {
- "vue2": "y",
- "vue3": "y"
+ "uni-app-x": {
+ "web": {
+ "safari": "-",
+ "chrome": "-"
+ },
+ "app": {
+ "android": "-",
+ "ios": "-",
+ "harmony": "-"
+ },
+ "mp": {
+ "weixin": "-"
+ }
}
}
}
}
-}
+}
\ No newline at end of file
diff --git a/apps/hand-factory/uni_modules/uni-icons/changelog.md b/apps/hand-factory/uni_modules/uni-icons/changelog.md
index 0261131..62e7682 100644
--- a/apps/hand-factory/uni_modules/uni-icons/changelog.md
+++ b/apps/hand-factory/uni_modules/uni-icons/changelog.md
@@ -1,5 +1,7 @@
-## 2.0.10(2024-06-07)
-- 优化 uni-app x 中,size 属性的类型
+## 2.0.12(2025-08-26)
+- 优化 uni-app x 下 size 类型问题
+## 2.0.11(2025-08-18)
+- 修复 图标点击事件返回
## 2.0.9(2024-01-12)
fix: 修复图标大小默认值错误的问题
## 2.0.8(2023-12-14)
diff --git a/apps/hand-factory/uni_modules/uni-icons/components/uni-icons/uni-icons.uvue b/apps/hand-factory/uni_modules/uni-icons/components/uni-icons/uni-icons.uvue
index 8740559..53eb2ea 100644
--- a/apps/hand-factory/uni_modules/uni-icons/components/uni-icons/uni-icons.uvue
+++ b/apps/hand-factory/uni_modules/uni-icons/components/uni-icons/uni-icons.uvue
@@ -1,91 +1,91 @@
-
- {{unicode}}
-
+
+ {{unicode}}
+
diff --git a/apps/hand-factory/uni_modules/uni-icons/components/uni-icons/uni-icons.vue b/apps/hand-factory/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
index 7da5356..1bd3d5e 100644
--- a/apps/hand-factory/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
+++ b/apps/hand-factory/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
@@ -85,8 +85,8 @@
}
},
methods: {
- _onClick() {
- this.$emit('click')
+ _onClick(e) {
+ this.$emit('click', e)
}
}
}
@@ -107,4 +107,4 @@
text-decoration: none;
text-align: center;
}
-
+
\ No newline at end of file
diff --git a/apps/hand-factory/uni_modules/uni-icons/package.json b/apps/hand-factory/uni_modules/uni-icons/package.json
index 6b681b4..60e45f0 100644
--- a/apps/hand-factory/uni_modules/uni-icons/package.json
+++ b/apps/hand-factory/uni_modules/uni-icons/package.json
@@ -1,7 +1,7 @@
{
"id": "uni-icons",
"displayName": "uni-icons 图标",
- "version": "2.0.10",
+ "version": "2.0.12",
"description": "图标组件,用于展示移动端常见的图标,可自定义颜色、大小。",
"keywords": [
"uni-ui",
@@ -11,12 +11,14 @@
],
"repository": "https://github.com/dcloudio/uni-ui",
"engines": {
- "HBuilderX": "^3.2.14"
+ "HBuilderX": "^3.2.14",
+ "uni-app": "^4.08",
+ "uni-app-x": "^4.61"
},
"directories": {
"example": "../../temps/example_temps"
},
-"dcloudext": {
+ "dcloudext": {
"sale": {
"regular": {
"price": "0.00"
@@ -34,56 +36,76 @@
"permissions": "无"
},
"npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
- "type": "component-vue"
+ "type": "component-vue",
+ "darkmode": "x",
+ "i18n": "x",
+ "widescreen": "x"
},
"uni_modules": {
- "dependencies": ["uni-scss"],
+ "dependencies": [
+ "uni-scss"
+ ],
"encrypt": [],
"platforms": {
"cloud": {
- "tcb": "y",
- "aliyun": "y",
- "alipay": "n"
+ "tcb": "x",
+ "aliyun": "x",
+ "alipay": "x"
},
"client": {
- "App": {
- "app-vue": "y",
- "app-nvue": "y",
- "app-uvue": "y"
+ "uni-app": {
+ "vue": {
+ "vue2": "√",
+ "vue3": "√"
+ },
+ "web": {
+ "safari": "√",
+ "chrome": "√"
+ },
+ "app": {
+ "vue": "√",
+ "nvue": "-",
+ "android": {
+ "extVersion": "",
+ "minVersion": "29"
+ },
+ "ios": "√",
+ "harmony": "√"
+ },
+ "mp": {
+ "weixin": "√",
+ "alipay": "√",
+ "toutiao": "√",
+ "baidu": "√",
+ "kuaishou": "-",
+ "jd": "-",
+ "harmony": "-",
+ "qq": "√",
+ "lark": "-"
+ },
+ "quickapp": {
+ "huawei": "√",
+ "union": "√"
+ }
},
- "H5-mobile": {
- "Safari": "y",
- "Android Browser": "y",
- "微信浏览器(Android)": "y",
- "QQ浏览器(Android)": "y"
- },
- "H5-pc": {
- "Chrome": "y",
- "IE": "y",
- "Edge": "y",
- "Firefox": "y",
- "Safari": "y"
- },
- "小程序": {
- "微信": "y",
- "阿里": "y",
- "百度": "y",
- "字节跳动": "y",
- "QQ": "y",
- "钉钉": "y",
- "快手": "y",
- "飞书": "y",
- "京东": "y"
- },
- "快应用": {
- "华为": "y",
- "联盟": "y"
- },
- "Vue": {
- "vue2": "y",
- "vue3": "y"
+ "uni-app-x": {
+ "web": {
+ "safari": "√",
+ "chrome": "√"
+ },
+ "app": {
+ "android": {
+ "extVersion": "",
+ "minVersion": "29"
+ },
+ "ios": "√",
+ "harmony": "√"
+ },
+ "mp": {
+ "weixin": "√"
+ }
}
}
}
}
-}
+}
\ No newline at end of file
diff --git a/apps/hand-factory/uni_modules/uni-load-more/changelog.md b/apps/hand-factory/uni_modules/uni-load-more/changelog.md
index 667abdb..c5750ac 100644
--- a/apps/hand-factory/uni_modules/uni-load-more/changelog.md
+++ b/apps/hand-factory/uni_modules/uni-load-more/changelog.md
@@ -1,9 +1,7 @@
+## 1.3.7(2025-08-20)
+- 修复 微信小程序css警告问题
## 1.3.6(2024-10-15)
- 修复 微信小程序中的getSystemInfo警告
-## 1.3.5(2024-10-12)
-- 修复 微信小程序中的getSystemInfo警告
-## 1.3.4(2024-10-12)
-- 修复 微信小程序中的getSystemInfo警告
## 1.3.3(2022-01-20)
- 新增 showText属性 ,是否显示文本
## 1.3.2(2022-01-19)
diff --git a/apps/hand-factory/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue b/apps/hand-factory/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue
index a203417..0fa17e8 100644
--- a/apps/hand-factory/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue
+++ b/apps/hand-factory/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue
@@ -26,7 +26,7 @@
-
+