From b81197ba316fe41d2ac9785625980288c86c93bc Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 06 十一月 2024 12:01:45 +0800
Subject: [PATCH] 2024-11-06
---
src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx | 2 +-
src/templates/sharecomponent/fieldscomponent/index.jsx | 2 +-
src/templates/sharecomponent/columncomponent/dragcolumn/index.jsx | 2 +-
src/menu/components/table/base-table/index.jsx | 4 ++--
src/templates/sharecomponent/columncomponent/formconfig.jsx | 2 +-
src/menu/components/table/normal-table/index.jsx | 4 ++--
src/menu/components/table/normal-table/columns/index.jsx | 2 +-
src/menu/components/table/edit-table/index.jsx | 4 ++--
src/menu/components/table/base-table/columns/editColumn/formconfig.jsx | 2 +-
src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx | 2 +-
10 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/menu/components/table/base-table/columns/editColumn/formconfig.jsx b/src/menu/components/table/base-table/columns/editColumn/formconfig.jsx
index 9c10aac..560835c 100644
--- a/src/menu/components/table/base-table/columns/editColumn/formconfig.jsx
+++ b/src/menu/components/table/base-table/columns/editColumn/formconfig.jsx
@@ -139,7 +139,7 @@
type: 'radio',
key: 'IsSort',
label: '鎺掑簭',
- initVal: card.IsSort || (card.isSub || card.type === 'custom' ? 'false' : 'true'),
+ initVal: card.IsSort || 'false',
required: true,
options: [{
value: 'true',
diff --git a/src/menu/components/table/base-table/index.jsx b/src/menu/components/table/base-table/index.jsx
index 4b4394e..f3983ea 100644
--- a/src/menu/components/table/base-table/index.jsx
+++ b/src/menu/components/table/base-table/index.jsx
@@ -60,8 +60,8 @@
columns: [],
cols: [
{ origin: true, uuid: Utils.getuuid(), Align: 'left', label: 'label1', field: '', Hide: 'false', type: 'text', Width: 120 },
- { origin: true, uuid: Utils.getuuid(), Align: 'left', label: 'label2', field: '', Hide: 'false', IsSort: 'true', type: 'text', Width: 120 },
- { origin: true, uuid: Utils.getuuid(), Align: 'left', label: 'label3', field: '', Hide: 'false', IsSort: 'true', type: 'text', Width: 120 },
+ { origin: true, uuid: Utils.getuuid(), Align: 'left', label: 'label2', field: '', Hide: 'false', IsSort: 'false', type: 'text', Width: 120 },
+ { origin: true, uuid: Utils.getuuid(), Align: 'left', label: 'label3', field: '', Hide: 'false', IsSort: 'false', type: 'text', Width: 120 },
],
scripts: [],
isNew: true
diff --git a/src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx b/src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx
index b0b999e..aed839c 100644
--- a/src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx
+++ b/src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx
@@ -158,7 +158,7 @@
type: 'radio',
key: 'IsSort',
label: '鎺掑簭',
- initVal: card.IsSort || (card.isSub || card.type === 'custom' ? 'false' : 'true'),
+ initVal: card.IsSort || 'false',
required: true,
options: [{
value: 'true',
diff --git a/src/menu/components/table/edit-table/index.jsx b/src/menu/components/table/edit-table/index.jsx
index 3e92baf..0e5e8d8 100644
--- a/src/menu/components/table/edit-table/index.jsx
+++ b/src/menu/components/table/edit-table/index.jsx
@@ -57,8 +57,8 @@
columns: [],
cols: [
{ origin: true, uuid: Utils.getuuid(), Align: 'left', label: 'label1', field: '', Hide: 'false', type: 'text', Width: 120 },
- { origin: true, uuid: Utils.getuuid(), Align: 'left', label: 'label2', field: '', Hide: 'false', IsSort: 'true', type: 'text', Width: 120 },
- { origin: true, uuid: Utils.getuuid(), Align: 'left', label: 'label3', field: '', Hide: 'false', IsSort: 'true', type: 'text', Width: 120 },
+ { origin: true, uuid: Utils.getuuid(), Align: 'left', label: 'label2', field: '', Hide: 'false', IsSort: 'false', type: 'text', Width: 120 },
+ { origin: true, uuid: Utils.getuuid(), Align: 'left', label: 'label3', field: '', Hide: 'false', IsSort: 'false', type: 'text', Width: 120 },
],
scripts: [],
submit: {intertype: 'system', default: 'true', innerFunc: '', execSuccess: 'grid', execError: 'never', scripts: [], uniques: []},
diff --git a/src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx b/src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx
index e5c2d75..5204751 100644
--- a/src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx
+++ b/src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx
@@ -138,7 +138,7 @@
type: 'radio',
key: 'IsSort',
label: '鎺掑簭',
- initVal: card.IsSort || (card.isSub || card.type === 'custom' ? 'false' : 'true'),
+ initVal: card.IsSort || 'false',
required: true,
options: [{
value: 'true',
diff --git a/src/menu/components/table/normal-table/columns/index.jsx b/src/menu/components/table/normal-table/columns/index.jsx
index e6af839..1035dc6 100644
--- a/src/menu/components/table/normal-table/columns/index.jsx
+++ b/src/menu/components/table/normal-table/columns/index.jsx
@@ -579,7 +579,7 @@
fields.forEach(item => {
if (keys.includes(item.field)) return
- let cell = { uuid: Utils.getuuid(), label: item.label, field: item.field, Align: 'left', Hide: 'false', IsSort: 'true', Width: 120, blacklist: [], postfix: '', prefix: '', linkmenu: [], marks: [], perspective: 'linkmenu' }
+ let cell = { uuid: Utils.getuuid(), label: item.label, field: item.field, Align: 'left', Hide: 'false', IsSort: 'false', Width: 120, blacklist: [], postfix: '', prefix: '', linkmenu: [], marks: [], perspective: 'linkmenu' }
if (/Nvarchar|date/ig.test(item.datatype)) {
cell.type = 'text'
diff --git a/src/menu/components/table/normal-table/index.jsx b/src/menu/components/table/normal-table/index.jsx
index d53420d..ba1fc03 100644
--- a/src/menu/components/table/normal-table/index.jsx
+++ b/src/menu/components/table/normal-table/index.jsx
@@ -66,8 +66,8 @@
columns: [],
cols: [
{ origin: true, uuid: Utils.getuuid(), Align: 'left', label: 'label1', field: '', Hide: 'false', type: 'text', Width: 120 },
- { origin: true, uuid: Utils.getuuid(), Align: 'left', label: 'label2', field: '', Hide: 'false', IsSort: 'true', type: 'text', Width: 120 },
- { origin: true, uuid: Utils.getuuid(), Align: 'left', label: 'label3', field: '', Hide: 'false', IsSort: 'true', type: 'text', Width: 120 },
+ { origin: true, uuid: Utils.getuuid(), Align: 'left', label: 'label2', field: '', Hide: 'false', IsSort: 'false', type: 'text', Width: 120 },
+ { origin: true, uuid: Utils.getuuid(), Align: 'left', label: 'label3', field: '', Hide: 'false', IsSort: 'false', type: 'text', Width: 120 },
],
scripts: [],
isNew: true
diff --git a/src/templates/sharecomponent/columncomponent/dragcolumn/index.jsx b/src/templates/sharecomponent/columncomponent/dragcolumn/index.jsx
index 267c6c4..bb981ed 100644
--- a/src/templates/sharecomponent/columncomponent/dragcolumn/index.jsx
+++ b/src/templates/sharecomponent/columncomponent/dragcolumn/index.jsx
@@ -62,7 +62,7 @@
newcard.field = ''
newcard.Hide = 'false'
newcard.contrastType = 'static'
- newcard.IsSort = 'true'
+ newcard.IsSort = 'false'
newcard.type = item.subType
newcard.Width = item.subType === 'number' ? 80 : 120
if (item.subType === 'colspan') {
diff --git a/src/templates/sharecomponent/columncomponent/formconfig.jsx b/src/templates/sharecomponent/columncomponent/formconfig.jsx
index ff5fb94..aa2d8c6 100644
--- a/src/templates/sharecomponent/columncomponent/formconfig.jsx
+++ b/src/templates/sharecomponent/columncomponent/formconfig.jsx
@@ -114,7 +114,7 @@
type: 'radio',
key: 'IsSort',
label: '鎺掑簭',
- initVal: card.IsSort || 'true',
+ initVal: card.IsSort || 'false',
required: true,
options: [{
value: 'true',
diff --git a/src/templates/sharecomponent/fieldscomponent/index.jsx b/src/templates/sharecomponent/fieldscomponent/index.jsx
index 550b5f6..9db6d1e 100644
--- a/src/templates/sharecomponent/fieldscomponent/index.jsx
+++ b/src/templates/sharecomponent/fieldscomponent/index.jsx
@@ -244,7 +244,7 @@
label: item.label,
field: item.field,
Hide: 'false',
- IsSort: 'true',
+ IsSort: 'false',
type: item.type === 'number' ? 'number' : 'text',
Width: item.type === 'number' ? 80 : 120
}
--
Gitblit v1.8.0