cloud-web-corejs 1.0.276 → 1.0.277

package/src/views/bd/setting/table_model/mixins/zdDialog.js

@@ -54,6 +54,9 @@ modules = {
             ...this.param,
           };
         },
+        callback: (rows) => {
+          this.restoreChecked(rows);
+        },
         columns: [
           { type: "checkbox", width: 48, resizable: false, fixed: "left" },
           {
@@ -111,6 +114,35 @@ modules = {
         that.vxeOption = opts;
       });
     },
+    /**
+     * 列表每次查询完，把已选中的字段重新勾上。
+     *
+     * selectDialogMixins.initSetting 只把 rows 播种进 checkRows（右侧已选列表），
+     * 表格自身的勾选状态没人恢复 —— 不补这一步，弹框打开时左边一个勾都没有，
+     * 用户再勾一个新字段就会把原有的显示字段整组顶掉。
+     */
+    restoreChecked(rows) {
+      let checkRows = this.checkRows;
+      if (!checkRows || !checkRows.length || !rows || !rows.length) {
+        return;
+      }
+      let fieldKey = this.fieldKey;
+      let keys = checkRows.map((item) => item[fieldKey]);
+      let targetRows = rows.filter((row) => keys.includes(row[fieldKey]));
+      if (!targetRows.length) {
+        return;
+      }
+      // 回填进来的可能只是 { taZdMc } 这样的占位行，用列表里的真实行替换掉，
+      // 保证「确定」抛给调用方的是带 zdEn / zdCh 的完整数据
+      this.checkRows = checkRows.map((item) => {
+        let real = targetRows.find((row) => row[fieldKey] === item[fieldKey]);
+        return real || item;
+      });
+      let $grid = this.$refs[this.defaultTableRefName];
+      if ($grid && $grid.setCheckboxRow) {
+        $grid.setCheckboxRow(targetRows, true);
+      }
+    },
   },
 };
 export default modules;

package/src/views/support/export_template/list.vue

@@ -41,7 +41,7 @@
                     type="text"
                     status="primary"
                     plain
-                  >{{ $t1('重置') }}
+                  >{{ $t1('刷新') }}
                   </vxe-button>
                   <vxe-button
                     status="warning"

package/src/views/user/company_info/edit.vue

@@ -3,87 +3,149 @@
     <el-form ref="editForm" :model="companyInfo">
       <div class="d-header clearfix">
         <div class="fl">
-          <i class="el-icon-info"/>
-          {{ $t1('查看组织信息') }}
+          <i class="el-icon-info" />
+          {{ $t1("查看组织信息") }}
         </div>
         <div class="fr">
-          <el-button type="primary" plain class="button-sty" @click="$baseReload()" icon="el-icon-refresh-right">
-            {{ $t1('重置') }}
+          <el-button
+            type="primary"
+            plain
+            class="button-sty"
+            @click="$baseReload()"
+            icon="el-icon-refresh-right"
+          >
+            {{ $t1("重置") }}
           </el-button>
-          <el-button type="primary" class="button-sty" icon="el-icon-check" @click="saveData">{{ $t1('保存') }}
+          <el-button
+            type="primary"
+            class="button-sty"
+            icon="el-icon-check"
+            @click="saveData"
+            >{{ $t1("保存") }}
           </el-button>
         </div>
       </div>
       <div class="d-cont">
         <div class="d-item">
-          <div class="title first"><b>{{ $t1('基本信息') }}</b></div>
+          <div class="title first">
+            <b>{{ $t1("基本信息") }}</b>
+          </div>
           <table class="table-detail">
             <tbody>
