cloud-web-corejs 1.0.54-dev.286 → 1.0.54-dev.287

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.286",
+  "version": "1.0.54-dev.287",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/xform/form-designer/setting-panel/form-setting.vue

@@ -160,8 +160,9 @@
             ></el-input>
           </el-form-item>
         </el-collapse-item>
+
         <el-collapse-item name="3" title="详情表单信息">
-          <el-form-item :label="i18nt('表单编码')">
+          <el-form-item :label="i18nt('查看页面表单编码')">
             <el-input
               class="search-input"
               max="200"
@@ -176,13 +177,36 @@
               <i
                 slot="suffix"
                 class="el-input__icon el-icon-search"
-                @click="showFormTemplateDialog = true"
+                @click="openFormTemplate(2)"
               ></i>
             </el-input>
           </el-form-item>
-          <el-form-item :label="i18nt('表单名称')">
+          <el-form-item :label="i18nt('查看页面表单名称')">
             {{ formConfig.editFormName }}
           </el-form-item>
+          <el-form-item :label="i18nt('新增页面表单编码')">
+            <el-input
+              class="search-input"
+              max="200"
+              v-model="formConfig.addFormCode"
+              @clear="
+                formConfig.addFormCode = null;
+                $forceUpdate();
+              "
+              v-el-readonly
+              clearable
+              placeholder="默认使用查看表单编码"
+            >
+              <i
+                slot="suffix"
+                class="el-input__icon el-icon-search"
+                @click="openFormTemplate(1)"
+              ></i>
+            </el-input>
+          </el-form-item>
+          <el-form-item :label="i18nt('新增页面表单名称')">
+            {{ formConfig.addFormName }}
+          </el-form-item>
         </el-collapse-item>
         <el-collapse-item name="4" title="查询弹框展示信息">
           <el-form-item :label="i18nt('展示字段')">
@@ -1032,11 +1056,22 @@ export default {
       this.formConfig[this.curEventName] = this.formEventHandlerCode;
       this.showFormEventDialogFlag = false;
     },
+    openFormTemplate(flag){
+      this.formTemplateFlag = flag;
+      this.showFormTemplateDialog = true;
+    },
     confirmFormTemplate(rows) {
       if (rows.length) {
         let row = rows[0];
-        this.$set(this.formConfig, "editFormCode", row.formCode);
-        this.$set(this.formConfig, "editFormName", row.formName);
+        if(this.formTemplateFlag==1){
+          //新增
+          this.$set(this.formConfig, "addFormCode", row.formCode);
+          this.$set(this.formConfig, "addFormName", row.formName);
+        }else{
+          //查看
+          this.$set(this.formConfig, "editFormCode", row.formCode);
+          this.$set(this.formConfig, "editFormName", row.formName);
+        }
       }
     },
     getEventButtonName(funStr) {