cloud-web-corejs 1.0.54-dev.141 → 1.0.54-dev.143

package/package.json

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

package/src/components/xform/form-designer/form-widget/dialog/formDialog.vue

@@ -10,7 +10,7 @@
       <v-form-render :form-json.sync="formJson" :form-data="formData" :option-data="optionData" ref="vFormRef"
                      :reportTemplate.sync="formTemplate" :conditionParam.sync="conditionParam"
                      :formInsData.sync="formInsData" v-if="showRender" visible-key="showRender" :parent-target="_self"
-                     @reload="reload" v-bind="formConfig" :param="dialogParam"
+                     @reload="reload" :reloadDialog="true" v-bind="formConfig" :param="dialogParam"
                      class="data-table_height"/>
     </div>
     <span slot="footer" class="dialog-footer" v-if="option.showFooter!==false" v-bind="option.footerConfig">

package/src/components/xform/form-designer/form-widget/dialog/formDrawer.vue

@@ -4,7 +4,7 @@
       <v-form-render :form-json.sync="formJson" :form-data="formData" :option-data="optionData" ref="vFormRef"
                      :reportTemplate.sync="formTemplate" :conditionParam.sync="conditionParam"
                      :formInsData.sync="formInsData" v-if="showRender" visible-key="showRender" :parent-target="_self"
-                     @reload="reload" :param="dialogParam"
+                     @reload="reload" :reloadDialog="true" :param="dialogParam"
                      class="data-table_height"/>
     </div>
     <span class="dialog-footer" v-if="option.showFooter!==false" v-bind="option.footerConfig">

package/src/components/xform/form-designer/form-widget/dialog/searchFormDialog.vue

@@ -10,7 +10,7 @@
       <v-form-render :form-json.sync="formJson" :form-data="formData" :option-data="optionData" ref="vFormRef"
                      :reportTemplate.sync="formTemplate" :conditionParam.sync="conditionParam"
                      :formInsData.sync="formInsData" v-if="showRender" visible-key="showRender" :parent-target="_self"
-                     @reload="reload" :dataTableOption="dataTableOption" v-bind="formConfig" :param="dialogParam"
+                     @reload="reload" :reloadDialog="true" :dataTableOption="dataTableOption" v-bind="formConfig" :param="dialogParam"
                      class="data-table_height"/>
     </div>
     <label id="labBtn" class="transverse">

package/src/components/xform/form-designer/setting-panel/property-editor/container-data-table/columnRenderDialog.vue

@@ -1,81 +1,56 @@
 <template>
-  <el-drawer
-    title="cc"
-    :visible.sync="showDesingerDialog"
-    :modal="false"
-    :destroy-on-close="true"
-    size="100%"
-    direction="rtl"
-    :before-close="closeFormDesignwinEvent"
-    :append-to-body="false"
-    class="designer-drawer"
-    :class="[isFullscreen ? 'is-fullscreen' : '']"
-    @close="handleFormDesignClose"
-  >
-    <el-tabs
-      v-model="formDesTabs"
-      type="card"
-      class="tab-boxOnly"
-      :stretch="true"
-    >
-      <el-tab-pane :label="$t1('设计器')" name="first">
-        <designer
-          ref="designer"
-          v-if="showDesigner"
-          @customConfirm="customConfirm"
-          :columnFlag="true"
-          :widgetList="widgetList"
-        ></designer>
-      </el-tab-pane>
-    </el-tabs>
-    <el-button
-      class="isFullIcon"
-      v-if="!isFullscreen"
-      @click="handleFullscreen"
-    >
-      <el-tooltip effect="dark" :content="$t1('全屏')" placement="top">
-        <i class="iconfont icon-quanping"></i>
-      </el-tooltip>
-    </el-button>
-    <el-button class="isFullIcon" v-else @click="handleFullscreen">
-      <el-tooltip effect="dark" :content="$t1('缩小')" placement="top">
-        <i class="iconfont icon-suoxiao"></i>
-      </el-tooltip>
-    </el-button>
-  </el-drawer>
+  <el-drawer :title="$t1('表单设计({formName})',{formName})" :visible.sync="showDesingerDialog" :modal="false"
+               :destroy-on-close="true"
+               size="100%" direction="rtl" :before-close="closeFormDesignwinEvent" :append-to-body="false"
+               class="designer-drawer" :class="[isFullscreen ? 'is-fullscreen' : '']" @close="handleFormDesignClose">
+      <el-tabs v-model="formDesTabs" type="card" class="tab-boxOnly" :stretch="true">
+        <el-tab-pane :label="$t1('设计器')" name="first">
+          <designer ref="designer" :formTemplate="formTemplate" @customConfirm="customConfirm" :columnFlag="true" :widgetList="widgetList"></designer>
+        </el-tab-pane>
+      </el-tabs>
+      <el-button class="isFullIcon" v-if="!isFullscreen" @click="handleFullscreen">
+        <el-tooltip effect="dark" :content="$t1('全屏')" placement="top">
+          <i class="iconfont icon-quanping"></i>
+        </el-tooltip>
+
+      </el-button>
+      <el-button class="isFullIcon" v-else @click="handleFullscreen">
+        <el-tooltip effect="dark" :content="$t1('缩小')" placement="top">
+          <i class="iconfont icon-suoxiao"></i>
+        </el-tooltip>
+      </el-button>
+    </el-drawer>
 </template>
 <script>
