From aaee2aa047e856141dce84c5d3f1cd16d9a00dcd Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 18 三月 2020 15:10:16 +0800
Subject: [PATCH] 2020-03-18
---
src/templates/zshare/modalform/index.jsx | 2
src/templates/zshare/editcard/index.jsx | 0
src/tabviews/verupmanage/topSearch/index.scss | 0
src/tabviews/zshare/excelin/index.scss | 0
src/templates/zshare/dragelement/index.scss | 0
src/tabviews/verupmanage/actionList/index.jsx | 2
src/tabviews/tabmanage/index.scss | 3
src/tabviews/zshare/mutilform/index.scss | 0
src/templates/zshare/verifycard/customscript/index.jsx | 0
src/tabviews/verupmanage/index.scss | 0
src/templates/modalconfig/index.jsx | 4
src/templates/zshare/verifycardexcelin/index.scss | 0
src/templates/zshare/tabdragelement/index.jsx | 0
src/tabviews/commontable/index.jsx | 10 +-
src/templates/zshare/tabdragelement/index.scss | 0
src/templates/zshare/verifycard/voucherform/index.scss | 0
src/tabviews/verupmanage/actionList/index.scss | 0
src/templates/zshare/verifycard/customform/index.scss | 0
src/tabviews/zshare/excelin/index.jsx | 0
src/templates/zshare/verifycard/uniqueform/index.jsx | 0
src/templates/subtableconfig/index.jsx | 28 +++---
src/templates/zshare/verifycard/uniqueform/index.scss | 0
src/tabviews/zshare/mutilform/index.jsx | 0
src/templates/zshare/exceleditable/index.jsx | 0
src/templates/zshare/verifycardexcelin/columnform/index.jsx | 0
src/templates/zshare/modalform/index.scss | 0
src/templates/zshare/dragelement/source.jsx | 0
src/tabviews/zshare/fileupload/index.scss | 0
src/templates/zshare/verifycardexcelout/index.scss | 0
src/templates/zshare/verifycard/contrastform/index.scss | 0
src/views/login/loginform.jsx | 2
src/templates/zshare/gridbtnform/index.scss | 0
src/templates/zshare/searcheditable/index.scss | 0
src/tabviews/formtab/formgroup/index.jsx | 2
src/tabviews/verupmanage/subtabtable/index.jsx | 2
src/tabviews/zshare/topSearch/index.jsx | 0
src/templates/comtableconfig/index.jsx | 34 ++++----
src/templates/zshare/verifycardexcelin/index.jsx | 0
src/templates/zshare/verifycard/billcodeform/index.jsx | 0
src/templates/zshare/editcard/index.scss | 0
src/tabviews/zshare/actionList/index.jsx | 2
src/tabviews/zshare/topSearch/index.scss | 0
src/tabviews/subtable/index.jsx | 6
src/templates/zshare/modaleditable/index.jsx | 1
src/templates/zshare/verifycard/index.scss | 0
src/templates/zshare/searchform/index.jsx | 2
src/templates/zshare/tabform/index.scss | 0
src/templates/zshare/searchform/index.scss | 0
src/templates/zshare/verifycardexcelout/columnform/index.scss | 0
src/tabviews/zshare/verifycard/index.scss | 0
src/tabviews/managetable/index.jsx | 6
src/templates/zshare/columnform/index.jsx | 0
src/templates/zshare/tabform/index.jsx | 0
src/tabviews/tabmanage/config.js | 4 +
src/templates/zshare/exceleditable/index.scss | 0
src/templates/zshare/verifycardprint/index.jsx | 0
src/templates/zshare/gridbtnform/index.jsx | 0
src/views/login/index.jsx | 6 -
src/templates/zshare/transferform/index.scss | 0
src/tabviews/zshare/verifycard/actionform/index.scss | 0
src/tabviews/zshare/normalTable/index.jsx | 0
src/templates/zshare/dragelform/index.scss | 0
src/templates/zshare/pasteform/index.scss | 0
src/templates/zshare/dragelement/card.jsx | 0
src/templates/zshare/menuform/index.jsx | 0
src/templates/zshare/verifycard/contrastform/index.jsx | 0
src/templates/zshare/dragelform/itemtypes.js | 0
src/tabviews/subtabtable/index.jsx | 6
src/templates/zshare/verifycard/voucherform/index.jsx | 0
src/templates/zshare/columnform/index.scss | 0
src/templates/zshare/verifycard/billcodeform/index.scss | 0
src/tabviews/verupmanage/subtabtable/index.scss | 0
src/templates/zshare/formconfig.js | 0
src/templates/zshare/colspanform/index.jsx | 0
src/templates/zshare/verifycardexcelin/customscript/index.scss | 0
src/templates/zshare/pasteform/index.jsx | 0
src/templates/zshare/verifycard/customscript/index.scss | 0
src/tabviews/verupmanage/config.js | 0
src/tabviews/verupmanage/index.jsx | 2
src/templates/zshare/colspanform/index.scss | 0
src/tabviews/zshare/normalTable/index.scss | 0
src/templates/zshare/modaleditable/index.scss | 0
src/components/tabview/index.jsx | 5 +
src/tabviews/zshare/actionList/index.scss | 0
src/templates/zshare/verifycardexcelout/columnform/index.jsx | 0
src/templates/zshare/transferform/index.jsx | 0
src/templates/zshare/verifycardexcelout/index.jsx | 0
src/templates/formtabconfig/index.jsx | 18 ++--
src/tabviews/verupmanage/topSearch/index.jsx | 0
src/templates/zshare/verifycard/customform/index.jsx | 0
src/templates/zshare/verifycardexcelin/columnform/index.scss | 0
src/templates/zshare/createfunc/index.jsx | 0
src/templates/zshare/dragelement/index.jsx | 0
src/templates/zshare/verifycardprint/index.scss | 0
src/templates/zshare/verifycard/index.jsx | 0
src/templates/zshare/menuform/index.scss | 0
src/templates/zshare/tabdragelement/card.jsx | 0
src/tabviews/zshare/verifycard/actionform/index.jsx | 0
src/templates/zshare/verifycardexcelin/customscript/index.jsx | 0
src/tabviews/zshare/verifycard/index.jsx | 0
src/templates/zshare/dragelform/card.jsx | 0
src/templates/zshare/dragelement/itemtypes.js | 0
src/tabviews/tabmanage/index.jsx | 57 ++++++++++++++
src/templates/zshare/dragelform/source.jsx | 0
src/tabviews/zshare/fileupload/index.jsx | 0
src/templates/zshare/dragelform/index.jsx | 0
src/components/sidemenu/config.js | 8 ++
src/templates/zshare/searcheditable/index.jsx | 5
src/templates/zshare/createfunc/index.scss | 0
109 files changed, 142 insertions(+), 75 deletions(-)
diff --git a/src/components/sidemenu/config.js b/src/components/sidemenu/config.js
index 81313ef..0184093 100644
--- a/src/components/sidemenu/config.js
+++ b/src/components/sidemenu/config.js
@@ -38,6 +38,14 @@
text: '鐗堟湰鍗囩骇'
}, {
src: '',
+ PageParam: {OpenType: 'newtab', Template: 'TabManage'},
+ type: 'TabManage',
+ MenuID: 'TabManageView',
+ MenuNo: 'TabManage',
+ MenuName: '鏍囩椤电鐞�',
+ text: '鏍囩椤电鐞�'
+ }, {
+ src: '',
PageParam: {OpenType: 'newtab', Template: 'ManageTable'},
type: 'ManageTable',
MenuID: '1578900109100np8aqd0a77q3na46oas',
diff --git a/src/components/tabview/index.jsx b/src/components/tabview/index.jsx
index bd3e1f4..b71ddb9 100644
--- a/src/components/tabview/index.jsx
+++ b/src/components/tabview/index.jsx
@@ -18,7 +18,8 @@
const Home = asyncComponent(() => import('@/tabviews/home'))
const CommonTable = asyncComponent(() => import('@/tabviews/commontable'))
-const VerupTable = asyncComponent(() => import('@/tabviews/verup'))
+const VerupTable = asyncComponent(() => import('@/tabviews/verupmanage'))
+const TabManage = asyncComponent(() => import('@/tabviews/tabmanage'))
const ManageTable = asyncComponent(() => import('@/tabviews/managetable'))
const Iframe = asyncComponent(() => import('@/tabviews/iframe'))
const DataManage = asyncComponent(() => import('@/tabviews/datamanage'))
@@ -102,6 +103,8 @@
return (<CommonTable MenuNo={view.MenuNo} MenuID={view.MenuID} MenuName={view.MenuName} key={view.MenuID}/>)
} else if (view.type === 'VerupTable') {
return (<VerupTable MenuNo={view.MenuNo} MenuID={view.MenuID} MenuName={view.MenuName} key={view.MenuID}/>)
+ } else if (view.type === 'TabManage') {
+ return (<TabManage MenuNo={view.MenuNo} MenuID={view.MenuID} MenuName={view.MenuName} key={view.MenuID}/>)
} else if (view.type === 'ManageTable') {
return (<ManageTable MenuNo={view.MenuNo} MenuID={view.MenuID} MenuName={view.MenuName} key={view.MenuID}/>)
} else if (view.type === 'DataManage') {
diff --git a/src/tabviews/commontable/index.jsx b/src/tabviews/commontable/index.jsx
index 921a207..0c235d6 100644
--- a/src/tabviews/commontable/index.jsx
+++ b/src/tabviews/commontable/index.jsx
@@ -9,18 +9,16 @@
import zhCN from '@/locales/zh-CN/main.js'
import enUS from '@/locales/en-US/main.js'
import Utils from '@/utils/utils.js'
-// import asyncComponent from '@/utils/asyncComponent'
import asyncLoadComponent from '@/utils/asyncLoadComponent'
import {refreshTabView, modifyTabview} from '@/store/action'
-import MainTable from '@/tabviews/tableshare/normalTable'
-import MainAction from '@/tabviews/tableshare/actionList'
-import VerifyCard from '@/tabviews/tableshare/verifycard'
-import MainSearch from '@/tabviews/tableshare/topSearch'
+import MainTable from '@/tabviews/zshare/normalTable'
+import MainAction from '@/tabviews/zshare/actionList'
+import VerifyCard from '@/tabviews/zshare/verifycard'
+import MainSearch from '@/tabviews/zshare/topSearch'
import NotFount from '@/components/404'
import './index.scss'
-// const MainAction = asyncComponent(() => import('@/tabviews/tableshare/actionList'))
const SubTable = asyncLoadComponent(() => import('@/tabviews/subtable'))
const SubTabTable = asyncLoadComponent(() => import('@/tabviews/subtabtable'))
const FormTab = asyncLoadComponent(() => import('@/tabviews/formtab'))
diff --git a/src/tabviews/formtab/formgroup/index.jsx b/src/tabviews/formtab/formgroup/index.jsx
index 920e390..3b359ac 100644
--- a/src/tabviews/formtab/formgroup/index.jsx
+++ b/src/tabviews/formtab/formgroup/index.jsx
@@ -5,7 +5,7 @@
import moment from 'moment'
import { formRule } from '@/utils/option.js'
import Utils from '@/utils/utils.js'
-import FileUpload from '@/tabviews/tableshare/fileupload'
+import FileUpload from '@/tabviews/zshare/fileupload'
import './index.scss'
const {MonthPicker} = DatePicker
diff --git a/src/tabviews/managetable/index.jsx b/src/tabviews/managetable/index.jsx
index 4616ada..86ec7d4 100644
--- a/src/tabviews/managetable/index.jsx
+++ b/src/tabviews/managetable/index.jsx
@@ -14,9 +14,9 @@
import asyncLoadComponent from '@/utils/asyncLoadComponent'
import {refreshTabView, modifyTabview} from '@/store/action'
-import MainTable from '@/tabviews/tableshare/normalTable'
-import MainAction from '@/tabviews/tableshare/actionList'
-import MainSearch from '@/tabviews/tableshare/topSearch'
+import MainTable from '@/tabviews/zshare/normalTable'
+import MainAction from '@/tabviews/zshare/actionList'
+import MainSearch from '@/tabviews/zshare/topSearch'
import NotFount from '@/components/404'
import './index.scss'
diff --git a/src/tabviews/subtable/index.jsx b/src/tabviews/subtable/index.jsx
index 438b4f2..01af628 100644
--- a/src/tabviews/subtable/index.jsx
+++ b/src/tabviews/subtable/index.jsx
@@ -11,9 +11,9 @@
import Utils from '@/utils/utils.js'
import options from '@/store/options.js'
-import SubTable from '@/tabviews/tableshare/normalTable'
-import SubAction from '@/tabviews/tableshare/actionList'
-import SubSearch from '@/tabviews/tableshare/topSearch'
+import SubTable from '@/tabviews/zshare/normalTable'
+import SubAction from '@/tabviews/zshare/actionList'
+import SubSearch from '@/tabviews/zshare/topSearch'
import asyncLoadComponent from '@/utils/asyncLoadComponent'
import NotFount from '@/components/404'
diff --git a/src/tabviews/subtabtable/index.jsx b/src/tabviews/subtabtable/index.jsx
index b57a970..f63a9ca 100644
--- a/src/tabviews/subtabtable/index.jsx
+++ b/src/tabviews/subtabtable/index.jsx
@@ -11,9 +11,9 @@
import Utils from '@/utils/utils.js'
import options from '@/store/options.js'
-import SubTable from '@/tabviews/tableshare/normalTable'
-import SubAction from '@/tabviews/tableshare/actionList'
-import SubSearch from '@/tabviews/tableshare/topSearch'
+import SubTable from '@/tabviews/zshare/normalTable'
+import SubAction from '@/tabviews/zshare/actionList'
+import SubSearch from '@/tabviews/zshare/topSearch'
import NotFount from '@/components/404'
import './index.scss'
diff --git a/src/tabviews/tabmanage/config.js b/src/tabviews/tabmanage/config.js
new file mode 100644
index 0000000..adffbdc
--- /dev/null
+++ b/src/tabviews/tabmanage/config.js
@@ -0,0 +1,4 @@
+// 鐗堟湰鍗囩骇椤甸潰閰嶇疆
+export const verupMainTable = {
+
+}
diff --git a/src/tabviews/tabmanage/index.jsx b/src/tabviews/tabmanage/index.jsx
new file mode 100644
index 0000000..654ac7c
--- /dev/null
+++ b/src/tabviews/tabmanage/index.jsx
@@ -0,0 +1,57 @@
+import React, {Component} from 'react'
+import PropTypes from 'prop-types'
+import { is, fromJS } from 'immutable'
+// import { notification, Tabs, Icon, Switch } from 'antd'
+// import moment from 'moment'
+
+// import Api from '@/api'
+import zhCN from '@/locales/zh-CN/main.js'
+import enUS from '@/locales/en-US/main.js'
+import Utils from '@/utils/utils.js'
+// import options from '@/store/options.js'
+// import { verupMainTable } from './config.js'
+
+import './index.scss'
+
+class TabManage extends Component {
+ static propTpyes = {
+ MenuNo: PropTypes.string, // 鑿滃崟鍙傛暟
+ MenuName: PropTypes.string, // 鑿滃崟鍙傛暟
+ MenuID: PropTypes.string // 鑿滃崟Id
+ }
+
+ state = {
+ dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
+ ContainerId: Utils.getuuid() // 鑿滃崟澶栧眰html Id
+ }
+
+
+ UNSAFE_componentWillMount () {
+
+ }
+
+ shouldComponentUpdate (nextProps, nextState) {
+ return !is(fromJS(this.props), fromJS(nextProps)) || !is(fromJS(this.state), fromJS(nextState))
+ }
+
+ /**
+ * @description 缁勪欢閿�姣侊紝娓呴櫎state鏇存柊
+ */
+ componentWillUnmount () {
+ this.setState = () => {
+ return
+ }
+ }
+
+ render() {
+ // const { } = this.state
+
+ return (
+ <div className="tab-manage" id={this.state.ContainerId}>
+
+ </div>
+ )
+ }
+}
+
+export default TabManage
\ No newline at end of file
diff --git a/src/tabviews/tabmanage/index.scss b/src/tabviews/tabmanage/index.scss
new file mode 100644
index 0000000..14df55a
--- /dev/null
+++ b/src/tabviews/tabmanage/index.scss
@@ -0,0 +1,3 @@
+.tab-manage {
+
+}
diff --git a/src/tabviews/verup/actionList/index.jsx b/src/tabviews/verupmanage/actionList/index.jsx
similarity index 99%
rename from src/tabviews/verup/actionList/index.jsx
rename to src/tabviews/verupmanage/actionList/index.jsx
index 010b7cb..a6e4fdf 100644
--- a/src/tabviews/verup/actionList/index.jsx
+++ b/src/tabviews/verupmanage/actionList/index.jsx
@@ -2,7 +2,7 @@
import PropTypes from 'prop-types'
import moment from 'moment'
import { Button, Modal, notification, message } from 'antd'
-import MutilForm from '@/tabviews/tableshare/mutilform'
+import MutilForm from '@/tabviews/zshare/mutilform'
import Utils from '@/utils/utils.js'
import options from '@/store/options.js'
import Api from '@/api'
diff --git a/src/tabviews/verup/actionList/index.scss b/src/tabviews/verupmanage/actionList/index.scss
similarity index 100%
rename from src/tabviews/verup/actionList/index.scss
rename to src/tabviews/verupmanage/actionList/index.scss
diff --git a/src/tabviews/verup/config.js b/src/tabviews/verupmanage/config.js
similarity index 100%
rename from src/tabviews/verup/config.js
rename to src/tabviews/verupmanage/config.js
diff --git a/src/tabviews/verup/index.jsx b/src/tabviews/verupmanage/index.jsx
similarity index 99%
rename from src/tabviews/verup/index.jsx
rename to src/tabviews/verupmanage/index.jsx
index 56fec4c..54c6ea7 100644
--- a/src/tabviews/verup/index.jsx
+++ b/src/tabviews/verupmanage/index.jsx
@@ -12,7 +12,7 @@
import asyncLoadComponent from '@/utils/asyncLoadComponent'
import { verupMainTable, buttonConfig } from './config.js'
-import MainTable from '@/tabviews/tableshare/normalTable'
+import MainTable from '@/tabviews/zshare/normalTable'
import TopSearch from './topSearch'
import MainAction from './actionList'
import './index.scss'
diff --git a/src/tabviews/verup/index.scss b/src/tabviews/verupmanage/index.scss
similarity index 100%
rename from src/tabviews/verup/index.scss
rename to src/tabviews/verupmanage/index.scss
diff --git a/src/tabviews/verup/subtabtable/index.jsx b/src/tabviews/verupmanage/subtabtable/index.jsx
similarity index 99%
rename from src/tabviews/verup/subtabtable/index.jsx
rename to src/tabviews/verupmanage/subtabtable/index.jsx
index 55ab976..fb03998 100644
--- a/src/tabviews/verup/subtabtable/index.jsx
+++ b/src/tabviews/verupmanage/subtabtable/index.jsx
@@ -11,7 +11,7 @@
import options from '@/store/options.js'
import { buttonConfig, tabConfig } from '../config.js'
-import SubTable from '@/tabviews/tableshare/normalTable'
+import SubTable from '@/tabviews/zshare/normalTable'
import SubAction from '../actionList'
import SubSearch from '../topSearch'
diff --git a/src/tabviews/verup/subtabtable/index.scss b/src/tabviews/verupmanage/subtabtable/index.scss
similarity index 100%
rename from src/tabviews/verup/subtabtable/index.scss
rename to src/tabviews/verupmanage/subtabtable/index.scss
diff --git a/src/tabviews/verup/topSearch/index.jsx b/src/tabviews/verupmanage/topSearch/index.jsx
similarity index 100%
rename from src/tabviews/verup/topSearch/index.jsx
rename to src/tabviews/verupmanage/topSearch/index.jsx
diff --git a/src/tabviews/verup/topSearch/index.scss b/src/tabviews/verupmanage/topSearch/index.scss
similarity index 100%
rename from src/tabviews/verup/topSearch/index.scss
rename to src/tabviews/verupmanage/topSearch/index.scss
diff --git a/src/tabviews/tableshare/actionList/index.jsx b/src/tabviews/zshare/actionList/index.jsx
similarity index 99%
rename from src/tabviews/tableshare/actionList/index.jsx
rename to src/tabviews/zshare/actionList/index.jsx
index 5bccc5f..d8f3716 100644
--- a/src/tabviews/tableshare/actionList/index.jsx
+++ b/src/tabviews/zshare/actionList/index.jsx
@@ -3,7 +3,7 @@
import moment from 'moment'
import { Button, Affix, Modal, notification, Spin, message } from 'antd'
import * as XLSX from 'xlsx'
-import MutilForm from '@/tabviews/tableshare/mutilform'
+import MutilForm from '@/tabviews/zshare/mutilform'
import ExcelIn from '../excelin'
import Utils from '@/utils/utils.js'
import options from '@/store/options.js'
diff --git a/src/tabviews/tableshare/actionList/index.scss b/src/tabviews/zshare/actionList/index.scss
similarity index 100%
rename from src/tabviews/tableshare/actionList/index.scss
rename to src/tabviews/zshare/actionList/index.scss
diff --git a/src/tabviews/tableshare/excelin/index.jsx b/src/tabviews/zshare/excelin/index.jsx
similarity index 100%
rename from src/tabviews/tableshare/excelin/index.jsx
rename to src/tabviews/zshare/excelin/index.jsx
diff --git a/src/tabviews/tableshare/excelin/index.scss b/src/tabviews/zshare/excelin/index.scss
similarity index 100%
rename from src/tabviews/tableshare/excelin/index.scss
rename to src/tabviews/zshare/excelin/index.scss
diff --git a/src/tabviews/tableshare/fileupload/index.jsx b/src/tabviews/zshare/fileupload/index.jsx
similarity index 100%
rename from src/tabviews/tableshare/fileupload/index.jsx
rename to src/tabviews/zshare/fileupload/index.jsx
diff --git a/src/tabviews/tableshare/fileupload/index.scss b/src/tabviews/zshare/fileupload/index.scss
similarity index 100%
rename from src/tabviews/tableshare/fileupload/index.scss
rename to src/tabviews/zshare/fileupload/index.scss
diff --git a/src/tabviews/tableshare/mutilform/index.jsx b/src/tabviews/zshare/mutilform/index.jsx
similarity index 100%
rename from src/tabviews/tableshare/mutilform/index.jsx
rename to src/tabviews/zshare/mutilform/index.jsx
diff --git a/src/tabviews/tableshare/mutilform/index.scss b/src/tabviews/zshare/mutilform/index.scss
similarity index 100%
rename from src/tabviews/tableshare/mutilform/index.scss
rename to src/tabviews/zshare/mutilform/index.scss
diff --git a/src/tabviews/tableshare/normalTable/index.jsx b/src/tabviews/zshare/normalTable/index.jsx
similarity index 100%
rename from src/tabviews/tableshare/normalTable/index.jsx
rename to src/tabviews/zshare/normalTable/index.jsx
diff --git a/src/tabviews/tableshare/normalTable/index.scss b/src/tabviews/zshare/normalTable/index.scss
similarity index 100%
rename from src/tabviews/tableshare/normalTable/index.scss
rename to src/tabviews/zshare/normalTable/index.scss
diff --git a/src/tabviews/tableshare/topSearch/index.jsx b/src/tabviews/zshare/topSearch/index.jsx
similarity index 100%
rename from src/tabviews/tableshare/topSearch/index.jsx
rename to src/tabviews/zshare/topSearch/index.jsx
diff --git a/src/tabviews/tableshare/topSearch/index.scss b/src/tabviews/zshare/topSearch/index.scss
similarity index 100%
rename from src/tabviews/tableshare/topSearch/index.scss
rename to src/tabviews/zshare/topSearch/index.scss
diff --git a/src/tabviews/tableshare/verifycard/actionform/index.jsx b/src/tabviews/zshare/verifycard/actionform/index.jsx
similarity index 100%
rename from src/tabviews/tableshare/verifycard/actionform/index.jsx
rename to src/tabviews/zshare/verifycard/actionform/index.jsx
diff --git a/src/tabviews/tableshare/verifycard/actionform/index.scss b/src/tabviews/zshare/verifycard/actionform/index.scss
similarity index 100%
rename from src/tabviews/tableshare/verifycard/actionform/index.scss
rename to src/tabviews/zshare/verifycard/actionform/index.scss
diff --git a/src/tabviews/tableshare/verifycard/index.jsx b/src/tabviews/zshare/verifycard/index.jsx
similarity index 100%
rename from src/tabviews/tableshare/verifycard/index.jsx
rename to src/tabviews/zshare/verifycard/index.jsx
diff --git a/src/tabviews/tableshare/verifycard/index.scss b/src/tabviews/zshare/verifycard/index.scss
similarity index 100%
rename from src/tabviews/tableshare/verifycard/index.scss
rename to src/tabviews/zshare/verifycard/index.scss
diff --git a/src/templates/comtableconfig/index.jsx b/src/templates/comtableconfig/index.jsx
index 84aa18d..00f4fe6 100644
--- a/src/templates/comtableconfig/index.jsx
+++ b/src/templates/comtableconfig/index.jsx
@@ -11,28 +11,28 @@
import Utils from '@/utils/utils.js'
import zhCN from '@/locales/zh-CN/comtable.js'
import enUS from '@/locales/en-US/comtable.js'
-import { getSearchForm, getActionForm, getColumnForm } from '@/templates/tableshare/formconfig'
+import { getSearchForm, getActionForm, getColumnForm } from '@/templates/zshare/formconfig'
import { queryTableSql } from '@/utils/option.js'
import ActionForm from './actionform'
import SettingForm from './settingform'
-import TabForm from '@/templates/tableshare/tabform'
-import SearchForm from '@/templates/tableshare/searchform'
-import ColumnForm from '@/templates/tableshare/columnform'
-import PasteForm from '@/templates/tableshare/pasteform'
-import DragElement from '@/templates/tableshare/dragelement'
-import ColspanForm from '@/templates/tableshare/colspanform'
-import GridBtnForm from '@/templates/tableshare/gridbtnform'
-import EditCard from '@/templates/tableshare/editcard'
-import VerifyCard from '@/templates/tableshare/verifycard'
-import VerifyCardExcelIn from '@/templates/tableshare/verifycardexcelin'
-import VerifyCardExcelOut from '@/templates/tableshare/verifycardexcelout'
-import VerifyCardPrint from '@/templates/tableshare/verifycardprint'
-import MenuForm from '@/templates/tableshare/menuform'
-import TabDragElement from '@/templates/tableshare/tabdragelement'
+import TabForm from '@/templates/zshare/tabform'
+import SearchForm from '@/templates/zshare/searchform'
+import ColumnForm from '@/templates/zshare/columnform'
+import PasteForm from '@/templates/zshare/pasteform'
+import DragElement from '@/templates/zshare/dragelement'
+import ColspanForm from '@/templates/zshare/colspanform'
+import GridBtnForm from '@/templates/zshare/gridbtnform'
+import EditCard from '@/templates/zshare/editcard'
+import VerifyCard from '@/templates/zshare/verifycard'
+import VerifyCardExcelIn from '@/templates/zshare/verifycardexcelin'
+import VerifyCardExcelOut from '@/templates/zshare/verifycardexcelout'
+import VerifyCardPrint from '@/templates/zshare/verifycardprint'
+import MenuForm from '@/templates/zshare/menuform'
+import TabDragElement from '@/templates/zshare/tabdragelement'
import TransferForm from '@/components/transferform'
-import SourceElement from '@/templates/tableshare/dragelement/source'
-import CreateFunc from '@/templates/tableshare/createfunc'
+import SourceElement from '@/templates/zshare/dragelement/source'
+import CreateFunc from '@/templates/zshare/createfunc'
import Source from './source'
import './index.scss'
diff --git a/src/templates/formtabconfig/index.jsx b/src/templates/formtabconfig/index.jsx
index a8bfb38..42bf32c 100644
--- a/src/templates/formtabconfig/index.jsx
+++ b/src/templates/formtabconfig/index.jsx
@@ -11,21 +11,21 @@
import zhCN from '@/locales/zh-CN/comtable.js'
import enUS from '@/locales/en-US/comtable.js'
import Utils from '@/utils/utils.js'
-import { getModalForm, getActionForm } from '@/templates/tableshare/formconfig'
+import { getModalForm, getActionForm } from '@/templates/zshare/formconfig'
import { queryTableSql } from '@/utils/option.js'
-import ModalForm from '@/templates/ushare/modalform'
+import ModalForm from '@/templates/zshare/modalform'
import ActionForm from './actionform'
import SettingForm from './settingform'
import DragElement from './dragelement'
import GroupForm from './groupform'
-import TabForm from '@/templates/tableshare/tabform'
-import EditCard from '@/templates/tableshare/editcard'
-import VerifyCard from '@/templates/tableshare/verifycard'
-import MenuForm from '@/templates/tableshare/menuform'
-import TabDragElement from '@/templates/tableshare/tabdragelement'
-import SourceElement from '@/templates/tableshare/dragelement/source'
-import CreateFunc from '@/templates/tableshare/createfunc'
+import TabForm from '@/templates/zshare/tabform'
+import EditCard from '@/templates/zshare/editcard'
+import VerifyCard from '@/templates/zshare/verifycard'
+import MenuForm from '@/templates/zshare/menuform'
+import TabDragElement from '@/templates/zshare/tabdragelement'
+import SourceElement from '@/templates/zshare/dragelement/source'
+import CreateFunc from '@/templates/zshare/createfunc'
import Source from './source'
import './index.scss'
diff --git a/src/templates/modalconfig/index.jsx b/src/templates/modalconfig/index.jsx
index 586a09a..32f5fe2 100644
--- a/src/templates/modalconfig/index.jsx
+++ b/src/templates/modalconfig/index.jsx
@@ -10,10 +10,10 @@
import zhCN from '@/locales/zh-CN/comtable.js'
import Utils from '@/utils/utils.js'
import enUS from '@/locales/en-US/comtable.js'
-import { getModalForm } from '@/templates/tableshare/formconfig'
+import { getModalForm } from '@/templates/zshare/formconfig'
import { queryTableSql } from '@/utils/option.js'
-import ModalForm from '@/templates/ushare/modalform'
+import ModalForm from '@/templates/zshare/modalform'
import DragElement from './dragelement'
import SourceElement from './dragelement/source'
import SettingForm from './settingform'
diff --git a/src/templates/subtableconfig/index.jsx b/src/templates/subtableconfig/index.jsx
index edf4641..01b4f4b 100644
--- a/src/templates/subtableconfig/index.jsx
+++ b/src/templates/subtableconfig/index.jsx
@@ -11,25 +11,25 @@
import zhCN from '@/locales/zh-CN/comtable.js'
import enUS from '@/locales/en-US/comtable.js'
import Utils from '@/utils/utils.js'
-import { getSearchForm, getActionForm, getColumnForm } from '@/templates/tableshare/formconfig'
+import { getSearchForm, getActionForm, getColumnForm } from '@/templates/zshare/formconfig'
import { queryTableSql } from '@/utils/option.js'
import ActionForm from './actionform'
import SettingForm from './settingform'
-import SearchForm from '@/templates/tableshare/searchform'
-import ColumnForm from '@/templates/tableshare/columnform'
-import DragElement from '@/templates/tableshare/dragelement'
-import PasteForm from '@/templates/tableshare/pasteform'
-import ColspanForm from '@/templates/tableshare/colspanform'
-import GridBtnForm from '@/templates/tableshare/gridbtnform'
-import EditCard from '@/templates/tableshare/editcard'
-import VerifyCard from '@/templates/tableshare/verifycard'
-import VerifyCardExcelIn from '@/templates/tableshare/verifycardexcelin'
-import VerifyCardExcelOut from '@/templates/tableshare/verifycardexcelout'
-import MenuForm from '@/templates/tableshare/menuform'
+import SearchForm from '@/templates/zshare/searchform'
+import ColumnForm from '@/templates/zshare/columnform'
+import DragElement from '@/templates/zshare/dragelement'
+import PasteForm from '@/templates/zshare/pasteform'
+import ColspanForm from '@/templates/zshare/colspanform'
+import GridBtnForm from '@/templates/zshare/gridbtnform'
+import EditCard from '@/templates/zshare/editcard'
+import VerifyCard from '@/templates/zshare/verifycard'
+import VerifyCardExcelIn from '@/templates/zshare/verifycardexcelin'
+import VerifyCardExcelOut from '@/templates/zshare/verifycardexcelout'
+import MenuForm from '@/templates/zshare/menuform'
import TransferForm from '@/components/transferform'
-import SourceElement from '@/templates/tableshare/dragelement/source'
-import CreateFunc from '@/templates/tableshare/createfunc'
+import SourceElement from '@/templates/zshare/dragelement/source'
+import CreateFunc from '@/templates/zshare/createfunc'
import Source from './source'
import './index.scss'
diff --git a/src/templates/tableshare/colspanform/index.jsx b/src/templates/zshare/colspanform/index.jsx
similarity index 100%
rename from src/templates/tableshare/colspanform/index.jsx
rename to src/templates/zshare/colspanform/index.jsx
diff --git a/src/templates/tableshare/colspanform/index.scss b/src/templates/zshare/colspanform/index.scss
similarity index 100%
rename from src/templates/tableshare/colspanform/index.scss
rename to src/templates/zshare/colspanform/index.scss
diff --git a/src/templates/tableshare/columnform/index.jsx b/src/templates/zshare/columnform/index.jsx
similarity index 100%
rename from src/templates/tableshare/columnform/index.jsx
rename to src/templates/zshare/columnform/index.jsx
diff --git a/src/templates/tableshare/columnform/index.scss b/src/templates/zshare/columnform/index.scss
similarity index 100%
rename from src/templates/tableshare/columnform/index.scss
rename to src/templates/zshare/columnform/index.scss
diff --git a/src/templates/tableshare/createfunc/index.jsx b/src/templates/zshare/createfunc/index.jsx
similarity index 100%
rename from src/templates/tableshare/createfunc/index.jsx
rename to src/templates/zshare/createfunc/index.jsx
diff --git a/src/templates/tableshare/createfunc/index.scss b/src/templates/zshare/createfunc/index.scss
similarity index 100%
rename from src/templates/tableshare/createfunc/index.scss
rename to src/templates/zshare/createfunc/index.scss
diff --git a/src/templates/tableshare/dragelement/card.jsx b/src/templates/zshare/dragelement/card.jsx
similarity index 100%
rename from src/templates/tableshare/dragelement/card.jsx
rename to src/templates/zshare/dragelement/card.jsx
diff --git a/src/templates/tableshare/dragelement/index.jsx b/src/templates/zshare/dragelement/index.jsx
similarity index 100%
rename from src/templates/tableshare/dragelement/index.jsx
rename to src/templates/zshare/dragelement/index.jsx
diff --git a/src/templates/tableshare/dragelement/index.scss b/src/templates/zshare/dragelement/index.scss
similarity index 100%
rename from src/templates/tableshare/dragelement/index.scss
rename to src/templates/zshare/dragelement/index.scss
diff --git a/src/templates/tableshare/dragelement/itemtypes.js b/src/templates/zshare/dragelement/itemtypes.js
similarity index 100%
rename from src/templates/tableshare/dragelement/itemtypes.js
rename to src/templates/zshare/dragelement/itemtypes.js
diff --git a/src/templates/tableshare/dragelement/source.jsx b/src/templates/zshare/dragelement/source.jsx
similarity index 100%
rename from src/templates/tableshare/dragelement/source.jsx
rename to src/templates/zshare/dragelement/source.jsx
diff --git a/src/templates/tableshare/dragelform/card.jsx b/src/templates/zshare/dragelform/card.jsx
similarity index 100%
rename from src/templates/tableshare/dragelform/card.jsx
rename to src/templates/zshare/dragelform/card.jsx
diff --git a/src/templates/tableshare/dragelform/index.jsx b/src/templates/zshare/dragelform/index.jsx
similarity index 100%
rename from src/templates/tableshare/dragelform/index.jsx
rename to src/templates/zshare/dragelform/index.jsx
diff --git a/src/templates/tableshare/dragelform/index.scss b/src/templates/zshare/dragelform/index.scss
similarity index 100%
rename from src/templates/tableshare/dragelform/index.scss
rename to src/templates/zshare/dragelform/index.scss
diff --git a/src/templates/tableshare/dragelform/itemtypes.js b/src/templates/zshare/dragelform/itemtypes.js
similarity index 100%
rename from src/templates/tableshare/dragelform/itemtypes.js
rename to src/templates/zshare/dragelform/itemtypes.js
diff --git a/src/templates/tableshare/dragelform/source.jsx b/src/templates/zshare/dragelform/source.jsx
similarity index 100%
rename from src/templates/tableshare/dragelform/source.jsx
rename to src/templates/zshare/dragelform/source.jsx
diff --git a/src/templates/tableshare/editcard/index.jsx b/src/templates/zshare/editcard/index.jsx
similarity index 100%
rename from src/templates/tableshare/editcard/index.jsx
rename to src/templates/zshare/editcard/index.jsx
diff --git a/src/templates/tableshare/editcard/index.scss b/src/templates/zshare/editcard/index.scss
similarity index 100%
rename from src/templates/tableshare/editcard/index.scss
rename to src/templates/zshare/editcard/index.scss
diff --git a/src/templates/tableshare/exceleditable/index.jsx b/src/templates/zshare/exceleditable/index.jsx
similarity index 100%
rename from src/templates/tableshare/exceleditable/index.jsx
rename to src/templates/zshare/exceleditable/index.jsx
diff --git a/src/templates/tableshare/exceleditable/index.scss b/src/templates/zshare/exceleditable/index.scss
similarity index 100%
rename from src/templates/tableshare/exceleditable/index.scss
rename to src/templates/zshare/exceleditable/index.scss
diff --git a/src/templates/tableshare/formconfig.js b/src/templates/zshare/formconfig.js
similarity index 100%
rename from src/templates/tableshare/formconfig.js
rename to src/templates/zshare/formconfig.js
diff --git a/src/templates/tableshare/gridbtnform/index.jsx b/src/templates/zshare/gridbtnform/index.jsx
similarity index 100%
rename from src/templates/tableshare/gridbtnform/index.jsx
rename to src/templates/zshare/gridbtnform/index.jsx
diff --git a/src/templates/tableshare/gridbtnform/index.scss b/src/templates/zshare/gridbtnform/index.scss
similarity index 100%
rename from src/templates/tableshare/gridbtnform/index.scss
rename to src/templates/zshare/gridbtnform/index.scss
diff --git a/src/templates/tableshare/menuform/index.jsx b/src/templates/zshare/menuform/index.jsx
similarity index 100%
rename from src/templates/tableshare/menuform/index.jsx
rename to src/templates/zshare/menuform/index.jsx
diff --git a/src/templates/tableshare/menuform/index.scss b/src/templates/zshare/menuform/index.scss
similarity index 100%
rename from src/templates/tableshare/menuform/index.scss
rename to src/templates/zshare/menuform/index.scss
diff --git a/src/templates/ushare/editable/index.jsx b/src/templates/zshare/modaleditable/index.jsx
similarity index 99%
rename from src/templates/ushare/editable/index.jsx
rename to src/templates/zshare/modaleditable/index.jsx
index a5b94a1..2784030 100644
--- a/src/templates/ushare/editable/index.jsx
+++ b/src/templates/zshare/modaleditable/index.jsx
@@ -38,7 +38,6 @@
return
}
this.toggleEdit()
- // handleSave({ ...record, ...values })
})
}
diff --git a/src/templates/ushare/editable/index.scss b/src/templates/zshare/modaleditable/index.scss
similarity index 100%
rename from src/templates/ushare/editable/index.scss
rename to src/templates/zshare/modaleditable/index.scss
diff --git a/src/templates/ushare/modalform/index.jsx b/src/templates/zshare/modalform/index.jsx
similarity index 99%
rename from src/templates/ushare/modalform/index.jsx
rename to src/templates/zshare/modalform/index.jsx
index cc3aad0..701f2bc 100644
--- a/src/templates/ushare/modalform/index.jsx
+++ b/src/templates/zshare/modalform/index.jsx
@@ -3,7 +3,7 @@
import { Form, Row, Col, Input, Select, Icon, Radio, notification, InputNumber, Tooltip } from 'antd'
import { formRule } from '@/utils/option.js'
import { dateOptions } from '@/utils/option.js'
-import EditTable from '../editable'
+import EditTable from '../modaleditable'
import './index.scss'
const { TextArea } = Input
diff --git a/src/templates/ushare/modalform/index.scss b/src/templates/zshare/modalform/index.scss
similarity index 100%
rename from src/templates/ushare/modalform/index.scss
rename to src/templates/zshare/modalform/index.scss
diff --git a/src/templates/tableshare/pasteform/index.jsx b/src/templates/zshare/pasteform/index.jsx
similarity index 100%
rename from src/templates/tableshare/pasteform/index.jsx
rename to src/templates/zshare/pasteform/index.jsx
diff --git a/src/templates/tableshare/pasteform/index.scss b/src/templates/zshare/pasteform/index.scss
similarity index 100%
rename from src/templates/tableshare/pasteform/index.scss
rename to src/templates/zshare/pasteform/index.scss
diff --git a/src/templates/tableshare/editable/index.jsx b/src/templates/zshare/searcheditable/index.jsx
similarity index 97%
rename from src/templates/tableshare/editable/index.jsx
rename to src/templates/zshare/searcheditable/index.jsx
index 40a23f8..027ab1e 100644
--- a/src/templates/tableshare/editable/index.jsx
+++ b/src/templates/zshare/searcheditable/index.jsx
@@ -22,7 +22,9 @@
toggleEdit = () => {
const editing = !this.state.editing
this.setState({ editing }, () => {
- if (editing) {
+ if (editing && this.input && this.input.select) {
+ this.input.select()
+ } else if (editing && this.input && this.input.focus) {
this.input.focus()
}
})
@@ -36,7 +38,6 @@
return
}
this.toggleEdit()
- // handleSave({ ...record, ...values })
})
}
diff --git a/src/templates/tableshare/editable/index.scss b/src/templates/zshare/searcheditable/index.scss
similarity index 100%
rename from src/templates/tableshare/editable/index.scss
rename to src/templates/zshare/searcheditable/index.scss
diff --git a/src/templates/tableshare/searchform/index.jsx b/src/templates/zshare/searchform/index.jsx
similarity index 99%
rename from src/templates/tableshare/searchform/index.jsx
rename to src/templates/zshare/searchform/index.jsx
index ddae793..9cccb1f 100644
--- a/src/templates/tableshare/searchform/index.jsx
+++ b/src/templates/zshare/searchform/index.jsx
@@ -2,7 +2,7 @@
import PropTypes from 'prop-types'
import { Form, Row, Col, Input, Select, Icon, Radio, notification, Tooltip, InputNumber } from 'antd'
import { dateOptions, matchReg, formRule } from '@/utils/option.js'
-import EditTable from '../editable'
+import EditTable from '../searcheditable'
import './index.scss'
const { TextArea } = Input
diff --git a/src/templates/tableshare/searchform/index.scss b/src/templates/zshare/searchform/index.scss
similarity index 100%
rename from src/templates/tableshare/searchform/index.scss
rename to src/templates/zshare/searchform/index.scss
diff --git a/src/templates/tableshare/tabdragelement/card.jsx b/src/templates/zshare/tabdragelement/card.jsx
similarity index 100%
rename from src/templates/tableshare/tabdragelement/card.jsx
rename to src/templates/zshare/tabdragelement/card.jsx
diff --git a/src/templates/tableshare/tabdragelement/index.jsx b/src/templates/zshare/tabdragelement/index.jsx
similarity index 100%
rename from src/templates/tableshare/tabdragelement/index.jsx
rename to src/templates/zshare/tabdragelement/index.jsx
diff --git a/src/templates/tableshare/tabdragelement/index.scss b/src/templates/zshare/tabdragelement/index.scss
similarity index 100%
rename from src/templates/tableshare/tabdragelement/index.scss
rename to src/templates/zshare/tabdragelement/index.scss
diff --git a/src/templates/tableshare/tabform/index.jsx b/src/templates/zshare/tabform/index.jsx
similarity index 100%
rename from src/templates/tableshare/tabform/index.jsx
rename to src/templates/zshare/tabform/index.jsx
diff --git a/src/templates/tableshare/tabform/index.scss b/src/templates/zshare/tabform/index.scss
similarity index 100%
rename from src/templates/tableshare/tabform/index.scss
rename to src/templates/zshare/tabform/index.scss
diff --git a/src/templates/tableshare/transferform/index.jsx b/src/templates/zshare/transferform/index.jsx
similarity index 100%
rename from src/templates/tableshare/transferform/index.jsx
rename to src/templates/zshare/transferform/index.jsx
diff --git a/src/templates/tableshare/transferform/index.scss b/src/templates/zshare/transferform/index.scss
similarity index 100%
rename from src/templates/tableshare/transferform/index.scss
rename to src/templates/zshare/transferform/index.scss
diff --git a/src/templates/tableshare/verifycard/billcodeform/index.jsx b/src/templates/zshare/verifycard/billcodeform/index.jsx
similarity index 100%
rename from src/templates/tableshare/verifycard/billcodeform/index.jsx
rename to src/templates/zshare/verifycard/billcodeform/index.jsx
diff --git a/src/templates/tableshare/verifycard/billcodeform/index.scss b/src/templates/zshare/verifycard/billcodeform/index.scss
similarity index 100%
rename from src/templates/tableshare/verifycard/billcodeform/index.scss
rename to src/templates/zshare/verifycard/billcodeform/index.scss
diff --git a/src/templates/tableshare/verifycard/contrastform/index.jsx b/src/templates/zshare/verifycard/contrastform/index.jsx
similarity index 100%
rename from src/templates/tableshare/verifycard/contrastform/index.jsx
rename to src/templates/zshare/verifycard/contrastform/index.jsx
diff --git a/src/templates/tableshare/verifycard/contrastform/index.scss b/src/templates/zshare/verifycard/contrastform/index.scss
similarity index 100%
rename from src/templates/tableshare/verifycard/contrastform/index.scss
rename to src/templates/zshare/verifycard/contrastform/index.scss
diff --git a/src/templates/tableshare/verifycard/customform/index.jsx b/src/templates/zshare/verifycard/customform/index.jsx
similarity index 100%
rename from src/templates/tableshare/verifycard/customform/index.jsx
rename to src/templates/zshare/verifycard/customform/index.jsx
diff --git a/src/templates/tableshare/verifycard/customform/index.scss b/src/templates/zshare/verifycard/customform/index.scss
similarity index 100%
rename from src/templates/tableshare/verifycard/customform/index.scss
rename to src/templates/zshare/verifycard/customform/index.scss
diff --git a/src/templates/tableshare/verifycard/customscript/index.jsx b/src/templates/zshare/verifycard/customscript/index.jsx
similarity index 100%
rename from src/templates/tableshare/verifycard/customscript/index.jsx
rename to src/templates/zshare/verifycard/customscript/index.jsx
diff --git a/src/templates/tableshare/verifycard/customscript/index.scss b/src/templates/zshare/verifycard/customscript/index.scss
similarity index 100%
rename from src/templates/tableshare/verifycard/customscript/index.scss
rename to src/templates/zshare/verifycard/customscript/index.scss
diff --git a/src/templates/tableshare/verifycard/index.jsx b/src/templates/zshare/verifycard/index.jsx
similarity index 100%
rename from src/templates/tableshare/verifycard/index.jsx
rename to src/templates/zshare/verifycard/index.jsx
diff --git a/src/templates/tableshare/verifycard/index.scss b/src/templates/zshare/verifycard/index.scss
similarity index 100%
rename from src/templates/tableshare/verifycard/index.scss
rename to src/templates/zshare/verifycard/index.scss
diff --git a/src/templates/tableshare/verifycard/uniqueform/index.jsx b/src/templates/zshare/verifycard/uniqueform/index.jsx
similarity index 100%
rename from src/templates/tableshare/verifycard/uniqueform/index.jsx
rename to src/templates/zshare/verifycard/uniqueform/index.jsx
diff --git a/src/templates/tableshare/verifycard/uniqueform/index.scss b/src/templates/zshare/verifycard/uniqueform/index.scss
similarity index 100%
rename from src/templates/tableshare/verifycard/uniqueform/index.scss
rename to src/templates/zshare/verifycard/uniqueform/index.scss
diff --git a/src/templates/tableshare/verifycard/voucherform/index.jsx b/src/templates/zshare/verifycard/voucherform/index.jsx
similarity index 100%
rename from src/templates/tableshare/verifycard/voucherform/index.jsx
rename to src/templates/zshare/verifycard/voucherform/index.jsx
diff --git a/src/templates/tableshare/verifycard/voucherform/index.scss b/src/templates/zshare/verifycard/voucherform/index.scss
similarity index 100%
rename from src/templates/tableshare/verifycard/voucherform/index.scss
rename to src/templates/zshare/verifycard/voucherform/index.scss
diff --git a/src/templates/tableshare/verifycardexcelin/columnform/index.jsx b/src/templates/zshare/verifycardexcelin/columnform/index.jsx
similarity index 100%
rename from src/templates/tableshare/verifycardexcelin/columnform/index.jsx
rename to src/templates/zshare/verifycardexcelin/columnform/index.jsx
diff --git a/src/templates/tableshare/verifycardexcelin/columnform/index.scss b/src/templates/zshare/verifycardexcelin/columnform/index.scss
similarity index 100%
rename from src/templates/tableshare/verifycardexcelin/columnform/index.scss
rename to src/templates/zshare/verifycardexcelin/columnform/index.scss
diff --git a/src/templates/tableshare/verifycardexcelin/customscript/index.jsx b/src/templates/zshare/verifycardexcelin/customscript/index.jsx
similarity index 100%
rename from src/templates/tableshare/verifycardexcelin/customscript/index.jsx
rename to src/templates/zshare/verifycardexcelin/customscript/index.jsx
diff --git a/src/templates/tableshare/verifycardexcelin/customscript/index.scss b/src/templates/zshare/verifycardexcelin/customscript/index.scss
similarity index 100%
rename from src/templates/tableshare/verifycardexcelin/customscript/index.scss
rename to src/templates/zshare/verifycardexcelin/customscript/index.scss
diff --git a/src/templates/tableshare/verifycardexcelin/index.jsx b/src/templates/zshare/verifycardexcelin/index.jsx
similarity index 100%
rename from src/templates/tableshare/verifycardexcelin/index.jsx
rename to src/templates/zshare/verifycardexcelin/index.jsx
diff --git a/src/templates/tableshare/verifycardexcelin/index.scss b/src/templates/zshare/verifycardexcelin/index.scss
similarity index 100%
rename from src/templates/tableshare/verifycardexcelin/index.scss
rename to src/templates/zshare/verifycardexcelin/index.scss
diff --git a/src/templates/tableshare/verifycardexcelout/columnform/index.jsx b/src/templates/zshare/verifycardexcelout/columnform/index.jsx
similarity index 100%
rename from src/templates/tableshare/verifycardexcelout/columnform/index.jsx
rename to src/templates/zshare/verifycardexcelout/columnform/index.jsx
diff --git a/src/templates/tableshare/verifycardexcelout/columnform/index.scss b/src/templates/zshare/verifycardexcelout/columnform/index.scss
similarity index 100%
rename from src/templates/tableshare/verifycardexcelout/columnform/index.scss
rename to src/templates/zshare/verifycardexcelout/columnform/index.scss
diff --git a/src/templates/tableshare/verifycardexcelout/index.jsx b/src/templates/zshare/verifycardexcelout/index.jsx
similarity index 100%
rename from src/templates/tableshare/verifycardexcelout/index.jsx
rename to src/templates/zshare/verifycardexcelout/index.jsx
diff --git a/src/templates/tableshare/verifycardexcelout/index.scss b/src/templates/zshare/verifycardexcelout/index.scss
similarity index 100%
rename from src/templates/tableshare/verifycardexcelout/index.scss
rename to src/templates/zshare/verifycardexcelout/index.scss
diff --git a/src/templates/tableshare/verifycardprint/index.jsx b/src/templates/zshare/verifycardprint/index.jsx
similarity index 100%
rename from src/templates/tableshare/verifycardprint/index.jsx
rename to src/templates/zshare/verifycardprint/index.jsx
diff --git a/src/templates/tableshare/verifycardprint/index.scss b/src/templates/zshare/verifycardprint/index.scss
similarity index 100%
rename from src/templates/tableshare/verifycardprint/index.scss
rename to src/templates/zshare/verifycardprint/index.scss
diff --git a/src/views/login/index.jsx b/src/views/login/index.jsx
index 259edc4..588910e 100644
--- a/src/views/login/index.jsx
+++ b/src/views/login/index.jsx
@@ -13,7 +13,6 @@
import './index.scss'
const LoginForm = asyncComponent(() => import('./loginform'))
-// const Action = asyncComponent(() => import('@/tabviews/tableshare/actionList'))
const iszhCN = !localStorage.getItem('lang') || localStorage.getItem('lang') === 'zh-CN'
class Login extends Component {
@@ -29,8 +28,7 @@
ICP: window.GLOB.icp || 'ICP澶囨锛� 浜琁CP澶�12007830鍙�',
bgColor: window.GLOB.bgColor || '#000000',
lineColor: window.GLOB.lineColor || '#1890ff',
- website: window.GLOB.website || (!window.GLOB.copyRight && 'http://minkesoft.com'),
- loaded: false
+ website: window.GLOB.website || (!window.GLOB.copyRight && 'http://minkesoft.com')
}
changelang (item) {
@@ -144,7 +142,6 @@
isDisabled={this.state.isDisabled}
changelang={(value) => this.changelang(value)}
handleSubmit={() => this.handleSubmit()}
- loaded={() => this.setState({ loaded: true })}
wrappedComponentRef={(inst) => this.loginformRef = inst}
/>
</div>
@@ -155,7 +152,6 @@
}
<p dangerouslySetInnerHTML={{ __html: this.state.ICP.replace(/\s/ig, ' ') }}></p>
</div>
- {/* {this.state.loaded ? <div style={{position: 'fixed', bottom: '-1000px'}}><Action setting={{}} actions={[]} /></div> : null } */}
</div>
)
}
diff --git a/src/views/login/loginform.jsx b/src/views/login/loginform.jsx
index 15d7e31..c23eabd 100644
--- a/src/views/login/loginform.jsx
+++ b/src/views/login/loginform.jsx
@@ -10,7 +10,6 @@
isDisabled: PropTypes.bool,
changelang: PropTypes.func,
handleSubmit: PropTypes.func,
- loaded: PropTypes.func,
dict: PropTypes.object,
auth: PropTypes.bool,
lang: PropTypes.string,
@@ -97,7 +96,6 @@
input.focus()
}
}
- this.props.loaded()
}
render() {
--
Gitblit v1.8.0