From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/templates/modalconfig/source.jsx |   57 ++++++++++++++++++++++++++++-----------------------------
 1 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/src/templates/modalconfig/source.jsx b/src/templates/modalconfig/source.jsx
index e368b9e..d3818c5 100644
--- a/src/templates/modalconfig/source.jsx
+++ b/src/templates/modalconfig/source.jsx
@@ -26,10 +26,11 @@
       initval: '',
       type: 'text',
       resourceType: '0',
-      setAll: 'false',
       options: [],
       orderType: 'asc',
       decimal: 0,
+      span: 12,
+      labelwidth: 33.3,
       min: '',
       max: '',
       readonly: 'false',
@@ -42,10 +43,11 @@
       initval: '',
       type: 'select',
       resourceType: '0',
-      setAll: 'false',
       options: [],
       orderType: 'asc',
       decimal: 0,
+      span: 12,
+      labelwidth: 33.3,
       min: '',
       max: '',
       readonly: 'false',
@@ -58,10 +60,11 @@
       initval: '',
       type: 'date',
       resourceType: '0',
-      setAll: 'false',
       options: [],
       orderType: 'asc',
       decimal: 0,
+      span: 12,
+      labelwidth: 33.3,
       min: '',
       max: '',
       readonly: 'false',
@@ -75,115 +78,111 @@
     type: 'form',
     label: CommonDict['model.form.text'],
     subType: 'text',
-    url: ''
   },
   {
     type: 'form',
     label: CommonDict['model.form.number'],
     subType: 'number',
-    url: ''
   },
   {
     type: 'form',
     label: CommonDict['model.form.select'],
     subType: 'select',
-    url: ''
   },
   {
     type: 'form',
     label: CommonDict['model.form.multiselect'],
     subType: 'multiselect',
-    url: ''
   },
   {
     type: 'form',
     label: CommonDict['model.form.link'],
     subType: 'link',
-    url: ''
   },
   {
     type: 'form',
     label: '寮�鍏�',
     subType: 'switch',
-    url: ''
   },
   {
     type: 'form',
     label: '澶氶�夋',
     subType: 'checkbox',
-    url: ''
   },
   {
     type: 'form',
     label: '鍗曢�夋',
     subType: 'radio',
-    url: ''
   },
   {
     type: 'form',
     label: '閫夐」鍗�',
     subType: 'checkcard',
-    url: ''
   },
   {
     type: 'form',
-    label: CommonDict['header.form.fileupload'],
+    label: '鏂囦欢涓婁紶',
     subType: 'fileupload',
-    url: ''
   },
   {
     type: 'form',
-    label: CommonDict['model.form.dateday'],
+    label: '鏃ユ湡锛堝ぉ锛�',
     subType: 'date',
-    url: ''
   },
   {
     type: 'form',
     label: CommonDict['model.form.datemonth'],
     subType: 'datemonth',
-    url: ''
-  },
-  {
-    type: 'form',
-    label: CommonDict['model.form.datetime'],
-    subType: 'datetime',
-    url: ''
   },
   {
     type: 'form',
     label: CommonDict['model.form.textarea'],
     subType: 'textarea',
-    url: ''
+  },
+  {
+    type: 'form',
+    label: '绾ц仈鑿滃崟',
+    subType: 'cascader',
+  },
+  {
+    type: 'form',
+    label: '璇勫垎',
+    subType: 'rate',
   },
   {
     type: 'form',
     label: CommonDict['model.form.color'],
     subType: 'color',
-    url: ''
   },
   {
     type: 'form',
     label: '瀵屾枃鏈�',
     subType: 'brafteditor',
-    url: ''
   },
   {
     type: 'form',
     label: CommonDict['header.form.funcvar'],
     subType: 'funcvar',
-    url: ''
   },
   {
     type: 'form',
     label: '鎻愮ず',
     subType: 'hint',
-    url: ''
   },
   {
     type: 'form',
     label: '鍒嗗壊绾�',
     subType: 'split',
-    url: ''
+  },
+  {
+    type: 'form',
+    label: '鍏宠仈涓昏〃',
+    subType: 'linkMain',
+  },
+  {
+    type: 'form',
+    label: '鍏紡',
+    subType: 'formula',
   }
 ]
 

--
Gitblit v1.8.0