+// import designer from "@base/views/user/form/vform/designer.vue";
 export default {
   props: {
-    column: Object,
+    formTemplate: {
+      type: Object,
+      default: () => {}
+    },
+    column:Object
   },
   components: {
-    designer: import("@base/views/user/form/vform/designer.vue"),
+    designer: ()=>import("@base/views/user/form/vform/designer.vue"),
   },
-  inject: ["getReportTemplate"],
   data() {
     return {
       showDesingerDialog: true,
-      formDesTabs: "first",
+      formDesTabs: 'first',
       showFormScriptList: false,
       isFullscreen: false,
-      formCode: "",
-      formName: "",
-      widgetList: [],
-      formTemplate: null,
-      showDesigner:false
-    };
+      formCode: '',
+      formName: '',
+      widgetList: []
+    }
   },
   created() {
-    let formTemplate = this.getReportTemplate();
-    debugger
-    this.formTemplate = formTemplate;
-    this.formCode = formTemplate.formCode;
-    this.formName = formTemplate.formName;
-    this.widgetList = this.$baseLodash.cloneDeep(this.column.widgetList || []);
-    this.$nextTick(() => {
-      // this.showDesigner = true;
-    });
+    this.formCode = this.formTemplate.formCode
+    this.formName = this.formTemplate.formName
+    this.widgetList = this.$baseLodash.cloneDeep(this.column.widgetList || [])
+    this.showDesingerDialog = true
+
   },
   mounted() {
     /* this.$nextTick(() => {
@@ -84,49 +59,23 @@ export default {
   },
   methods: {
     handleFormDesignClose() {
-      this.$emit("closeFormDesignwinEvent");
+      this.$emit('closeFormDesignwinEvent')
     },
     handleFullscreen() {
-      this.isFullscreen = !this.isFullscreen;
+      this.isFullscreen = !this.isFullscreen
     },
     closeFormDesignwinEvent() {
-      this.$emit("closeFormDesignwinEvent");
+      this.$emit('closeFormDesignwinEvent')
     },
     reflushTemplateList() {
-      this.$emit("reflushTemplateList");
+      this.$emit('reflushTemplateList')
     },
-    customConfirm(formJson) {
+    customConfirm(formJson){
       let widgetList = formJson.widgetList;
       this.handleFormDesignClose();
-      this.$emit("confirm", widgetList);
-    },
-  },
-};
-</script>
-<style scoped lang="scss">
-::v-deep .tab-boxOnly > .el-tabs__header {
-  position: absolute;
-  right: 130px;
-  top: 0;
-}
+      this.$emit('confirm', widgetList)
+    }
 
-::v-deep .tab-boxOnly > .el-tabs__content .el-tab-pane .el-tab-pane {
-  .detail-wrap .d-cont {
-    height: calc(100vh - 158px) !important
-  }
-
-  .grid-height {
-    height: calc(100vh - 126px) !important
   }
 }
-
-::v-deep .designer-drawer.is-fullscreen .tab-boxOnly > .el-tabs__content .el-tab-pane .el-tab-pane {
-  .detail-wrap .d-cont {
-    height: calc(100vh - 116px) !important
-  }
-
-  .grid-height {
-    height: calc(100vh - 84px) !important
-  }
-}
-</style>
+</script>

package/src/components/xform/form-designer/setting-panel/property-editor/container-data-table/table-column-dialog.vue

@@ -13,8 +13,6 @@
       width="1220px"
       v-dialog-drag
       @closed="closeHandle"
-      :fullscreen="true"
-      :append-to-body="true"
     >
       <div class="cont">
         <el-table
@@ -356,7 +354,6 @@
           {{ i18nt("designer.hint.confirm") }}
         </el-button>
       </div>
-      <columnRenderDialog :column="currentTableColumn" v-if="showColumnRenderDialog" :visiable.sync="showColumnRenderDialog" @confirm="confirmWidgetRenderDialog"></columnRenderDialog>
     </el-dialog>
     <el-dialog
       v-if="showRenderDialogFlag"
@@ -493,6 +490,7 @@
         </el-button>
       </div>
     </el-dialog>
+    <columnRenderDialog :column="currentTableColumn" v-if="showColumnRenderDialog" :visiable.sync="showColumnRenderDialog" @confirm="confirmWidgetRenderDialog"></columnRenderDialog>
   </div>
 </template>
 <script>

package/src/components/xform/form-render/container-item/data-table-item.vue

@@ -209,7 +209,7 @@
         :field="getRowWidget(obj)"
         :form-model="globalModel.formModel"
         :designer="null"
-        :key="obj.column.params.widget.id+'-'+obj.rowIndex"
+        :key="getRowWidgetKey(obj)"
         :parent-widget="widget"
         :columnConfig="obj.column.params.columnConfig"
         :subFormRowIndex="obj.rowIndex"

package/src/components/xform/form-render/container-item/data-table-mixin.js

@@ -198,6 +198,12 @@ modules = {
       }
       return this.widgetMap[key];
     },
+    getRowWidgetKey(rowParam) {
+      let row = rowParam.row;
+      let params = rowParam.column.params;
+      let key = this.getRowRefKey(row, params.widget.options.name);
+      return key;
+    },
     getGridTableName() {
       let formCode = this.getFormRef().reportTemplate.formCode;
       let tableName = formCode + "_" + this.widget.options.name;

package/src/components/xform/form-render/indexMixin.js

@@ -1600,7 +1600,12 @@ modules = {
       return realFormData;
     },
     reloadForm(option) {
-      let target = this.$attrs['parent-target'];
+      let target = null;
+      if (this.$attrs['reloadDialog'] !== true) {
+        target = this.$attrs['parent-target'];
+      }else{
+        target = this;
+      }
       /*let updateParam= option && option.updateParam ? option.updateParam:{}
       for (let key in updateParam) {
         target.$emit("update:" + key, updateParam[key]);