优化

lib/vue-form-making/src/components/Container.vue

@@ -388,7 +388,7 @@ export default {
         list: [],
         config: {
           labelWidth: 80,
-          labelPosition: 'right',
+          labelPosition: 'left',
           size: 'default',
           customClass: '',
           ui: 'element',

lib/vue-form-making/src/components/FormConfig.vue

@@ -2,12 +2,12 @@
 <el-scrollbar style="height: 100%;">
   <div class="form-config-container">
     <el-form label-position="top" size="small">
-      <el-form-item label="UI">
-        <el-radio-group v-model="data.ui">
-          <el-radio-button label="element">Element</el-radio-button>
-          <el-radio-button label="antd">Ant Design</el-radio-button>
-        </el-radio-group>
-      </el-form-item>
+<!--      <el-form-item label="UI">-->
+<!--        <el-radio-group v-model="data.ui">-->
+<!--          <el-radio-button label="element">Element</el-radio-button>-->
+<!--          <el-radio-button label="antd">Ant Design</el-radio-button>-->
+<!--        </el-radio-group>-->
+<!--      </el-form-item>-->
       <el-form-item :label="$t('fm.config.form.width')" >
         <el-input v-model="data.width" clearable :disabled="isMobile()"></el-input>
       </el-form-item>
@@ -18,8 +18,8 @@
           <el-radio-button label="top">{{$t('fm.config.form.labelPosition.top')}}</el-radio-button>
         </el-radio-group>
       </el-form-item>
-      
-        
+
+
       <el-form-item :label="$t('fm.config.form.labelWidth')">
         <el-input-number v-model="data.labelWidth" :min="0" :max="200" :step="10"></el-input-number>
       </el-form-item>
@@ -31,18 +31,18 @@
         <el-switch v-model="data.labelSuffix"></el-switch>
       </el-form-item>
 
-      <el-form-item :label="$t('fm.config.form.size')">
-        <el-radio-group v-model="data.size" v-if="data.ui == 'element'">
-          <el-radio-button label="large">large</el-radio-button>
-          <el-radio-button label="default">small</el-radio-button>
-          <el-radio-button label="small">mini</el-radio-button>
-        </el-radio-group>
-        <el-radio-group v-model="data.size" v-if="data.ui == 'antd'">
-          <el-radio-button label="large">large</el-radio-button>
-          <el-radio-button label="default">default</el-radio-button>
-          <el-radio-button label="small">small</el-radio-button>
-        </el-radio-group>
-      </el-form-item>
+<!--      <el-form-item :label="$t('fm.config.form.size')">-->
+<!--        <el-radio-group v-model="data.size" v-if="data.ui == 'element'">-->
+<!--          <el-radio-button label="large">large</el-radio-button>-->
+<!--          <el-radio-button label="default">small</el-radio-button>-->
+<!--          <el-radio-button label="small">mini</el-radio-button>-->
+<!--        </el-radio-group>-->
+<!--        <el-radio-group v-model="data.size" v-if="data.ui == 'antd'">-->
+<!--          <el-radio-button label="large">large</el-radio-button>-->
+<!--          <el-radio-button label="default">default</el-radio-button>-->
+<!--          <el-radio-button label="small">small</el-radio-button>-->
+<!--        </el-radio-group>-->
+<!--      </el-form-item>-->
 
       <el-form-item :label="$t('fm.config.form.styleSheets')">
         <el-button style="width: 100%;" @click="handleSetStyleSheets">{{$t('fm.config.widget.setting')}}</el-button>
@@ -160,7 +160,7 @@ export default {
     editDatasource (datasource) {
       this.data.dataSource = this.data.dataSource || []
       this.$refs.dataSourceDialog.open(this.data.dataSource, datasource)
-      
+
     },
 
     editScript (eventName, eventKey) {

src/BIZComponents/processSubmitDialog/processSubmitDialog.vue

@@ -341,7 +341,7 @@ this.postOptions.push(...response.data);
         //let info = await getProcessDefinitionInfo({ id: businessKey });
         this.form.LCFL = info?.category;
         this.form.FQLC = info?.id;
-        this.form.name = info?.name;
+        this.form.name = this.title;
         this.form.key = info?.key;
         if (this.form.LCFL) await this.getProcessList(this.form.LCFL);
       },

src/views/bpm/collaborative/index.vue

@@ -116,7 +116,7 @@
                 {{ getDateTime(row.durationInMillis) }}
               </template>
               <template v-slot:name="{ row }">
-                <el-link type="primary" :underline="false" @click="handleAudit(row)">
+                <el-link type="primary" :underline="false" @click="handleDetail(row)">
                   {{ row.name }}
                 </el-link
                 >
@@ -288,7 +288,7 @@
                 {{ getDateTime(row.durationInMillis) }}
               </template>
               <template v-slot:name="{ row }">
-                <el-link type="primary" :underline="false" @click="handleAudit(row)">
+                <el-link type="primary" :underline="false" @click="handleDetail(row)">
                   {{ row.name }}
                 </el-link
                 >
@@ -431,7 +431,7 @@
                 {{ getDateTime(row.durationInMillis) }}
               </template>
               <template v-slot:name="{ row }">
-                <el-link type="primary" :underline="false" @click="handleAudit(row)">
+                <el-link type="primary" :underline="false" @click="handleDetail(row)">
                   {{ row.name }}
                 </el-link
                 >
@@ -455,7 +455,9 @@
     </el-card>
     <process-submit-dialog :process-submit-dialog-flag.sync="processSubmitDialogFlag" v-if="processSubmitDialogFlag"
                            ref="processSubmitDialogRef" @reload="reload"></process-submit-dialog>
+
     <detail ref="detailRef"></detail>
+    <formDetail v-if="formDetailDialogFlag" ref="formDetailDialogRef" :form-detail-dialog-flag.sync="formDetailDialogFlag"></formDetail>
   </div>
 </template>
 <script>
@@ -469,6 +471,7 @@ import {
 import {getDate} from "@/utils/dateUtils";
 import dictMixins from "@/mixins/dictMixins";
 import detail from "@/views/bpm/processInstance/detail.vue";
+import formDetail from './detail.vue'
 import {getByCode} from "@/api/system/dictionary-data";
 import {getFile} from "@/api/system/file";
 import {getUserPage} from '@/api/tickets';
@@ -483,12 +486,14 @@ export default {
   name: "index",
   components: {
     detail,
+    formDetail
   },
   mixins: [dictMixins],
   data() {
     return {
       configFormDialogFlag: false,
       processSubmitDialogFlag: false,
+      formDetailDialogFlag: false,
       templateList: {},
       dictList: {},
       defaultTemplateList: [],
@@ -573,16 +578,16 @@ export default {
         //   showOverflowTooltip: true,
         //   minWidth: 130
         // },
-        // {
-        //   columnKey: 'action',
-        //   label: '操作',
-        //   width: 230,
-        //   align: 'center',
-        //   resizable: false,
-        //   slot: 'action',
-        //   showOverflowTooltip: true,
-        //   fixed: 'right'
-        // }
+        {
+          columnKey: 'action',
+          label: '操作',
+          width: 100,
+          align: 'center',
+          resizable: false,
+          slot: 'action',
+          showOverflowTooltip: true,
+          fixed: 'right'
+        }
       ]
     },
     deptColumns() {
@@ -856,10 +861,18 @@ export default {
       this.params.formId = this.defaultTemplateList[0]?.id
       this.noticeReload();
     },
-    /** 处理审批按钮 */
+    /**  */
     handleAudit(row) {
       this.$refs.detailRef.open(row.id);
     },
+    /**  */
+    handleDetail(row) {
+      this.formDetailDialogFlag = true
+      this.$nextTick(()=>{
+        this.$refs.formDetailDialogRef.open(row);
+      })
+
+    },
     getTimelineItemType(result) {
       if (result === '通过') {
         return 'success';

src/views/bpm/handleTask/formParser/formParserDialog.vue

@@ -8,18 +8,6 @@
     append-to-body
     :before-close="cancel"
   >
-<!--    <parser-->
-<!--      style="-->
-<!--            padding: 10px;-->
-<!--            height: 80%;-->
-<!--            overflow-y: auto;-->
-<!--            margin-right: 0px;-->
-<!--            margin-left: 0; "-->
-<!--      v-if="Object.keys(form?.formJson || {}).length !== 0"-->
-<!--      :form-conf="form.formJson"-->
-<!--      :value="form.valueJson"-->
-<!--      ref="parser"-->
-<!--    />-->
     <fm-generate-form
       v-if="Object.keys(form?.formJson || {}).length !== 0"
       :data="JSON.parse(form.formJson.makingJson)"