app-form-view 0.0.9 → 0.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "app-form-view",
-  "version": "0.0.9",
+  "version": "0.1.1",
   "description": "vue表单组件库",
   "main": "dist/index.js",
   "publishConfig": {

package/src/api/app-form.js

@@ -1,4 +1,3 @@
-
 const BASE = 'sjyy/sjczgl/form/bdgl/config/'
 const API = {
     scene: BASE + 'getFromConfigScene',
@@ -19,91 +18,69 @@ export const APIOPTIONS = [
     { label: '数据查询应用数据表JSON', url: 'sjyy/zycx/getZycxDataList', fhType: 'json', method: 'post', paramsList: [{ label: '选择模式', name: 'xzms', value: '' }, { label: '数据表ID', name: 'id', value: '' }], xtgllx: 'sjcxyy-table' }
 ]
 export const TYPEMAPPINGS = {
-    input: {
-        widget: 'input'
-    },
-    radio: {
-        widget: 'radio',
-    },
-    checkbox: {
-        widget: 'checkbox',
-    },
-    textarea: {
-        widget: 'textarea',
-    },
-    select: {
-        widget: 'select',
-    },
-    date: {
-        widget: 'datetime',
-    },
-    rqsjfw: {
-        widget: 'datetimeRange',
-    },
-    password: {
-        widget: 'password',
-    },
-    number: {
-        widget: 'inputNumber'
-    },
-    upload: {
-        widget: 'inputUpload'
-    },
-    tree_select: {
-        widget: 'inputTree'
-    }
+    input: { widget: 'input' },
+    radio: { widget: 'radio' },
+    checkbox: { widget: 'checkbox' },
+    textarea: { widget: 'textarea' },
+    select: { widget: 'select' },
+    date: { widget: 'datetime' },
+    rqsjfw: { widget: 'datetimeRange' },
+    password: { widget: 'password' },
+    number: { widget: 'inputNumber' },
+    upload: { widget: 'inputUpload' },
+    tree_select: { widget: 'inputTree' }
 }
-//
-export function getFormConfig(data) {
+
+export function getFormConfig(request, data) {
 
 }
-export function getFormConfigScene(data) {
-    return this.$request({
+export function getFormConfigScene(request, data) {
+    return request({
         url: API.scene,
         method: 'post',
         data: data
     })
 }
 
-export function saveFormData(data) {
-    return this.$request({
+export function saveFormData(request, data) {
+    return request({
         url: data.id !== undefined ? API.editSave : API.addSave,
         method: 'post',
         data: data
     })
 }
-export function getTableData(data) {
-    return this.$request({
+export function getTableData(request, data) {
+    return request({
         url: API.getData,
         method: 'post',
         data: data
     })
 }
 
-export function getUserInfo() {
-    return this.$request({
+export function getUserInfo(request) {
+    return request({
         url: '/sjyy/sjczgl/form/bdgl/config/getDqyh',
         method: 'get'
     })
 }
 
-export function getFormData(data) {
-    return this.$request({
+export function getFormData(request, data) {
+    return request({
         url: API.view,
         method: 'post',
         data: data
     })
 }
 
-export function getSjyyFields(data) {
-    return this.$request({
+export function getSjyyFields(request, data) {
+    return request({
         url: API.getSjyyFields,
         method: 'post',
         data: data
     })
 }
-export function getDict(dictType, dictLylx) {
-    return this.$request({
+export function getDict(request, dictType, dictLylx) {
+    return request({
         url: API.getDict,
         method: 'post',
         data: { dictType, dictLylx: dictLylx || 'sys' }
@@ -111,40 +88,40 @@ export function getDict(dictType, dictLylx) {
 }
 
 // 接口列表
-export function apiList(query) {
-    return this.$request({
+export function apiList(request, query) {
+    return request({
         url: '/gzt/jkgl/getGztJklist',
         method: 'post',
         data: query
     })
 }
 // 接口详情
-export function apiView(id) {
-    return this.$request({
+export function apiView(request, id) {
+    return request({
         url: '/gzt/jkgl/jkglView',
         method: 'post',
         data: { id }
     })
 }
 
-export function getViewData(data) {
-    return this.$request({
+export function getViewData(request, data) {
+    return request({
         url: API.getViewData,
         method: 'post',
         data: data
     })
 }
 
-export function getFormInitData(data) {
-    return this.$request({
+export function getFormInitData(request, data) {
+    return request({
         url: API.getFormInitData,
         method: 'post',
         data: data
     })
 }
 
-export function getData(url, data) {
-    return this.$request({
+export function getData(request, url, data) {
+    return request({
         url: url,
         method: 'post',
         data: data

package/src/api/dict/app-data.js

@@ -1,9 +1,9 @@
 
 
 // 根据字典类型查询字典数据信息
-export function getDicts(dictType, dictLylx) {
+export function getDicts(request, dictType, dictLylx) {
   let type = dictType.split('/')[0]
-  return this.$request({
+  return request({
     url: '/sjyy/sjczgl/form/bdgl/config/getFormDictData',
     data: { dictType: type, dictLylx: dictLylx || dictType.split('/')[1] || 'sys' },
     method: 'post'

package/src/app-index.js

@@ -50,6 +50,9 @@ const install = function (Vue, options) {
     if (options.request) {
         Vue.prototype.$request = options.request
     }
+    if (options.goBack) {
+        Vue.prototype.goBack = options.goBack
+    }
     Object.values(components).forEach(comp => {
         // 增加判断：comp存在 + name是有效字符串
         if (comp && comp.name && typeof comp.name === 'string') {

package/src/assets/scss/app-form.scss

@@ -258,6 +258,9 @@ button[disabled]{
 .app-page{
     height:100%;
     overflow:hidden;
+    .app-page-wrap{
+        padding:15px;
+    }
     .bottom-btns{
         gap:15px;
         padding-left: 10px;
@@ -315,7 +318,7 @@ button[disabled]{
     }
     .sub-item-title{ background: #fff;border-bottom:none}
     .sub-item-title .title{
-        font-size: 16px;
+        font-size: 1rem;
                 font-weight: 600;
                 color: var(--title-text-color);
     }
@@ -324,7 +327,7 @@ button[disabled]{
 .last-cell-child{
     border-bottom-left-radius:10px;
     border-bottom-right-radius:10px;
-    margin-bottom: 10px;
+    margin-bottom: 15px;
     &.van-cell{
         padding-bottom: 10px;
         &:after{
@@ -335,8 +338,17 @@ button[disabled]{
 .first-cell-child{
     border-top-left-radius:10px;
     border-top-right-radius:10px;
-    margin-top: 10px;
+    margin-top: 15px;
 }
 .van-nav-bar .van-icon {
   color: var(--nav-bar-icon-color);
 }
+
+.sub-item-title {
+  padding: 15px 5px;
+  .title{
+     font-size: 1rem;
+                font-weight: 600;
+                color: var(--title-text-color);
+  }
+}

package/src/components/appForm/Checkbox.vue

@@ -56,7 +56,7 @@ export default {
         // 加载字典数据
         async loadDictData(dictType, dictLylx) {
             try {
-                const response = await getDicts(dictType, dictLylx);
+                const response = await getDicts(this.$request, dictType, dictLylx);
                 this.selectOptions = (response.rows || response.data || []).map(item => ({
                     value: item.dictValue,
                     label: item.dictLabel,

package/src/components/appForm/Form.vue

@@ -9,7 +9,6 @@
 </template>
 
 <script>
-import request from '@/utils/request'
 import Vue from 'vue'
 import { isString } from '@/utils/index'
 import eventsMixin from '../form/form-event-mixin.js'
@@ -134,7 +133,7 @@ export default {
                     // 2. 转换 Vue 响应式 formData 为原生 FormData
                     //const nativeFormData = this.convertVueFormToNativeFormData(JSON.parse(JSON.stringify(this.formModel)));
                     if (this.ywid && !this.formModel[this.conf.primaryKeyName]) nativeFormData.append(this.conf.primaryKeyName || 'id', this.ywid)
-                    request({
+                    this.$request({
                         url: this.saveUrl,
                         // cache: false,
                         // contentType: false,
@@ -177,7 +176,7 @@ export default {
                     message: '保存中…',
                 });
                 if (this.ywid && !this.formModel[this.conf.primaryKeyName]) nativeFormData.append(this.conf.primaryKeyName || 'id', this.ywid)
-                request({
+                this.$request({
                     url: this.saveUrl,
                     method: 'POST',
                     data: nativeFormData

package/src/components/appForm/Radio.vue

@@ -48,7 +48,7 @@ export default {
         // 加载字典数据
         async loadDictData(dictType, dictLylx) {
             try {
-                const response = await getDicts(dictType, dictLylx);
+                const response = await getDicts(this.$request, dictType, dictLylx);
                 this.selectOptions = (response.rows || response.data || []).map(item => ({
                     value: item.dictValue,
                     label: item.dictLabel,

package/src/components/appForm/apiPopup.vue

@@ -114,7 +114,7 @@ export default {
             this.$emit('close')
         },
         getTableData() {
-            getData(this.tableApi.url, this.tableApi.params).then(res => {
+            getData(this.$request, this.tableApi.url, this.tableApi.params).then(res => {
                 if (res.code == 0) {
                     this.tableData = res.rows
                     // this.tableData = res.rows.map((item, index) => {

package/src/components/appForm/select.vue

@@ -34,7 +34,7 @@
 </template>
 
 <script>
-import { getDicts } from '@/api/dict/data'
+import { getDicts } from '@/api/dict/app-data'
 import baseMixin from './baseMixin.js'
 import eventsMixin from '../form/form-event-mixin.js'
 
@@ -116,7 +116,7 @@ export default {
         // 加载字典数据
         async loadDictData(dictType, dictLylx) {
             try {
-                const response = await getDicts(dictType, dictLylx);
+                const response = await getDicts(this.$request, dictType, dictLylx);
                 this.selectOptions = (response.rows || response.data || []).map(item => ({
                     value: item.dictValue,
                     label: item.dictLabel,

package/src/views/build/viewAppForm.vue

@@ -4,13 +4,12 @@
         <c-app-form :conf="formConf" ref="cform" :model="formConf.model || {}" :openType="openType"
             :singleUploadList="singleUploadList" :multiplySingleUploadList="multiplySingleUploadList"
             @updateItem="updateItem" class="app-form">
-            <div class="app-wrap scroll-wrap">
-                <div style="padding:15px">
-                    <app-form-item v-for="element in hiddenList" :key="element.renderKey" :element="element"
-                        :form-conf="formConf" @updateItem="updateItem" />
-                    <app-form-item v-for="element in filterDrawingList" :key="element.renderKey" :element="element"
-                        :form-conf="formConf" @updateItem="updateItem" />
-                </div>
+            <div class="app-page-wrap scroll-wrap">
+                <app-form-item v-for="element in hiddenList" :key="element.renderKey" :element="element"
+                    :form-conf="formConf" @updateItem="updateItem" />
+                <app-form-item v-for="element in filterDrawingList" :key="element.renderKey" :element="element"
+                    :form-conf="formConf" @updateItem="updateItem" />
+
             </div>
             <van-goods-action ref="detailBtns" v-if="formConf.buttons" class="bottom-btns">
                 <app-form-item v-for="element in formConf.buttons" :key="element.renderKey" :element="element"
@@ -21,7 +20,6 @@
 </template>
 <script>
 import { baseComponents } from '@/utils/generator/config'
-import { mapActions, mapState } from 'vuex'
 import AppFormItem from './AppFormItem.vue'
 import { getFormData, getFormInitData, getViewData } from '@/api/app-form'
 import { findFirstNodeByNameAndSjbName } from '@/utils/index'
@@ -56,7 +54,6 @@ export default {
         }
     },
     computed: {
-        ...mapState('user', ['userInfo']),
         hiddenList() {
             return this.drawingList.filter(item => item.noDrag)
         },
@@ -123,9 +120,7 @@ export default {
         }
     },
     created() {
-        if (!this.userInfo || !this.userInfo.userId) {
-            this.fetchUserInfo()
-        }
+
         if (this.formData) {
             this.formConf = this.formData
             this.drawingList = this.formData.fields
@@ -145,10 +140,9 @@ export default {
 
     },
     methods: {
-        ...mapActions('user', ['fetchUserInfo']),
         initData(formId, buttonCode, ywid) {
             // 原有接口请求逻辑不变
-            getFormData({ id: formId }).then(res => {
+            getFormData(this.$request, { id: formId }).then(res => {
                 if (res.code == 0) {
                     const data = res.data;
                     const formCode = data.formCode
@@ -178,7 +172,7 @@ export default {
                         this.paddingBottom = '0px';
                     }
                     if (this.formConf.mode == 'add') {
-                        if (formCode) getFormInitData({ formCode }).then(res => {
+                        if (formCode) getFormInitData(this.$request, { formCode }).then(res => {
                             if (res.code == 0) {
                                 this.formConf.model = res.data
                             }
@@ -187,21 +181,10 @@ export default {
                     else if (this.formConf.mode == 'edit' || this.formConf.mode == 'view') {
                         //编辑
                         if (!ywid) {
-                            $.modal.confirm('编辑状态下未从URL中获取到表单ywid,是否返回?', () => {
-                                //关闭当前页面
-                                //根据页面打开方式
-                                if (this.openType == 'dialog') {
-                                    var index = parent.layer.getFrameIndex(window.name); // 获取当前层的索引
-                                    parent.layer.close(index);
-                                } else if (this.openType == 'blank') {
-                                    window.close();
-                                } else {
-                                    $.modal.closeTab();
-                                }
-                            })
+                            this.goBack();
                         } else if (formCode && ywid) {
                             //获取表单数据
-                            getViewData({ formCode, id: ywid }).then(res => {
+                            getViewData(this.$request, { formCode, id: ywid }).then(res => {
                                 if (res.code == 0) {
                                     this.formConf.model = res.data
                                     let uploadData = {}