vue2-client 1.8.11 → 1.8.13

package/src/base-client/components/common/CitySelect/index.md

@@ -1,109 +1,109 @@
-# 省市区修改组件
-
-> 下拉框数据从库里查询 divisions_of_china 表
-> 省市区数据存储格式
-
-+---------+-----+------------+--------+--------+----------+
-|code     |name |provinceCode|cityCode|areaCode|parentCode|
-+---------+-----+------------+--------+--------+----------+
-|11       |北京市  |NULL        |NULL    |NULL    |NULL      |
-|1101     |市辖区  |11          |NULL    |NULL    |11        |
-|110101   |东城区  |11          |1101    |NULL    |1101      |
-|110101001|东华门街道|11          |1101    |110101  |1101     |
-|110101002|景山街道 |11          |1101    |110101  |1101      |
-+---------+-----+------------+--------+--------+----------+
-
-
-查询出来之后转成tree 作为数据 (截取了一段数据)
-
-```json
-[
-    {
-        "code": "11",
-        "name": "北京",
-        "label": "北京",
-        "value": "北京",
-        "children":
-        [
-            {
-                "code": "1101",
-                "parentcode": "11",
-                "name": "辖区",
-                "label": "辖区",
-                "value": "辖区",
-                "children":
-                [
-                  {
-                    "code": "110101",
-                    "parentcode": "1101",
-                    "name": "东城区",
-                    "label": "东城区",
-                    "value": "东城区"
-                  }
-                ]}]}]
-```
-
-可传递参数
-```js
-props = {
-    // 页面渲染内容  默认 省市区街道 四个 所以是4
-    contexts: {
-      type: Number,
-      default: 3
-    },
-    placeholder: {
-      type: String,
-      default: '请选择省市区'
-    },
-    // small lage 输入框大小
-    size: {
-      type: String,
-      default: undefined
-    },
-    // 类型 simple / undefined
-    // simple 就是用的 cascader  不穿就是用的 自己封装的
-    type: {
-      type: String,
-      default: undefined
-    },
-    // 框的样式
-    inputStyle: {
-      type: Object,
-      default: () => {
-      }
-    },
-    // 下拉框的样式
-    dropdownStyle: {
-      type: Object,
-      default: () => {
-        return {
-          width: '35rem',
-          padding: '1%'
-        }
-      }
-    },
-    // 标签的样式
-    tagStyle: {
-      type: Object,
-      default: () => {
-        return {
-          fontSize: '0.88rem',
-          width: '23%',
-          textAlign: 'left',
-          margin: '0.5%',
-          cursor: 'pointer'
-        }
-      }
-    },
-    // 用于v-model 绑定
-    value: {
-      type: String,
-      default: undefined
-    },
-    // 用于v-model 绑定 code :最后一级的code  address: 所有级拼接的地址
-    valueType: {
-      type: String,
-      default: 'address'
-    }
-  }
-```
+# 省市区修改组件
+
+> 下拉框数据从库里查询 divisions_of_china 表
+> 省市区数据存储格式
+
++---------+-----+------------+--------+--------+----------+
+|code     |name |provinceCode|cityCode|areaCode|parentCode|
++---------+-----+------------+--------+--------+----------+
+|11       |北京市  |NULL        |NULL    |NULL    |NULL      |
+|1101     |市辖区  |11          |NULL    |NULL    |11        |
+|110101   |东城区  |11          |1101    |NULL    |1101      |
+|110101001|东华门街道|11          |1101    |110101  |1101     |
+|110101002|景山街道 |11          |1101    |110101  |1101      |
++---------+-----+------------+--------+--------+----------+
+
+
+查询出来之后转成tree 作为数据 (截取了一段数据)
+
+```json
+[
+    {
+        "code": "11",
+        "name": "北京",
+        "label": "北京",
+        "value": "北京",
+        "children":
+        [
+            {
+                "code": "1101",
+                "parentcode": "11",
+                "name": "辖区",
+                "label": "辖区",
+                "value": "辖区",
+                "children":
+                [
+                  {
+                    "code": "110101",
+                    "parentcode": "1101",
+                    "name": "东城区",
+                    "label": "东城区",
+                    "value": "东城区"
+                  }
+                ]}]}]
+```
+
+可传递参数
+```js
+props = {
+    // 页面渲染内容  默认 省市区街道 四个 所以是4
+    contexts: {
+      type: Number,
+      default: 3
+    },
+    placeholder: {
+      type: String,
+      default: '请选择省市区'
+    },
+    // small lage 输入框大小
+    size: {
+      type: String,
+      default: undefined
+    },
+    // 类型 simple / undefined
+    // simple 就是用的 cascader  不穿就是用的 自己封装的
+    type: {
+      type: String,
+      default: undefined
+    },
+    // 框的样式
+    inputStyle: {
+      type: Object,
+      default: () => {
+      }
+    },
+    // 下拉框的样式
+    dropdownStyle: {
+      type: Object,
+      default: () => {
+        return {
+          width: '35rem',
+          padding: '1%'
+        }
+      }
+    },
+    // 标签的样式
+    tagStyle: {
+      type: Object,
+      default: () => {
+        return {
+          fontSize: '0.88rem',
+          width: '23%',
+          textAlign: 'left',
+          margin: '0.5%',
+          cursor: 'pointer'
+        }
+      }
+    },
+    // 用于v-model 绑定
+    value: {
+      type: String,
+      default: undefined
+    },
+    // 用于v-model 绑定 code :最后一级的code  address: 所有级拼接的地址
+    valueType: {
+      type: String,
+      default: 'address'
+    }
+  }
+```

