cloud-web-corejs 1.0.54-dev.146 → 1.0.54-dev.149

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

@@ -1,39 +1,38 @@
 <template>
   <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>
+             :destroy-on-close="true"
+             size="90%" direction="rtl"
+             class="designer-drawer1" :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>
+    </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";
+import PopupManager from 'element-ui/src/utils/popup/popup-manager.js'
 export default {
   props: {
-    formTemplate: {
-      type: Object,
-      default: () => {}
-    },
-    column:Object
+    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,
@@ -42,12 +41,21 @@ export default {
       isFullscreen: false,
       formCode: '',
       formName: '',
-      widgetList: []
+      widgetList: [],
+      formTemplate: null,
+      zIndex:null
     }
   },
   created() {
-    this.formCode = this.formTemplate.formCode
-    this.formName = this.formTemplate.formName
+    let zIndex = PopupManager.nextZIndex();
+    debugger
+    this.zIndex = zIndex;
+
+    let formTemplate = this.getReportTemplate();
+    this.formTemplate = formTemplate;
+    this.formCode = formTemplate.formCode
+    this.formName = formTemplate.formName
+    debugger
     this.widgetList = this.$baseLodash.cloneDeep(this.column.widgetList || [])
     this.showDesingerDialog = true
 
@@ -59,7 +67,10 @@ export default {
   },
   methods: {
     handleFormDesignClose() {
-      this.$emit('closeFormDesignwinEvent')
+      // debugger
+      // this.$emit('closeFormDesignwinEvent')
+      this.showDesingerDialog = false
+      this.$emit('update:visiable',false)
     },
     handleFullscreen() {
       this.isFullscreen = !this.isFullscreen
@@ -70,7 +81,8 @@ export default {
     reflushTemplateList() {
       this.$emit('reflushTemplateList')
     },
-    customConfirm(formJson){
+    customConfirm(formJson) {
+      debugger
       let widgetList = formJson.widgetList;
       this.handleFormDesignClose();
       this.$emit('confirm', widgetList)
@@ -79,3 +91,37 @@ export default {
   }
 }
 </script>
+<style>
+<style>
+.designer-drawer1{
+  left: 150px;
+  right: 10px;
+  bottom: 10px;
+  top: 32px;
+}
+::v-deep .tab-boxOnly > .el-tabs__header {
+  position: absolute;
+  right: 130px;
+  top: 0;
+}
+
+::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-drawer1.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>

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

@@ -127,7 +127,6 @@
                   :label="i18nt('designer.setting.customRenderGroup')"
                 >
                   <el-option value="render" label="render"></el-option>
-                  <el-option value="widgetRender" label="widgetRender"></el-option>
                 </el-option-group>
                 <el-option-group
                   v-for="t in op"
@@ -251,7 +250,7 @@
                 round=""
                 icon="el-icon-edit"
                 @click="openFormatConfigDialog(scope.row, scope.$index)"
-                :disabled="!columnFormatMap[scope.row.formatS]"
+                :disabled="!columnFormatMap[scope.row.formatS] && 'widgetRender'!== scope.row.formatS"
               ></el-button>
             </template>
           </el-table-column>
@@ -263,7 +262,7 @@
           >
             <template slot-scope="scope">
               <el-button
-                :disabled="'render' !== scope.row.formatS && 'widgetRender'!== scope.row.formatS"
+                :disabled="'render' !== scope.row.formatS"
                 size="mini"
                 plain=""
                 round=""
@@ -340,6 +339,7 @@
             </template>
           </el-table-column>
         </el-table>
+        <columnRenderDialog :column="currentTableColumn" v-if="showColumnRenderDialog" :visiable.sync="showColumnRenderDialog" @confirm="confirmWidgetRenderDialog"></columnRenderDialog>
       </div>
       <div class="dialog-footer" slot="footer">
         <el-button @click="closeHandle" class="button-sty" icon="el-icon-close">
@@ -354,6 +354,7 @@
           {{ i18nt("designer.hint.confirm") }}
         </el-button>
       </div>
+
     </el-dialog>
     <el-dialog
       v-if="showRenderDialogFlag"
@@ -367,6 +368,7 @@
       :destroy-on-close="!0"
       v-dialog-drag
       top="7vh"
+      :append-to-body="true"
     >
       <el-alert
         type="info"
@@ -490,7 +492,7 @@
         </el-button>
       </div>
     </el-dialog>
-    <columnRenderDialog :column="currentTableColumn" v-if="showColumnRenderDialog" :visiable.sync="showColumnRenderDialog" @confirm="confirmWidgetRenderDialog"></columnRenderDialog>
+
   </div>
 </template>
 <script>
@@ -586,6 +588,10 @@ export default {
               value: "editTreeButtonGroup",
               label: "编辑行按钮组",
             },
+            {
+              value: "widgetRender",
+              label: "自定义组件",
+            },
           ],
         },
         {
@@ -792,15 +798,15 @@ export default {
       this.currentTableColumn = row;
       this.showColumnRenderDialog = true
     },
-    confirmWidgetRenderDialog(formJson){
-      this.currentTableColumn.widgetList = formJson.widgetList
+    confirmWidgetRenderDialog(widgetList){
+      this.currentTableColumn.widgetList = widgetList
       this.showColumnRenderDialog = false
     },
     showRenderDialog: function (e) {
-      if(e.formatS == 'widgetRender'){
+      /*if(e.formatS == 'widgetRender'){
         this.openWidgetRenderDialog(e);
         return
-      }
+      }*/
 
       (this.currentTableColumn = e),
         (this.renderJson = e.render || ""),
@@ -1237,6 +1243,12 @@ export default {
       return { columnSelectedWidget, columnEditFields };
     },
     openFormatConfigDialog(row, index) {
+      if(row.formatS == 'widgetRender'){
+        this.openWidgetRenderDialog(row);
+        return
+      }
+
+
       let option = row.columnOption;
       let selectedWidget;
       let columnWidgetConfig = this.getColumnWidgetConfig(row);

package/src/components/xform/form-designer/setting-panel/property-editor/container-detail/detail-editor.vue

@@ -1,8 +1,8 @@
 <template>
   <div>
-    <el-form-item :label="i18nt('启用流程')">
+<!--    <el-form-item :label="i18nt('启用流程')">
       <el-switch v-model="optionModel.wfEnabled"></el-switch>
-    </el-form-item>
+    </el-form-item>-->
     <el-form-item label-width="0">
       <el-divider class="custom-divider">{{ i18nt('designer.setting.columnSetting') }}</el-divider>
     </el-form-item>

package/src/components/xform/form-designer/setting-panel/property-editor/field-button/search-dialog-event-editor.vue

@@ -58,7 +58,7 @@
       :close-on-press-escape="!1"
       :destroy-on-close="!0"
       top="5vh"
-      width="500px"
+      width="600px"
       v-dialog-drag
     >
       <div class="cont">
@@ -76,6 +76,11 @@
               <el-input v-model="scope.row.targetField"></el-input>
             </template>
           </el-table-column>
+          <el-table-column label="目标数据属性名称" width="150" prop="targetField">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.targetFormField"></el-input>
+            </template>
+          </el-table-column>
           <el-table-column label="来源字段" width="150" prop="sourceField">
             <template slot-scope="scope">
               <el-input v-model="scope.row.sourceField"></el-input>
@@ -114,6 +119,7 @@
         </el-table>
       </div>
       <div class="dialog-footer" slot="footer">
+        <span class="fl tips">注：'目标字段'与'目标数据属性名称'只需要维护一个即可。</span>
         <el-button @click="showDialog=false" class="button-sty" icon="el-icon-close">
           {{ i18nt('designer.hint.cancel') }}
         </el-button>