-            <tr>
-              <th>
-                <em class="f-red">*</em>
-                {{ $t1('组织全称') }}
-              </th>
-              <td>
-                <el-form-item prop="companyName" :rules="[{ required: true, trigger: 'blur' }]">
-                  <el-input type="text" autocomplete="off" v-model="companyInfo.companyName" clearable/>
-                </el-form-item>
-              </td>
-              <th>
-                <em class="f-red">*</em>
-                {{ $t1('组织简称') }}
-              </th>
-              <td>
-                <el-form-item prop="simpleName" :rules="[{ required: true, trigger: 'blur' }]">
-                  <el-input type="text" autocomplete="off" v-model="companyInfo.simpleName" clearable/>
-                </el-form-item>
-              </td>
-              <th>
-                <em class="f-red">*</em>
-                {{ $t1('组织编码') }}
-              </th>
-              <td>{{ companyInfo.companyCode }}</td>
-            </tr>
-            <tr>
-              <th>
-                {{ $t1('组织默认首页') }}
-              </th>
-              <td colspan="3">
-                <el-form-item prop="defaultHomePage" :rules="[{ required: false, trigger: 'blur' }]">
-                  <el-input type="text" autocomplete="off" v-model="companyInfo.defaultHomePage" clearable/>
-                </el-form-item>
-              </td>
-              <th>
-                <em class="f-red">*</em>
-                {{ $t1('组织唯一标志') }}
-              </th>
-              <td colspan="3">{{ companyInfo.uniqueIdentify }}</td>
-            </tr>
-            <tr>
-              <th>{{ $t1('备注') }}</th>
-              <td colspan="5">
-                <el-input type="textarea" :rows="2" :placeholder="$t1('请输入内容')" size="small"
-                          v-model="companyInfo.note"
-                          clearable></el-input>
-              </td>
-            </tr>
-            <tr>
-              <th>logo</th>
-              <td colspan="5">
-                <baseUpload :limit="1" accept="image/png, image/jpeg" multi="false" :file.sync="companyInfo.logoUrl"
-                            dataType="medium"></baseUpload>
-              </td>
-            </tr>
-            <tr>
-              <th>{{ $t1('创建人') }}</th>
-              <td>{{ companyInfo.createBy }}</td>
-              <th>{{ $t1('创建时间') }}</th>
-              <td>{{ companyInfo.createDate }}</td>
-              <th>{{ $t1('更新人') }}</th>
-              <td>{{ companyInfo.modifyBy }}</td>
-              <th>{{ $t1('更新时间') }}</th>
-              <td>{{ companyInfo.modifyDate }}</td>
-            </tr>
+              <tr></tr>
+              <tr>
+                <th>
+                  <em class="f-red">*</em>
+                  {{ $t1("组织全称") }}
+                </th>
+                <td>
+                  <el-form-item
+                    prop="companyName"
+                    :rules="[{ required: true, trigger: 'blur' }]"
+                  >
+                    <el-input
+                      type="text"
+                      autocomplete="off"
+                      v-model="companyInfo.companyName"
+                      clearable
+                    />
+                  </el-form-item>
+                </td>
+                <th>
+                  <em class="f-red">*</em>
+                  {{ $t1("组织简称") }}
+                </th>
+                <td>
+                  <el-form-item
+                    prop="simpleName"
+                    :rules="[{ required: true, trigger: 'blur' }]"
+                  >
+                    <el-input
+                      type="text"
+                      autocomplete="off"
+                      v-model="companyInfo.simpleName"
+                      clearable
+                    />
+                  </el-form-item>
+                </td>
+                <th>
+                  <em class="f-red">*</em>
+                  {{ $t1("组织编码") }}
+                </th>
+                <td>{{ companyInfo.companyCode }}</td>
+              </tr>
+              <tr></tr>
+              <tr>
+                <th>
+                  {{ $t1("组织默认首页") }}
+                </th>
+                <td colspan="3">
+                  <el-form-item
+                    prop="defaultHomePage"
+                    :rules="[{ required: false, trigger: 'blur' }]"
+                  >
+                    <el-input
+                      type="text"
+                      autocomplete="off"
+                      v-model="companyInfo.defaultHomePage"
+                      clearable
+                    />
+                  </el-form-item>
+                </td>
+                <th>{{ $t1("环境编码") }}</th>
+                <td>
+                  <el-form-item prop="envCode">
+                    <el-input
+                      type="text"
+                      autocomplete="off"
+                      v-model="companyInfo.envCode"
+                      clearable
+                    />
+                  </el-form-item>
+                </td>
+              </tr>
+              <tr>
+                <th>{{ $t1("备注") }}</th>
+                <td colspan="5">
+                  <el-input
+                    type="textarea"
+                    :rows="2"
+                    :placeholder="$t1('请输入内容')"
+                    size="small"
+                    v-model="companyInfo.note"
+                    clearable
+                  ></el-input>
+                </td>
+              </tr>
+              <tr>
+                <th>logo</th>
+                <td colspan="5">
+                  <baseUpload
+                    :limit="1"
+                    accept="image/png, image/jpeg"
+                    multi="false"
+                    :file.sync="companyInfo.logoUrl"
+                    dataType="medium"
+                  ></baseUpload>
+                </td>
+              </tr>
+              <tr>
+                <th>
+                  <em class="f-red">*</em>
+                  {{ $t1("组织唯一标志") }}
+                </th>
+                <td colspan="3">{{ companyInfo.uniqueIdentify }}</td>
+              </tr>
+              <tr>
+                <th>{{ $t1("创建人") }}</th>
+                <td>{{ companyInfo.createBy }}</td>
+                <th>{{ $t1("创建时间") }}</th>
+                <td>{{ companyInfo.createDate }}</td>
+                <th>{{ $t1("更新人") }}</th>
+                <td>{{ companyInfo.modifyBy }}</td>
+                <th>{{ $t1("更新时间") }}</th>
+                <td>{{ companyInfo.modifyDate }}</td>
+              </tr>
             </tbody>
           </table>
         </div>