package/src/base-client/components/common/CreateQuery/CreateQuery.vue

@@ -68,17 +68,17 @@
               <a-button icon="import" @click="$message.warn('从创意库中选择并引用高质量的通用表单项配置，敬请期待')">从创意库引入</a-button>
             </a-space>
             <a-row :gutter="24">
-              <a-col :span="8">
+              <a-col :span="6">
                 <span style="font-weight: bold">
                   标签名
                 </span>
               </a-col>
-              <a-col :span="7">
+              <a-col :span="6">
                 <span style="font-weight: bold">
                   字段名
                 </span>
               </a-col>
-              <a-col :span="7">
+              <a-col :span="10">
                 <span style="font-weight: bold">
                   数据模式
                 </span>
@@ -102,17 +102,17 @@
                 <span class="dragTips">拖到此处放置</span>
               </a-row>
               <a-row :gutter="24" class="column_item">
-                <a-col :span="7">
+                <a-col :span="6">
                   <span style="font-weight: bold">
                     {{ columnItem.title }}
                   </span>
                 </a-col>
-                <a-col :span="7">
+                <a-col :span="6">
                   <span style="font-weight: bold">
                     {{ columnItem.key }}
                   </span>
                 </a-col>
-                <a-col :span="8">
+                <a-col :span="10">
                   <a-tooltip>
                     <template slot="title">
                       查询表单项
@@ -145,7 +145,13 @@
                   </a-tooltip>
                   <a-tooltip>
                     <template slot="title">
-                      字段组存储
+                      Excel导入项
+                    </template>
+                    <a-tag :color="columnItem.dataModeArray.includes('excelImportItem') ? '#107C41' : 'rgba(0, 0, 0, 0.25)'"><a-icon type="file-excel" /></a-tag>
+                  </a-tooltip>
+                  <a-tooltip>
+                    <template slot="title">
+                      数据组
                     </template>
                     <a-tag :color="columnItem.dataModeArray.includes('group') ? '#82A0D8' : 'rgba(0, 0, 0, 0.25)'"><a-icon type="crown" /></a-tag>
                   </a-tooltip>
