vue2-client 1.8.228 → 1.8.229

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.8.228",
+  "version": "1.8.229",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/common/LowCodePageRender/editorPageRender.vue

@@ -376,7 +376,8 @@ export default {
             false,
             true
           )
-          runLogic(eachEvent.logicName, param, eachEvent.serviceName).then(logicCallBackFunction(this.componentsMap))
+          runLogic(eachEvent.logicName, param, eachEvent.serviceName)
+            .then(res => { logicCallBackFunction(this.componentsMap, res) })
         } else if (eachEvent.eventType === 'changeProps') {
           const targetConfig = lowcodeUtils.getComponentConfig(eachEvent.target, this.pageConfig.page)
           targetConfig.props[eachEvent.targetKey] = data

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

@@ -1,34 +1,36 @@
 <template>
   <div :class="groups.length ? 'XFormGroupClass' : ''">
-    <a-empty v-if="groups.length === 0" description="配置走丢了"/>
-    <a-row :gutter="24" v-else style="height:100%">
-      <a-col :span="3" v-if="showLeftTab && groups.length">
-        <a-tabs tab-position="left" @change="scrollToGroup">
-          <template v-for="(item,index) in groups">
-            <a-tab-pane
-              :tab="item.describe"
-              :key="index"
-              v-if="item.describe">
-            </a-tab-pane>
-          </template>
-        </a-tabs>
-      </a-col>
-      <a-col :span="showLeftTab ? 21 : 24" class="formGroupContext">
-        <div class="group-item" :ref="`group-${index}`" :key="index" v-for="(item, index) in groups">
-          <a-row :style="{marginTop: index === 0 ? '':'8px'}">
-            <a-col :span="5">
-              <span class="xFormGroupTitle">{{ item.describe }}</span>
-            </a-col>
-          </a-row>
-          <template v-if="item.formGroupType === 'slot'">
-            <slot :name="item.slotName" :data="allFormData" :index="index">
-              <a-empty :description="`[${item.describe}:${item.slotName}]插槽没有使用`"/>
-            </slot>
-          </template>
-          <x-add-native-form @x-form-item-emit-func="emitFunc" v-else :ref="`nativeForm-${index}`"/>
-        </div>
-      </a-col>
-    </a-row>
+    <a-empty v-if="loadingErr" description="配置走丢了"/>
+    <a-spin v-else tip="正在努力加载。。。" :spinning="spinning" wrapperClassName="heigth100">
+      <a-row :gutter="24" style="height:100%">
+        <a-col :span="3" v-if="showLeftTab && groups.length">
+          <a-tabs tab-position="left" @change="scrollToGroup">
+            <template v-for="(item,index) in groups">
+              <a-tab-pane
+                :tab="item.describe"
+                :key="index"
+                v-if="item.describe">
+              </a-tab-pane>
+            </template>
+          </a-tabs>
+        </a-col>
+        <a-col :span="showLeftTab ? 21 : 24" class="formGroupContext">
+          <div class="group-item" :ref="`group-${index}`" :key="index" v-for="(item, index) in groups">
+            <a-row :style="{marginTop: index === 0 ? '':'8px'}">
+              <a-col :span="5">
+                <span class="xFormGroupTitle">{{ item.describe }}</span>
+              </a-col>
+            </a-row>
+            <template v-if="item.formGroupType === 'slot'">
+              <slot :name="item.slotName" :data="allFormData" :index="index">
+                <a-empty :description="`[${item.describe}:${item.slotName}]插槽没有使用`"/>
+              </slot>
+            </template>
+            <x-add-native-form @x-form-item-emit-func="emitFunc" v-else :ref="`nativeForm-${index}`"/>
+          </div>
+        </a-col>
+      </a-row>
+    </a-spin>
   </div>
 </template>
 
@@ -53,11 +55,13 @@ export default {
       showSubmitBtn: false,
       loading: false,
       allFormData: {},
+      businessType: {},
       env: 'prod',
+      spinning: true,
+      loadingErr: false
     }
   },
   mounted () {
-    this.initView()
   },
   props: {},
   watch: {},
