From f0554d1503f94241f0715b9730d24a793e73c1ad Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 18 一月 2021 18:42:29 +0800
Subject: [PATCH] 2021-01-18
---
src/tabviews/zshare/mutilform/index.jsx | 7 ++++---
src/menu/components/table/normal-table/columns/editColumn/index.jsx | 2 +-
src/tabviews/custom/components/share/normalTable/index.jsx | 4 ++--
src/tabviews/zshare/normalTable/index.jsx | 4 ++--
src/templates/sharecomponent/columncomponent/columnform/index.jsx | 2 +-
5 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/menu/components/table/normal-table/columns/editColumn/index.jsx b/src/menu/components/table/normal-table/columns/editColumn/index.jsx
index 6725e03..4d355d9 100644
--- a/src/menu/components/table/normal-table/columns/editColumn/index.jsx
+++ b/src/menu/components/table/normal-table/columns/editColumn/index.jsx
@@ -9,7 +9,7 @@
const columnTypeOptions = {
text: ['label', 'field', 'type', 'Align', 'Hide', 'IsSort', 'Width', 'prefix', 'postfix', 'textFormat', 'blacklist', 'perspective', 'rowspan'],
- number: ['label', 'field', 'type', 'Align', 'Hide', 'IsSort', 'Width', 'decimal', 'format', 'prefix', 'postfix', 'blacklist', 'perspective', 'sum'],
+ number: ['label', 'field', 'type', 'Align', 'Hide', 'IsSort', 'Width', 'decimal', 'format', 'prefix', 'postfix', 'blacklist', 'perspective', 'sum', 'rowspan'],
link: ['label', 'field', 'type', 'Align', 'Hide', 'IsSort', 'joint', 'Width', 'blacklist', 'nameField'],
textarea: ['label', 'field', 'type', 'Align', 'Hide', 'IsSort', 'Width', 'prefix', 'postfix', 'blacklist'],
picture: ['label', 'field', 'type', 'Align', 'Hide', 'IsSort', 'Width', 'blacklist', 'scale', 'lenWidRadio', 'picSort'],
diff --git a/src/tabviews/custom/components/share/normalTable/index.jsx b/src/tabviews/custom/components/share/normalTable/index.jsx
index e75297d..7e30033 100644
--- a/src/tabviews/custom/components/share/normalTable/index.jsx
+++ b/src/tabviews/custom/components/share/normalTable/index.jsx
@@ -689,13 +689,13 @@
let preItem = data[index - 1]
rowspans.forEach((cell, i) => {
if (i === 0) {
- if ((item[cell] || item[cell] === 0) && preItem[cell] === item[cell]) {
+ if (preItem[cell] === item[cell]) {
item['$' + cell] = preItem['$' + cell] + 1
} else {
item['$' + cell] = 1
}
} else {
- if ((item[cell] || item[cell] === 0) && preItem[cell] === item[cell]) {
+ if (preItem[cell] === item[cell]) {
item['$' + cell] = preItem['$' + cell] + 1
} else {
item['$' + cell] = 1
diff --git a/src/tabviews/zshare/mutilform/index.jsx b/src/tabviews/zshare/mutilform/index.jsx
index 9f9e96c..d7c2ba4 100644
--- a/src/tabviews/zshare/mutilform/index.jsx
+++ b/src/tabviews/zshare/mutilform/index.jsx
@@ -9,6 +9,7 @@
import { formRule } from '@/utils/option.js'
import Utils from '@/utils/utils.js'
import asyncComponent from '@/utils/asyncComponent'
+import asyncSpinComponent from '@/utils/asyncSpinComponent'
import './index.scss'
const { MonthPicker } = DatePicker
@@ -18,7 +19,7 @@
const CustomTextArea = asyncComponent(() => import('./customTextArea'))
const FileUpload = asyncComponent(() => import('../fileupload'))
const ColorSketch = asyncComponent(() => import('@/mob/colorsketch'))
-const Editor = asyncComponent(() => import('@/components/editor'))
+const Editor = asyncSpinComponent(() => import('@/components/editor'))
class MainSearch extends Component {
static propTpyes = {
@@ -1178,11 +1179,11 @@
fields.push(
<Col span={24} key={index}>
- <Form.Item label={item.tooltip ?
+ <Form.Item label={item.hidelabel !== 'true' && item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
<Icon type="question-circle" />
{item.label}
- </Tooltip> : item.label
+ </Tooltip> : (item.hidelabel !== 'true' ? item.label : '')
}>
{getFieldDecorator(item.field, {
initialValue: item.initval || '',
diff --git a/src/tabviews/zshare/normalTable/index.jsx b/src/tabviews/zshare/normalTable/index.jsx
index 0d1e6dd..11db080 100644
--- a/src/tabviews/zshare/normalTable/index.jsx
+++ b/src/tabviews/zshare/normalTable/index.jsx
@@ -998,13 +998,13 @@
let preItem = data[index - 1]
rowspans.forEach((cell, i) => {
if (i === 0) {
- if ((item[cell] || item[cell] === 0) && preItem[cell] === item[cell]) {
+ if (preItem[cell] === item[cell]) {
item['$' + cell] = preItem['$' + cell] + 1
} else {
item['$' + cell] = 1
}
} else {
- if ((item[cell] || item[cell] === 0) && preItem[cell] === item[cell]) {
+ if (preItem[cell] === item[cell]) {
item['$' + cell] = preItem['$' + cell] + 1
} else {
item['$' + cell] = 1
diff --git a/src/templates/sharecomponent/columncomponent/columnform/index.jsx b/src/templates/sharecomponent/columncomponent/columnform/index.jsx
index 71f3e5a..a955bd2 100644
--- a/src/templates/sharecomponent/columncomponent/columnform/index.jsx
+++ b/src/templates/sharecomponent/columncomponent/columnform/index.jsx
@@ -7,7 +7,7 @@
const columnTypeOptions = {
text: ['label', 'field', 'type', 'Align', 'Hide', 'IsSort', 'Width', 'prefix', 'postfix', 'textFormat', 'fieldlength', 'blacklist', 'perspective', 'rowspan'],
- number: ['label', 'field', 'type', 'Align', 'Hide', 'IsSort', 'Width', 'decimal', 'format', 'prefix', 'postfix', 'blacklist', 'perspective', 'sum'],
+ number: ['label', 'field', 'type', 'Align', 'Hide', 'IsSort', 'Width', 'decimal', 'format', 'prefix', 'postfix', 'blacklist', 'perspective', 'sum', 'rowspan'],
link: ['label', 'field', 'type', 'nameField', 'Align', 'Hide', 'IsSort', 'joint', 'Width', 'fieldlength', 'blacklist'],
textarea: ['label', 'field', 'type', 'Align', 'Hide', 'IsSort', 'Width', 'prefix', 'postfix', 'fieldlength', 'blacklist'],
picture: ['label', 'field', 'type', 'Align', 'Hide', 'IsSort', 'Width', 'fieldlength', 'blacklist', 'scale', 'maxHeight']
--
Gitblit v1.8.0