From 4fbd75879aad2356d799ca4d0d9c7da6a92d2a51 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 30 八月 2022 18:32:45 +0800
Subject: [PATCH] 2022-08-30
---
public/options.json | 12 +++---
src/tabviews/custom/components/form/tab-form/index.jsx | 7 +++
src/tabviews/custom/components/form/step-form/index.jsx | 7 +++
src/tabviews/custom/components/form/simple-form/index.jsx | 7 +++
src/templates/zshare/formconfig.jsx | 23 +++++++++++
src/tabviews/zshare/normalTable/index.jsx | 17 ++++++++
src/templates/sharecomponent/columncomponent/columnform/index.jsx | 3 +
7 files changed, 66 insertions(+), 10 deletions(-)
diff --git a/public/options.json b/public/options.json
index 7cd79e6..523da64 100644
--- a/public/options.json
+++ b/public/options.json
@@ -1,20 +1,20 @@
{
- "appId": "202108312122504607B107A83F55B40C98CCF",
- "appkey": "20210831212235413F287EC3BF489424496C8",
+ "appId": "201912040924165801464FF1788654BC5AC73",
+ "appkey": "20191106103859640976D6E924E464D029CF0",
"mainSystemApi": "http://sso.mk9h.cn/cloud/webapi/dostars",
"systemType": "",
"externalDatabase": "false",
"lineColor": "",
"filter": "false",
- "defaultApp": "css_wx_app",
+ "defaultApp": "mk",
"defaultLang": "zh-CN",
- "WXAppID": "wx4d8a34c8d4494872",
+ "WXAppID": "",
"WXminiAppID": "",
"debugger": false,
"licenseKey": "",
"probation": "",
"keepPassword": "true",
"platforms": ["H5", "wechat", "android", "ios", "wxMiniProgram"],
- "host": "http://demo.mk9h.cn",
- "service": "erp_new/"
+ "host": "http://qingqiumarket.cn",
+ "service": "MKWMS/"
}
\ No newline at end of file
diff --git a/src/tabviews/custom/components/form/simple-form/index.jsx b/src/tabviews/custom/components/form/simple-form/index.jsx
index 5ea76fc..74d5900 100644
--- a/src/tabviews/custom/components/form/simple-form/index.jsx
+++ b/src/tabviews/custom/components/form/simple-form/index.jsx
@@ -217,7 +217,12 @@
const { mainSearch } = this.props
const { config, arr_field, BID } = this.state
- if (config.wrap.datatype === 'static' || (config.setting.supModule && !BID)) {
+ if (config.wrap.datatype === 'static') {
+ this.setState({
+ data: {$$empty: true}
+ })
+ return
+ } else if (config.setting.supModule && !BID) {
this.setState({
data: null
}, () => {
diff --git a/src/tabviews/custom/components/form/step-form/index.jsx b/src/tabviews/custom/components/form/step-form/index.jsx
index 0b3580c..c034d19 100644
--- a/src/tabviews/custom/components/form/step-form/index.jsx
+++ b/src/tabviews/custom/components/form/step-form/index.jsx
@@ -266,7 +266,12 @@
const { mainSearch } = this.props
const { config, arr_field, BID } = this.state
- if (config.wrap.datatype === 'static' || (config.setting.supModule && !BID)) {
+ if (config.wrap.datatype === 'static') {
+ this.setState({
+ data: {$$empty: true}
+ })
+ return
+ } else if (config.setting.supModule && !BID) {
this.setState({
data: null
}, () => {
diff --git a/src/tabviews/custom/components/form/tab-form/index.jsx b/src/tabviews/custom/components/form/tab-form/index.jsx
index 65cb0b3..fd0f2a1 100644
--- a/src/tabviews/custom/components/form/tab-form/index.jsx
+++ b/src/tabviews/custom/components/form/tab-form/index.jsx
@@ -227,7 +227,12 @@
const { mainSearch } = this.props
const { config, arr_field, BID } = this.state
- if (config.wrap.datatype === 'static' || (config.setting.supModule && !BID)) {
+ if (config.wrap.datatype === 'static') {
+ this.setState({
+ data: {$$empty: true}
+ })
+ return
+ } else if (config.setting.supModule && !BID) {
this.setState({
data: null
}, () => {
diff --git a/src/tabviews/zshare/normalTable/index.jsx b/src/tabviews/zshare/normalTable/index.jsx
index 259b6c7..4f7ee58 100644
--- a/src/tabviews/zshare/normalTable/index.jsx
+++ b/src/tabviews/zshare/normalTable/index.jsx
@@ -17,6 +17,7 @@
const PopupButton = asyncComponent(() => import('@/tabviews/zshare/actionList/popupbutton'))
const TabButton = asyncComponent(() => import('@/tabviews/zshare/actionList/tabbutton'))
const NewPageButton = asyncComponent(() => import('@/tabviews/zshare/actionList/newpagebutton'))
+const Video = asyncComponent(() => import('@/components/video'))
class BodyRow extends React.Component {
shouldComponentUpdate (nextProps) {
@@ -656,6 +657,22 @@
})}
</div>
)
+ } else if (item.type === 'video') {
+ let url = ''
+ if (item.field && record.hasOwnProperty(item.field)) {
+ url = record[item.field] + ''
+ }
+
+ if (!url) {
+ return (
+ <div className="video-wrap"></div>
+ )
+ }
+ return (
+ <div className="video-wrap">
+ <Video card={item} value={url}/>
+ </div>
+ )
} else if (item.type === 'textarea') {
let content = ''
diff --git a/src/templates/sharecomponent/columncomponent/columnform/index.jsx b/src/templates/sharecomponent/columncomponent/columnform/index.jsx
index a69897e..4b635e7 100644
--- a/src/templates/sharecomponent/columncomponent/columnform/index.jsx
+++ b/src/templates/sharecomponent/columncomponent/columnform/index.jsx
@@ -12,7 +12,8 @@
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'],
+ picture: ['label', 'field', 'type', 'Align', 'Hide', 'Width', 'fieldlength', 'blacklist', 'scale', 'maxHeight'],
+ video: ['label', 'field', 'type', 'Align', 'Hide', 'startTime', 'Width', 'fieldlength', 'blacklist', 'aspectRatio'],
index: ['label', 'type', 'Align', 'Width']
}
diff --git a/src/templates/zshare/formconfig.jsx b/src/templates/zshare/formconfig.jsx
index 7f7cc56..b8105dd 100644
--- a/src/templates/zshare/formconfig.jsx
+++ b/src/templates/zshare/formconfig.jsx
@@ -1627,6 +1627,9 @@
value: 'picture',
text: Formdict['model.form.picture']
}, {
+ value: 'video',
+ text: '瑙嗛'
+ }, {
value: 'link',
text: Formdict['model.form.href']
}, {
@@ -1715,6 +1718,26 @@
}]
},
{
+ type: 'number',
+ key: 'startTime',
+ precision: 0,
+ label: '寮�濮嬫椂闂�',
+ initVal: card.startTime || 0,
+ tooltip: '瑙嗛寮�濮嬫挱鏀剧殑鏃堕棿锛岀敤浜庤皟鏁磋棰戝垵濮嬪寲灞曠ず鐨勭晫闈€��',
+ required: false
+ },
+ {
+ type: 'select',
+ key: 'aspectRatio',
+ label: '闀垮姣�',
+ initVal: card.aspectRatio || '16:9',
+ required: true,
+ options: [
+ { value: '4:3', text: '4:3' },
+ { value: '16:9', text: '16:9' }
+ ]
+ },
+ {
type: 'radio',
key: 'rowspan',
label: '琛屽悎骞�',
--
Gitblit v1.8.0