@@ -385,27 +391,8 @@ export default {
           }, this.toEditJson
         )
         for (const columnItem of this.form.column) {
-          // 数据模式兼容性处理
           if (!(columnItem.dataMode || columnItem.dataModeArray)) {
             columnItem.dataModeArray = ['queryForm', 'table', 'addOrEditForm', 'sqlQueryItem', 'sqlQueryCondition']
-          } else if (columnItem.dataMode) {
-            if (columnItem.dataMode === 'all') {
-              columnItem.dataModeArray = ['queryForm', 'table', 'addOrEditForm', 'sqlQueryItem', 'sqlQueryCondition']
-            } else if (columnItem.dataMode === 'form') {
-              columnItem.dataModeArray = ['queryForm', 'addOrEditForm', 'sqlQueryCondition']
-            } else if (columnItem.dataMode === 'table') {
-              columnItem.dataModeArray = ['table', 'sqlQueryItem']
-            } else if (columnItem.dataMode === 'table_form') {
-              columnItem.dataModeArray = ['table', 'sqlQueryItem', 'sqlQueryCondition']
-            } else if (columnItem.dataMode === 'only_form') {
-              columnItem.dataModeArray = ['queryForm']
-            } else if (columnItem.dataMode === 'only_table') {
-              columnItem.dataModeArray = ['table']
-            } else if (columnItem.dataMode === 'clear') {
-              columnItem.dataModeArray = ['sqlQueryItem', 'sqlQueryCondition']
-            } else if (columnItem.dataMode === 'only_add_modify') {
-              columnItem.dataModeArray = ['addOrEditForm', 'sqlQueryItem']
-            }
           }
           delete columnItem.dataMode
           // 插槽兼容处理

package/src/base-client/components/common/CreateQuery/CreateQueryItem.vue

@@ -311,7 +311,7 @@
           <a-card :bodyStyle="bodyStyle" title="数据字段">
             <a-button type="primary" slot="extra" @click="addColumnItem()">增加</a-button>
             <a-row :gutter="24">
-              <a-col :span="8">
+              <a-col :span="7">
                 <span style="font-weight: bold">
                   标签名
                 </span>
@@ -321,7 +321,7 @@
                   字段名
                 </span>
               </a-col>
-              <a-col :span="7">
+              <a-col :span="8">
                 <span style="font-weight: bold">
                   数据模式
                 </span>
@@ -388,7 +388,13 @@
                   </a-tooltip>
                   <a-tooltip>
                     <template slot="title">
-                      字段JSON存储
+                      Excel导入项
+                    </template>
+                    <a-tag :color="columnItem.dataModeArray && columnItem.dataModeArray.includes('excelImportItem') ? '#107C41' : 'rgba(0, 0, 0, 0.25)'"><a-icon type="file-excel" /></a-tag>
+                  </a-tooltip>
+                  <a-tooltip>
+                    <template slot="title">
+                      数据组
                     </template>
                     <a-tag :color="columnItem.dataModeArray && columnItem.dataModeArray.includes('group') ? '#82A0D8' : 'rgba(0, 0, 0, 0.25)'"><a-icon type="crown" /></a-tag>
                   </a-tooltip>
@@ -477,7 +483,7 @@ export default {
     },
     // 字段名称是否禁用
     keyDisabled () {
-      return this.item.formType === 'file' || this.item.formType === 'image'
+      return this.item.formType === 'file' || this.item.formType === 'image' || this.dataMode.mixinTableName
     },
     // 数据模式是否禁用
     dataModeDisabled () {
@@ -489,7 +495,10 @@ export default {
         table: false,
         addOrEditForm: false,
         sqlQueryItem: false,
-        sqlQueryCondition: false
+        sqlQueryCondition: false,
+        excelImportItem: false,
+        group: false,
+        mixinTableName: false
       }
       for (const item of this.dataModeArrayData) {
         result[item] = true
@@ -508,11 +517,24 @@ export default {
           value: 'sqlQueryItem',
           noMatch: ['file', 'personSetting']
         }, {
-            label: '字段组存储',
-            value: 'group',
-            noMatch: []
+          label: '字段组存储',
+          value: 'group',
+          noMatch: []
         }]
       }
+      if (this.dataModeArrayData.includes('mixinTableName')) {
+        return [
+          {
+            label: '渲染查询表单项',
+            value: 'queryForm',
+            noMatch: ['file', 'image', 'textarea', 'personSetting']
+          },
+          {
+            label: '动态表名参数',
+            value: 'mixinTableName',
+            noMatch: []
+          }]
+      }
       if (this.item.formType) {
         return dataModeType.filter(item => {
           return item.noMatch.findIndex(type => type === this.item.formType) === -1
@@ -595,7 +617,7 @@ export default {
               callback(new Error('请输入字段名称'))
             } else {
               // 判断必须全部小写 并且不能包含空格
-              if (value !== value.toLowerCase() || value.indexOf(' ') !== -1) {
+              if (value !== value.toLowerCase() || value.indexOf(' ') !== -1 && !value === '_mixinTableName_') {
                 callback(new Error('字段名称必须全部小写，且不能包含空格'))
               } else {
                 callback()
@@ -805,6 +827,12 @@ export default {
     },
     // 数据模式改变
     dataModeArrayDataChange (newVal) {
+      if (newVal.includes('mixinTableName')) {
+        this.item.key = '_mixinTableName_'
+        this.dataModeArrayData = ['queryForm', 'mixinTableName']
+      } else {
+        this.item.key = ''
+      }
       if (newVal.includes('group')) {
         this.dataModeArrayData = ['sqlQueryItem', 'group']
       }

package/src/base-client/components/common/PersonSetting/index.js

@@ -1,3 +1,3 @@
-import PersonSetting from './PersonSetting'
-
-export default PersonSetting
+import PersonSetting from './PersonSetting'
+
+export default PersonSetting

package/src/base-client/components/common/Upload/index.js

@@ -1,3 +1,3 @@
-import Upload from './Upload'
-
-export default Upload
+import Upload from './Upload'
+
+export default Upload