@@ -75,22 +79,32 @@ export default {
      * @param serviceName 服务名
      * @param env 环境
      * @param showLeftTab 是否展示左侧索引页
+     * @param businessType 新增还是修改
      */
     init ({
            groups,
            modifyModelData = {},
            serviceName = process.env.VUE_APP_SYSTEM_NAME,
            env = 'prod',
-           showLeftTab = false
+           showLeftTab = false,
+           businessType = '新增'
          }) {
-      Object.assign(this, { groups, modifyModelData, serviceName, env, showLeftTab })
+      Object.assign(this, { groups, modifyModelData, serviceName, env, showLeftTab, businessType })
       this.initView()
     },
     // 初始化组件
     initView () {
+      this.spinning = true
+      const promises = []
       for (let i = 0; i < this.groups.length; i++) {
-        this.initData(i)
+        promises.push(this.initData(i))
       }
+      Promise.all(promises).then(() => {
+        this.spinning = false
+      }).catch(() => {
+        this.loadingErr = true
+        this.spinning = false
+      })
     },
     getNativeFormRef (group) {
       return this.groups.map((item, index) => {
@@ -123,7 +137,8 @@ export default {
           showSubmitBtn: false,
           serviceName: this.serviceName,
           modifyModelData: modifyModelData,
-          businessType: '新增',
+          fixedAddForm: modifyModelData.data,
+          businessType: this.businessType,
           ...res
         }
         params.showSubmitBtn = false
@@ -184,6 +199,14 @@ export default {
 .XFormGroupClass {
   height: 100%;
 
+  .heigth100 {
+    height: 100%;
+
+    :deep(.ant-spin-container) {
+      height: 100%;
+    }
+  }
+
   .xFormGroupTitle {
     font-size: 15px;
     font-weight: bold;

package/src/pages/lowCode/lowCodeEditor.vue

@@ -394,10 +394,11 @@
       @ok="() => { showLogicCallBackEditor = false}"
       @cancel="() => { showLogicCallBackEditor = false}"
       :visible="showLogicCallBackEditor">
-      <a-popover title="参数说明" style="margin-right: 5%">
+      <a-popover title="参数说明" style="margin-bottom: 5%">
         <template slot="content">
           <p>该方法有以下几个参数：</p>
           <p>componentsMap：所有组件注册的Map</p>
+          <p>responseData：后端的返回值</p>
         </template>
         <a-button type="primary">
           参数说明
@@ -427,7 +428,7 @@ import LowCodePageOrganization from '@vue2-client/base-client/components/common/
 // 函数编辑器显示的模板
 const JSEventFunctionTemplate = 'function(eventType, data, targetKey, sourceVM, targetVM) {\n  \n  return {\n    "eventType": eventType,\n    "data": data,\n    "targetKey": targetKey\n  }\n}'
 const LogicParamFunctionTemplate = 'function(componentData, data) {\n  \n  return {\n    \n  }\n}'
-const LogicCallBackFunctionTemplate = 'function(componentsMap) {\n  \n}'
+const LogicCallBackFunctionTemplate = 'function(componentsMap, responseData) {\n  \n}'
 
 export default {
   components: {
@@ -877,6 +878,7 @@ export default {
     // 事件编辑器中，事件类型改变
     handleEventEditorEventTypeChange (type) {
       this.eventEditorContent.eventType = type
+      this.logicParamTransferDataSource = []
       // 如果事件为运行Logic将组件加入穿梭框
       if (type === 'runLogic') {
         this.config.page.forEach(page => {
@@ -1136,6 +1138,124 @@ export default {
     this.supportedEventType = [...lowcodeComponentMixin.supportedEventType]
     // 深拷贝外侧传来的配置
     this.config = JSON.parse(JSON.stringify(this.originalConfig))
+    // this.config = {
+    //   page: [
+    //     {
+    //       id: 'KB',
+    //       type: 'page',
+    //       title: '111',
+    //       body: [
+    //         [
+    //           {
+    //             type: 'XFormTable',
+    //             span: 12,
+    //             id: 'XFormTable_BV6Nwk',
+    //             selected: false,
+    //             props: {
+    //               queryParamsName: '',
+    //               serviceName: ''
+    //             },
+    //             selfEvent: [
+    //               'action'
+    //             ]
+    //           },
+    //           {
+    //             type: 'XAddNativeForm',
+    //             span: 12,
+    //             id: 'XAddNativeForm_ekihTp',
+    //             selected: false,
+    //             props: {
+    //               configNameForLowCode: '',
+    //               systemNameForLowCode: ''
+    //             },
+    //             selfEvent: [
+    //               'onSubmit'
+    //             ]
+    //           }
+    //         ],
+    //         [
+    //           {
+    //             type: 'XTreeOne',
+    //             span: 12,
+    //             id: 'XTreeOne_szu7Al',
+    //             selected: false
+    //           },
+    //           {
+    //             type: 'XDescriptions',
+    //             span: 12,
+    //             id: 'XDescriptions_DTkbEg',
+    //             selected: false,
+    //             props: {
+    //               title: '111',
+    //               content: {
+    //                 c_f_user_phone: '2323',
+    //                 c_f_total_fee: 33356,
+    //                 c_f_address: '22',
+    //                 c_f_meterlen: 2,
+    //                 c_f_bank_card_number: '23',
+    //                 c_f_create_user: '超级管理员',
+    //                 c_f_customer: '23',
+    //                 c_f_balance: 33356,
+    //                 c_f_create_date: '2024-06-23 21:31:24',
+    //                 c_f_operator_date: '2024-06-23 21:31:24',
+    //                 c_f_total_times: 2,
+    //                 c_f_user_name: '23',
+    //                 c_f_comments: '323',
+    //                 c_id: 39,
+    //                 c_f_operatorid: '15',
+    //                 c_f_operator: '超级管理员',
+    //                 c_f_orgid: '9'
+    //               },
+    //               configName: 'Unit_Desc_Config',
+    //               serviceName: 'af-revenue',
+    //               getRealData: true
+    //             },
+    //             selfEvent: []
+    //           }
+    //         ]
+    //       ]
+    //     },
+    //     {
+    //       id: 'Fg',
+    //       type: 'page',
+    //       title: '22',
+    //       body: [
+    //         [
+    //           {
+    //             type: 'container',
+    //             span: 4,
+    //             id: 'container_ir2gR2',
+    //             selected: false
+    //           },
+    //           {
+    //             type: 'container',
+    //             span: 10,
+    //             id: 'container_xIRHGg'
+    //           },
+    //           {
+    //             type: 'container',
+    //             span: 10,
+    //             id: 'container_PT9n3Q'
+    //           }
+    //         ],
+    //         [
+    //           {
+    //             type: 'container',
+    //             span: 18,
+    //             id: 'container_q04vQr',
+    //             selected: false
+    //           },
+    //           {
+    //             type: 'container',
+    //             span: 6,
+    //             id: 'container_MKwNvz',
+    //             selected: false
+    //           }
+    //         ]
+    //       ]
+    //     }
+    //   ]
+    // }
     this.refreshOrganization()
   }
 }