@@ -94,7 +156,7 @@
 
 <script>
 export default {
-  name: 'company_info:view',
+  name: "company_info:view",
   components: {},
   data() {
     return {
@@ -102,11 +164,10 @@ export default {
       isEdit: false,
       companyInfo: {},
       showAreaDialog: false,
-      activeName: 'first'
+      activeName: "first",
     };
   },
-  created() {
-  },
+  created() {},
   mounted() {
     this.getData();
   },
@@ -114,43 +175,43 @@ export default {
     getData() {
       this.isEdit = true;
       this.$commonHttp({
-        url: USER_PREFIX + '/company_info/getCurrent',
+        url: USER_PREFIX + "/company_info/getCurrent",
         method: `post`,
         isLoading: true,
         modalStrictly: true,
-        success: res => {
+        success: (res) => {
           this.companyInfo = res.objx || {};
-        }
+        },
       });
     },
     saveData() {
-      this.$refs.editForm.$baseValidate(valid => {
+      this.$refs.editForm.$baseValidate((valid) => {
         if (valid) {
-          this.$baseConfirm(this.$t1('您确定要保存吗？')).then(() => {
-            var url = USER_PREFIX + '/company_info/update';
+          this.$baseConfirm(this.$t1("您确定要保存吗？")).then(() => {
+            var url = USER_PREFIX + "/company_info/update";
             this.$http({
               url: url,
               method: `post`,
               data: this.companyInfo,
               isLoading: true,
-              success: res => {
+              success: (res) => {
                 if (this.isEdit) {
                   //更新
                   this.$message({
                     message: res.content,
-                    type: 'success',
+                    type: "success",
                     duration: 500,
-                    onClose: t => {
+                    onClose: (t) => {
                       this.$baseReload();
-                    }
+                    },
                   });
                 }
-              }
+              },
             });
           });
         }
       });
-    }
-  }
+    },
+  },
 };
 </script>

package/src/views/user/form/form_template/dialog.vue

@@ -27,7 +27,7 @@
           <div class="clearfix screen-btns">
             <div class="fr">
               <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
-                          plain>{{ $t1('重置') }}
+                          plain>{{ $t1('刷新') }}
               </vxe-button>
               <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">
                 {{ $t1('搜索') }}

package/src/views/user/form/form_template/itemList.vue

@@ -21,7 +21,7 @@
                 </div>
                 <div class="fr">
                   <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
-                              plain>{{$t1('重置')}}
+                              plain>{{$t1('刷新')}}
                   </vxe-button>
                   <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">{{ $t1('搜索') }}
                   </vxe-button>

package/src/views/user/form/form_template/list.vue

@@ -53,7 +53,7 @@
                   </div>
                   <div class="fr">
                     <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
-                                plain>{{$t1('重置')}}
+                                plain>{{$t1('刷新')}}
                     </vxe-button>
                     <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">{{ $t1('搜索') }}
                     </vxe-button>

package/src/views/user/form/form_template_field/dialog.vue

@@ -27,7 +27,7 @@
           <div class="clearfix screen-btns">
             <div class="fr">
               <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
-                          plain>{{$t1('重置')}}
+                          plain>{{$t1('刷新')}}
               </vxe-button>
               <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">
                 {{ $t1('搜索') }}

package/src/views/user/form/form_type/dialog.vue

@@ -27,7 +27,7 @@
           <div class="clearfix screen-btns">
             <div class="fr">
               <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
-                          plain>{{ $t1('重置') }}
+                          plain>{{ $t1('刷新') }}
               </vxe-button>
               <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">
                 {{ $t1('搜索') }}

package/src/views/user/form/form_type/list.vue

@@ -18,7 +18,7 @@
                 </div>
                 <div class="fr">
                   <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
-                              plain>{{ $t1('重置') }}
+                              plain>{{ $t1('刷新') }}
                   </vxe-button>
                   <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">
                     {{ $t1('搜索') }}

package/src/views/user/form/report_requestaccess/dialog.vue

@@ -27,7 +27,7 @@
           <div class="clearfix screen-btns">
             <div class="fr">
               <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
-                          plain>{{ $t1('重置') }}
+                          plain>{{ $t1('刷新') }}
               </vxe-button>
               <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">
                 {{ $t1('搜索') }}

package/src/views/user/form/report_requestaccess/list.vue

@@ -20,7 +20,7 @@
                 </div>
                 <div class="fr">
                   <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
-                              plain>{{ $t1('重置') }}
+                              plain>{{ $t1('刷新') }}
                   </vxe-button>
                   <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">
                     {{ $t1('搜索') }}

package/src/views/user/form/vform/designer.vue

@@ -30,6 +30,7 @@ export default {
   name: "vform-designer:edit",
   props: {
     formCode: String,
+    id: [String, Number],
     readonly: Boolean,
     formTemplate: Object,
     widgetList: Array,
@@ -106,28 +107,56 @@ export default {
           this.$refs.designer.setFormJson(this.reportTemplate.formViewContent);
         });
       } else {
-        this.$http({
-          aes: true,
-          url: USER_PREFIX + `/formTemplate/getByFormCode`,
-          method: `post`,
-          data: {
-            stringOne: this.formCode,
-          },
-          isLoading: true,
-          modalStrictly: true,
-          success: (res) => {
-            if (!res.objx) {
-              this.$baseAlert(this.$t1("获取报表模板失败"));
-              return;
-            }
-            let reportTemplate = res.objx || {};
-            this.reportTemplate = reportTemplate;
-            this.showDesinger = true;
-            this.$nextTick(() => {
-              this.$refs.designer.setFormJson(reportTemplate.formViewContent);
-            });
-          },
-        });
+        let id = this.id || this.formTemplate?.id;
+        if (id) {
+          this.$http({
+            aes: true,
+            url: USER_PREFIX + `/formTemplate/get`,
+            method: `post`,
+            data: {
+              id,
+            },
+            isLoading: true,
+            modalStrictly: true,
+            success: (res) => {
+              if (!res.objx) {
+                this.$baseAlert(this.$t1("获取报表模板失败"));
+                return;
+              }
+              let reportTemplate = res.objx || {};
+              this.reportTemplate = reportTemplate;
+              this.showDesinger = true;
+              this.$nextTick(() => {
+                this.$refs.designer.setFormJson(reportTemplate.formViewContent);
+              });
+            },
+          });
+        } else if (this.formCode) {
+          this.$http({
+            aes: true,
+            url: USER_PREFIX + `/formTemplate/getByFormCode`,
+            method: `post`,
+            data: {
+              stringOne: this.formCode,
+            },
+            isLoading: true,
+            modalStrictly: true,
+            success: (res) => {
+              if (!res.objx) {
+                this.$baseAlert(this.$t1("获取报表模板失败"));
+                return;
+              }
+              let reportTemplate = res.objx || {};
+              this.reportTemplate = reportTemplate;
+              this.showDesinger = true;
+              this.$nextTick(() => {
+                this.$refs.designer.setFormJson(reportTemplate.formViewContent);
+              });
+            },
+          });
+        } else {
+          this.$baseAlert(this.$t1("获取报表模板失败"));
+        }
       }
     },
     loadFieldListData(res) {

package/src/views/user/form/vform/render.vue

@@ -18,8 +18,10 @@
         visible-key="showRender"
         :visiable.sync="showRender"
         :parent-target="_self"
-        @reload="$baseReload()"
-        :dataId.sync="dataId"
+        @reload="forwardReload"
+        :dataId="dataId"
+        @update:dataId="$emit('update:dataId', $event)"
+        @update:formCode="$emit('update:formCode', $event)"
         :param="param"
         v-bind="$attrs"
         @openCopyEditTab="openCopyEditTab"
@@ -59,6 +61,19 @@ export default {
     this.getReportTemplate();
   },
   methods: {
+    forwardReload(target, option) {
+      let reloadListener = this.$listeners?.reload;
+      if (Array.isArray(reloadListener)) {
+        return Promise.all(
+          reloadListener.map((listener) => listener(this, option))
+        );
+      }
+      if (typeof reloadListener === "function") {
+        return reloadListener(this, option);
+      }
+      this.$emit("reload", this, option);
+      return Promise.resolve();
+    },
     dataTableSearch() {
       let gridRef = this.$refs.vFormRef.getGridWidgetRef()
       if(!gridRef)return
@@ -105,6 +120,10 @@ export default {
           this.formJson = formTemplate.formViewContent
             ? JSON.parse(formTemplate.formViewContent)
             : {};
+          if (!this.formJson.formConfig) {
+            this.$message.error(`表单模板不存在或内容为空: ${this.formCode}`);
+            return;
+          }
           this.layoutType = this.formJson.formConfig.layoutType;
           this.getFormInsData2();
         },
@@ -142,27 +161,6 @@ export default {
         this.showRender = true;
       }
     },
-    async getFormInsData() {
-      let formConfig = this.formJson.formConfig;
-      let getConfig = formConfig.getConfig || {};
-      let dataId = this.dataId;
-      if (dataId) {
-        let reqParam = { id: dataId };
-        let accessParamArguments = [{ name: "id", value: dataId }];
-        this.scriptHttp({
-          options: getConfig,
-          params: reqParam,
-          targetFormTemplate: this.formTemplate,
-          accessParamArguments: accessParamArguments,
-          success: (res) => {
-            let formData = res.objx || {};
-            this.formData = formData;
-            this.formInsData = res.objx;
-            this.showRender = true;
-          },
-        });
-      }
-    },
     openCopyEditTab(formData) {
       this.$emit("openCopyEditTab", formData);
     },