From 3c5205d857446563b3f89ae7432d76ba6d945a69 Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期五, 12 九月 2025 18:17:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/utils/util.js | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/src/utils/util.js b/src/utils/util.js
index bf4f48f..e1de3d4 100644
--- a/src/utils/util.js
+++ b/src/utils/util.js
@@ -106,7 +106,7 @@
for (let item of data) {
let component = "";
if(item.component.indexOf("layouts")>=0){
- component = "components/"+item.component;
+ component = "components/"+item.component.trim();
}else{
component = "views/"+item.component;
}
@@ -512,7 +512,31 @@
}
return [target].concat(getParents(target), window)
}
-
+/**
+ * 閲嶅鍊奸獙璇佸伐鍏锋柟娉�
+ *
+ * 浣跨敤绀轰緥锛�
+ * { validator: (rule, value, callback) => validateDuplicateValue('sys_fill_rule', 'rule_code', value, this.model.id, callback) }
+ *
+ * @param tableName 琚獙璇佺殑琛ㄥ悕
+ * @param fieldName 琚獙璇佺殑瀛楁鍚�
+ * @param fieldVal 琚獙璇佺殑鍊�
+ * @param dataId 鏁版嵁ID锛屽彲绌�
+ * @param delFlag 鍒犻櫎鏍囪
+ * @param callback
+ */
+export function validateDuplicateValueInDelFlag(tableName, fieldName, fieldVal, dataId, delFlag, callback) {
+ if (fieldVal) {
+ let params = { tableName, fieldName, fieldVal, dataId, delFlag }
+ api.duplicateCheck(params).then(res => {
+ res['success'] ? callback() : callback(res['message'])
+ }).catch(err => {
+ callback(err.message || err)
+ })
+ } else {
+ callback()
+ }
+}
/**
* 鏍规嵁缁勪欢鍚嶈幏鍙栫埗绾�
* @param vm
--
Gitblit v1.9.3