From 7b0dbecd1d6155d26ec67be0a47a16264c738c85 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 09 五月 2023 14:48:10 +0800
Subject: [PATCH] 2023-05-09
---
src/menu/components/share/markcomponent/index.jsx | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/src/menu/components/share/markcomponent/index.jsx b/src/menu/components/share/markcomponent/index.jsx
index 50c608f..c188601 100644
--- a/src/menu/components/share/markcomponent/index.jsx
+++ b/src/menu/components/share/markcomponent/index.jsx
@@ -9,7 +9,6 @@
import MarkForm from './markform'
import MkIcon from '@/components/mk-icon'
import { minkeIconSystem } from '@/utils/option.js'
-import '@/assets/css/table.scss'
import './index.scss'
const EditTable = asyncComponent(() => import('@/templates/zshare/editTable'))
@@ -35,6 +34,15 @@
editable: true,
inputType: 'cascader',
options: [],
+ rules: [{
+ validator: (rule, value, callback) => {
+ if (value[1] === 'dynamic' && value[0] === value[2]) {
+ callback('瀵规瘮瀛楁涓嶅彲鐩稿悓锛�')
+ } else {
+ callback()
+ }
+ }
+ }],
render: text => {
return (
<div>{text[0]} VS {text[2] ? text[2] : '闈欐�佸��'}</div>
@@ -144,10 +152,7 @@
_columns.unshift({field: '$Index', label: '搴忓彿'})
let options = _columns.map(col => {
- let label = col.label
- if (col.label.toLowerCase() !== col.field.toLowerCase()) {
- label += `锛�${col.field}锛塦
- }
+ let label = `${col.field}锛�${col.label}锛塦
return {
value: col.field,
label: label,
@@ -161,10 +166,7 @@
value: 'dynamic',
label: '鍔ㄦ�佸��',
children: _columns.map(cell => {
- let _label = cell.label
- if (cell.label.toLowerCase() !== cell.field.toLowerCase()) {
- _label += `锛�${cell.field}锛塦
- }
+ let _label = `${cell.field}锛�${cell.label}锛塦
return {
value: cell.field,
label: _label
@@ -272,6 +274,9 @@
if (item.signType && item.signType[0] === 'icon') {
item.signType = [item.signType[0] + item.signType[1], item.signType[2], item.signType[3]]
}
+ if (!item.uuid) {
+ item.uuid = Utils.getuuid()
+ }
return item
})
--
Gitblit v1.8.0