bluish/cangku
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

编辑款式下拉框修复

Browse Source
This commit is contained in:
liangweihao
2025-12-23 12:35:07 +08:00
parent 033a1acef3
commit 58605b1f92
7 changed files with 399 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

459
garment_dialogs.py
View File

@@ -41,14 +41,22 @@ class SearchableComboBox(QComboBox):
def addItem(self, text, userData=None):
"""添加选项"""
# 临时断开信号连接，防止textChanged触发on_text_changed
self.lineEdit().textChanged.disconnect()
try:
self.lineEdit().textChanged.disconnect()
except TypeError:
# 信号未连接或已被断开，忽略错误
pass
super().addItem(text, userData)
if text not in self.all_items:
self.all_items.append(text)
self.all_data.append(userData)
self.update_completer()
# 重新连接信号
self.lineEdit().textChanged.connect(self.on_text_changed)
try:
self.lineEdit().textChanged.connect(self.on_text_changed)
except:
# 如果连接失败，忽略错误
pass
def addItems(self, texts):
"""批量添加选项"""
@@ -66,14 +74,25 @@ class SearchableComboBox(QComboBox):
def reset_items(self):
"""重置所有选项"""
# 临时断开信号连接，防止textChanged触发on_text_changed
self.lineEdit().textChanged.disconnect()
try:
self.lineEdit().textChanged.disconnect()
except TypeError:
# 信号未连接或已被断开，忽略错误
pass
self.is_filtering = True
super().clear()
for i, item in enumerate(self.all_items):
super().addItem(item, self.all_data[i] if i < len(self.all_data) else None)
self.is_filtering = False
# 重新连接信号
self.lineEdit().textChanged.connect(self.on_text_changed)
try:
self.lineEdit().textChanged.connect(self.on_text_changed)
except:
# 如果连接失败，忽略错误
pass
# # 确保当前索引设置为0（第一项）
# if self.count() > 0:
# super().setCurrentIndex(0)
def update_completer(self):
"""更新自动完成列表"""
@@ -111,6 +130,22 @@ class SearchableComboBox(QComboBox):
if filtered_items and self.hasFocus():
self.showPopup()
def setDefaultText(self, text):
"""设置默认文本"""
# 临时断开信号连接，防止textChanged触发on_text_changed
try:
self.lineEdit().textChanged.disconnect()
except TypeError:
# 信号未连接或已被断开，忽略错误
pass
self.lineEdit().setText(text)
self.update_completer()
# 重新连接信号
try:
self.lineEdit().textChanged.connect(self.on_text_changed)
except:
# 如果连接失败，忽略错误
pass
class GarmentLibraryDialog(QDialog):
"""服装库管理对话框"""
@@ -355,40 +390,12 @@ class GarmentEditDialog(QDialog):
"""加载材料列表"""
try:
with self.get_conn() as conn:
cursor = conn.execute("SELECT category, fabric_type, usage_per_piece, unit FROM garment_materials WHERE style_number = ? ORDER BY id", (self.style_number,))
for category, fabric_type, usage, unit in cursor.fetchall():
display_category = ""
display_type = ""
display_model = ""
# category字段可能存储型号或类目-类型组合
if category:
# 首先检查是否是型号（在fabrics表中查找）
fabric_cursor = conn.execute("SELECT category, model FROM fabrics WHERE model = ?", (category,))
fabric_row = fabric_cursor.fetchone()
if fabric_row:
# 是型号，从fabrics表获取类目信息
fabric_category, model = fabric_row
display_model = model
if fabric_category and "-" in fabric_category:
parts = fabric_category.split("-", 1)
display_category = parts[0]
display_type = parts[1]
else:
display_category = fabric_category or ""
else:
# 不是型号，按类目-类型格式解析
if "-" in category:
parts = category.split("-", 1)
display_category = parts[0]
display_type = parts[1]
else:
display_category = category
# 如果有单独的fabric_type字段，优先使用
if fabric_type:
display_type = fabric_type
cursor = conn.execute("SELECT category, fabric_type, model, usage_per_piece, unit FROM garment_materials WHERE style_number = ? ORDER BY id", (self.style_number,))
for category, fabric_type, model, usage, unit in cursor.fetchall():
# 直接使用数据库中的三个字段
display_category = category or ""
display_type = fabric_type or ""
display_model = model or ""
self.add_material_row(display_category, display_type, usage or 0, unit or "米", display_model)
except Exception as e:
@@ -408,32 +415,24 @@ class GarmentEditDialog(QDialog):
# 列0: 类目下拉框
cat_combo = QComboBox()
cat_combo.setEditable(True)
cat_combo.setEditable(False)
# 最后添加自定义选项
cat_combo.addItem("—— 自定义类目 ——")
# 先添加所有类目选项
try:
with self.get_conn() as conn:
# 只获取纯类目（提取"-"前面的部分）
cursor = conn.execute("""
SELECT DISTINCT
CASE
WHEN category LIKE '%-%' THEN SUBSTR(category, 1, INSTR(category, '-') - 1)
ELSE category
END as major_category
SELECT DISTINCT category
FROM fabrics
WHERE category IS NOT NULL AND category != ''
ORDER BY major_category
ORDER BY category
""")
categories = set()
for cat_row in cursor.fetchall():
if cat_row[0] and cat_row[0].strip():
categories.add(cat_row[0])
# 添加默认类目
categories.update(["布料", "辅料", "其他"])
for cat in sorted(categories):
cat_combo.addItem(cat)
except:
@@ -445,53 +444,57 @@ class GarmentEditDialog(QDialog):
if category:
cat_combo.setCurrentText(category)
else:
# 如果没有指定类目，默认选择第一个实际类目而不是"自定义类目"
if cat_combo.count() > 1:
cat_combo.setCurrentIndex(0)
# 如果没有指定类目，默认选择"—— 自定义类目 ——"（索引0）
print("没有指定类目，默认选择'—— 自定义类目 ——'（索引0）")
print(cat_combo.count())
print(cat_combo.currentIndex())
# 打印所有选项
for i in range(cat_combo.count()):
print(cat_combo.itemText(i))
cat_combo.setCurrentIndex(0)
cat_combo.currentTextChanged.connect(lambda text, r=row: self.on_category_changed(text, r))
self.material_table.setCellWidget(row, 0, cat_combo)
# 列1: 类型下拉框
type_combo = QComboBox()
type_combo.setEditable(True)
type_combo.setEditable(False)
# 最后添加选择提示
type_combo.addItem("—— 选择类型 ——")
# 先添加所有类型选项
try:
with self.get_conn() as conn:
cursor = conn.execute("""
SELECT DISTINCT
CASE
WHEN category LIKE '%-%' THEN SUBSTR(category, INSTR(category, '-') + 1)
ELSE '默认类型'
END as fabric_type
SELECT DISTINCT fabric_type
FROM fabrics
WHERE category IS NOT NULL AND category != ''
WHERE fabric_type IS NOT NULL AND fabric_type != ''
ORDER BY fabric_type
""")
types = cursor.fetchall()
for type_row in types:
if type_row[0] and type_row[0] != '默认类型':
if type_row[0] and type_row[0].strip():
type_combo.addItem(type_row[0])
except:
pass
# 最后添加选择提示
type_combo.addItem("—— 选择类型 ——")
if fabric_type:
type_combo.setCurrentText(fabric_type)
else:
# 如果没有指定类型，默认选择第一个实际类型而不是"选择类型"
if type_combo.count() > 1:
type_combo.setCurrentIndex(0)
# 如果没有指定类型，默认选择"—— 选择类型 ——"（索引0）
print("没有指定类型，默认选择'—— 选择类型 ——'（索引0）")
print(type_combo.count())
print(type_combo.currentIndex())
# 打印所有选项
for i in range(type_combo.count()):
print(type_combo.itemText(i))
type_combo.setCurrentIndex(0)
type_combo.currentTextChanged.connect(lambda text, r=row: self.on_type_changed(text, r))
self.material_table.setCellWidget(row, 1, type_combo)
# 列2: 型号下拉框（支持模糊搜索）
model_combo = SearchableComboBox()
# 列2: 型号下拉框
model_combo = QComboBox()
model_combo.setEditable(False)
model_combo.addItem("—— 选择型号 ——")
# 初始化时加载所有型号
@@ -513,10 +516,18 @@ class GarmentEditDialog(QDialog):
except Exception as e:
pass
# 确保默认选中第一项（"—— 选择型号 ——"）
model_combo.setCurrentIndex(0)
model_combo.currentTextChanged.connect(lambda text, r=row: self.on_model_selected(text, r))
if fabric_type:
model_combo.setCurrentText(fabric_type)
else:
# 如果没有指定类型，默认选择"—— 选择类型 ——"（索引0）
print("没有指定类型，默认选择'—— 选择类型 ——'（索引0）")
print(model_combo.count())
print(model_combo.currentIndex())
# 打印所有选项
for i in range(model_combo.count()):
print(model_combo.itemText(i))
model_combo.setCurrentIndex(0)
self.material_table.setCellWidget(row, 2, model_combo)
# 列3: 单件用量
@@ -539,38 +550,37 @@ class GarmentEditDialog(QDialog):
self.material_table.setCellWidget(row, 5, del_btn)
# 初始化类型和型号选项
self.on_category_changed(cat_combo.currentText(), row)
# self.on_category_changed(cat_combo.currentText(), row)
# 如果没有选择具体类目，初始化时显示全部型号
if cat_combo.currentText() == "—— 自定义类目 ——":
self.on_type_changed("—— 选择类型 ——", row)
# if cat_combo.currentText() == "—— 自定义类目 ——":
# self.on_type_changed("—— 选择类型 ——", row)
# 如果有指定的型号，需要在初始化完成后设置
if model:
# 先设置类型（如果有的话）
if fabric_type:
type_combo.setCurrentText(fabric_type)
self.on_type_changed(fabric_type, row)
# if model:
# # 先设置类型（如果有的话）
# if fabric_type:
# type_combo.setCurrentText(fabric_type)
# self.on_type_changed(fabric_type, row)
# 然后设置型号 - 使用SearchableComboBox的setCurrentText方法
model_combo = self.material_table.cellWidget(row, 2)
if isinstance(model_combo, SearchableComboBox):
# 确保型号在选项列表中
found = False
for i in range(model_combo.count()):
item_data = model_combo.itemData(i)
item_text = model_combo.itemText(i)
if item_data == model or item_text == model:
model_combo.setCurrentIndex(i)
found = True
break
# 如果没找到，直接设置文本（SearchableComboBox支持）
if not found:
model_combo.setCurrentText(model)
# # 然后设置型号
# model_combo = self.material_table.cellWidget(row, 2)
# if model_combo:
# # 确保型号在选项列表中
# found = False
# for i in range(model_combo.count()):
# item_data = model_combo.itemData(i)
# item_text = model_combo.itemText(i)
# if item_data == model or item_text == model:
# model_combo.setCurrentIndex(i)
# found = True
# break
cat_combo.currentTextChanged.connect(lambda text, r=row: self.on_category_changed(text, r))
type_combo.currentTextChanged.connect(lambda text, r=row: self.on_type_changed(text, r))
model_combo.currentTextChanged.connect(lambda text, r=row: self.on_model_selected(text, r))
def on_category_changed(self, category_text, row):
"""当类目改变时，更新类型下拉框"""
print("on_category_changed", category_text, row)
type_combo = self.material_table.cellWidget(row, 1)
model_combo = self.material_table.cellWidget(row, 2)
@@ -578,51 +588,55 @@ class GarmentEditDialog(QDialog):
type_combo.clear()
type_combo.addItem("—— 选择类型 ——")
# 重新初始化型号下拉框，显示所有型号
# 重新初始化型号下拉框，显示所有型号（阻止信号防止触发on_model_selected）
model_combo.blockSignals(True)
model_combo.clear()
model_combo.addItem("—— 选择型号 ——")
try:
with self.get_conn() as conn:
# 加载所有类型
cursor = conn.execute("""
SELECT DISTINCT
CASE
WHEN category LIKE '%-%' THEN SUBSTR(category, INSTR(category, '-') + 1)
ELSE '默认类型'
END as fabric_type
FROM fabrics
WHERE category IS NOT NULL AND category != ''
ORDER BY fabric_type
""")
# 如果选择了具体类目，则过滤
if category_text and category_text != "—— 自定义类目 ——":
# 如果选择了具体类目，则过滤
cursor = conn.execute("""
SELECT DISTINCT
CASE
WHEN category LIKE '%-%' THEN SUBSTR(category, INSTR(category, '-') + 1)
ELSE '默认类型'
END as fabric_type
SELECT DISTINCT fabric_type
FROM fabrics
WHERE category LIKE ? OR category = ?
WHERE category = ? AND fabric_type IS NOT NULL AND fabric_type != ''
ORDER BY fabric_type
""", (f"{category_text}-%", category_text))
""", (category_text,))
else:
# 加载所有类型
cursor = conn.execute("""
SELECT DISTINCT fabric_type
FROM fabrics
WHERE fabric_type IS NOT NULL AND fabric_type != ''
ORDER BY fabric_type
""")
types = cursor.fetchall()
for type_row in types:
if type_row[0] and type_row[0] != '默认类型':
if type_row[0] and type_row[0].strip():
type_combo.addItem(type_row[0])
# 连接类型改变事件
type_combo.currentTextChanged.connect(lambda text, r=row: self.on_type_changed(text, r))
# 加载所有型号到型号下拉框
cursor = conn.execute("""
SELECT DISTINCT model, color, unit
FROM fabrics
ORDER BY model
""")
# 加载该类目下的所有型号到型号下拉框
if category_text and category_text != "—— 自定义类目 ——":
# 如果选择了具体类目，则只加载该类目下的型号
cursor = conn.execute("""
SELECT DISTINCT model, color, unit
FROM fabrics
WHERE category = ?
ORDER BY model
""", (category_text,))
else:
# 如果是自定义类目，加载所有型号
cursor = conn.execute("""
SELECT DISTINCT model, color, unit
FROM fabrics
ORDER BY model
""")
models = cursor.fetchall()
for model_row in models:
model, color, unit = model_row
@@ -636,25 +650,89 @@ class GarmentEditDialog(QDialog):
model_combo.setCurrentIndex(0)
except Exception as e:
pass
finally:
# 恢复信号
model_combo.blockSignals(False)
def on_type_changed(self, type_text, row):
"""当类型改变时，更新型号下拉框"""
"""当类型改变时，更新类目和型号下拉框"""
print("on_type_changed", type_text, row)
cat_combo = self.material_table.cellWidget(row, 0)
model_combo = self.material_table.cellWidget(row, 2)
# 重新初始化型号下拉框，显示所有型号
if hasattr(model_combo, 'clear'):
model_combo.clear()
if not model_combo:
return
# 如果选择了具体类型，自动选中该类型对应的类目
if cat_combo and type_text and type_text != "—— 选择类型 ——":
try:
with self.get_conn() as conn:
# 查询该类型对应的类目
cursor = conn.execute("""
SELECT DISTINCT category
FROM fabrics
WHERE fabric_type = ? AND category IS NOT NULL AND category != ''
ORDER BY category
LIMIT 1
""", (type_text,))
row = cursor.fetchone()
if row and row[0]:
category = row[0].strip()
# 在类目下拉框中查找并选中该类目
index = cat_combo.findText(category)
if index >= 0:
cat_combo.blockSignals(True)
cat_combo.setCurrentIndex(index)
cat_combo.blockSignals(False)
except Exception as e:
pass
# 重新初始化型号下拉框，显示该类型下的所有型号
model_combo.blockSignals(True)
model_combo.clear()
model_combo.addItem("—— 选择型号 ——")
# 始终显示所有型号，不进行过滤
# 根据类型和类目过滤型号
try:
with self.get_conn() as conn:
cursor = conn.execute("""
SELECT DISTINCT model, color, unit
FROM fabrics
ORDER BY model
""")
# 获取当前选择的类目（可能已经更新）
category_text = cat_combo.currentText() if cat_combo else ""
# 构建查询条件
if type_text and type_text != "—— 选择类型 ——":
# 如果选择了具体类型
if category_text and category_text != "—— 自定义类目 ——":
# 同时根据类目和类型过滤
cursor = conn.execute("""
SELECT DISTINCT model, color, unit
FROM fabrics
WHERE category = ? AND fabric_type = ?
ORDER BY model
""", (category_text, type_text))
else:
# 只根据类型过滤
cursor = conn.execute("""
SELECT DISTINCT model, color, unit
FROM fabrics
WHERE fabric_type = ?
ORDER BY model
""", (type_text,))
else:
# 如果没有选择类型，根据类目过滤（如果有类目）
if category_text and category_text != "—— 自定义类目 ——":
cursor = conn.execute("""
SELECT DISTINCT model, color, unit
FROM fabrics
WHERE category = ?
ORDER BY model
""", (category_text,))
else:
# 显示所有型号
cursor = conn.execute("""
SELECT DISTINCT model, color, unit
FROM fabrics
ORDER BY model
""")
models = cursor.fetchall()
for model_row in models:
model, color, unit = model_row
@@ -663,22 +741,55 @@ class GarmentEditDialog(QDialog):
if color and color.strip():
display_text = f"{model}-{color}"
model_combo.addItem(display_text, model)
# 确保默认选中第一项（"—— 选择型号 ——"）
model_combo.setCurrentIndex(0)
except Exception as e:
pass
# 确保默认选中第一项（"—— 选择型号 ——"）
model_combo.setCurrentIndex(0)
model_combo.blockSignals(False)
def on_model_selected(self, model_text, row):
"""当型号选择时，自动设置单位并填充类目和类型"""
if not model_text or model_text == "—— 选择型号 ——":
return
print("on_model_selected", model_text, row)
# 先获取所有需要的控件
cat_combo = self.material_table.cellWidget(row, 0)
type_combo = self.material_table.cellWidget(row, 1)
model_combo = self.material_table.cellWidget(row, 2)
unit_combo = self.material_table.cellWidget(row, 4)
if not model_text or model_text == "—— 选择型号 ——":
# 获取当前类目和类型下的所有型号，阻止信号防止死循环
model_combo.blockSignals(True)
try:
model_combo.clear()
model_combo.addItem("—— 选择型号 ——")
try:
with self.get_conn() as conn:
if cat_combo.currentText() != "—— 自定义类目 ——" and type_combo.currentText() != "—— 选择类型 ——":
cursor = conn.execute("SELECT DISTINCT model, color, unit FROM fabrics WHERE category = ? AND fabric_type = ? ORDER BY model", (cat_combo.currentText(), type_combo.currentText()))
elif cat_combo.currentText() != "—— 自定义类目 ——" and type_combo.currentText() == "—— 选择类型 ——":
cursor = conn.execute("SELECT DISTINCT model, color, unit FROM fabrics WHERE category = ? ORDER BY model", (cat_combo.currentText(),))
else:
cursor = conn.execute("SELECT DISTINCT model, color, unit FROM fabrics ORDER BY model")
models = cursor.fetchall()
for model_row in models:
model, color, unit = model_row
# 显示格式：型号-颜色（如果有颜色的话）
display_text = model
if color and color.strip():
display_text = f"{model}-{color}"
model_combo.addItem(display_text, model)
except Exception as e:
pass
model_combo.setCurrentIndex(0)
finally:
# 恢复信号
model_combo.blockSignals(False)
return
# 获取选中项的数据
current_index = model_combo.currentIndex()
if current_index > 0:
@@ -686,36 +797,48 @@ class GarmentEditDialog(QDialog):
if model:
try:
with self.get_conn() as conn:
cursor = conn.execute("SELECT category, unit FROM fabrics WHERE model = ?", (model,))
cursor = conn.execute("SELECT category, fabric_type, unit FROM fabrics WHERE model = ?", (model,))
row_db = cursor.fetchone()
if row_db:
category, unit = row_db
category, fabric_type, unit = row_db
# 自动填充单位
if unit:
unit_combo.setCurrentText(unit)
# 自动填充类目和类型
# 自动填充类目和类型，阻止信号以避免触发默认更新逻辑
if category:
# 解析类目信息，可能是"类目-类型"格式或单独的类目
if '-' in category:
parts = category.split('-', 1)
cat_text = parts[0]
type_text = parts[1] if len(parts) > 1 else ""
# 设置类目
cat_combo.setCurrentText(cat_text)
# 更新类型下拉框选项
self.on_category_changed(cat_text, row)
# 设置类型
if type_text:
type_combo.setCurrentText(type_text)
else:
# 只有类目，没有类型
cat_combo.setCurrentText(category)
self.on_category_changed(category, row)
# 阻止类目、类型和型号的信号，避免触发默认更新逻辑
cat_combo.blockSignals(True)
type_combo.blockSignals(True)
model_combo.blockSignals(True)
# 设置类目
cat_combo.setCurrentText(category)
# 更新类型下拉框选项（直接调用，不会触发信号因为已经阻止了）
self.on_category_changed(category, row)
# 重新阻止信号（因为on_category_changed在finally中恢复了信号）
# 这可以防止死循环
model_combo.blockSignals(True)
# 重新设置选中的型号（因为on_category_changed会清空并重新加载型号下拉框）
# 查找并选中对应的型号
for i in range(model_combo.count()):
item_data = model_combo.itemData(i)
if item_data == model:
model_combo.setCurrentIndex(i)
break
# 设置类型
if fabric_type:
type_combo.setCurrentText(fabric_type)
# 恢复信号
cat_combo.blockSignals(False)
type_combo.blockSignals(False)
model_combo.blockSignals(False)
except:
pass
@@ -764,11 +887,9 @@ class GarmentEditDialog(QDialog):
usage = usage_widget.value()
unit = unit_widget.currentText().strip() or "米"
# 分别存储类目、类型和型号信息
material_identifier = final_model if final_model else (f"{category}-{fabric_type}" if fabric_type else category)
conn.execute("INSERT INTO garment_materials (style_number, category, fabric_type, usage_per_piece, unit) VALUES (?, ?, ?, ?, ?)",
(style_number, material_identifier, fabric_type, usage, unit))
# 分别存储类目、类型和型号到对应字段
conn.execute("INSERT INTO garment_materials (style_number, category, fabric_type, model, usage_per_piece, unit) VALUES (?, ?, ?, ?, ?, ?)",
(style_number, category, fabric_type, final_model, usage, unit))
conn.commit()
QMessageBox.information(self, "成功", "保存完成")