cloud-web-corejs 1.0.54-dev.19 → 1.0.54-dev.191

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="$baseReload()" :dataTableOption="dataTableOption" v-bind="formConfig" :param="dialogParam"
+                     @reload="reload" :dataTableOption="dataTableOption" v-bind="formConfig" :param="dialogParam"
                      class="data-table_height"/>
     </div>
     <label id="labBtn" class="transverse">
@@ -156,9 +156,14 @@ export default {
     }
 
     this.selectMulti = this.option.multiple ?? true;
+    this.dataTableOption.config.checkboxConfig.showHeader = this.selectMulti;
     this.getReportTemplate();
   },
   methods: {
+    reload(){
+      this.showRender = false;
+      this.getReportTemplate();
+    },
     async getReportTemplate() {
       let param = {
         objTypeCode: this.$attrs.objTypeCode,
@@ -187,10 +192,12 @@ export default {
           if (formConfig.searchDialogUniqueField) {
             this.fieldKey = formConfig.searchDialogUniqueField;
           }
-          this.$nextTick(() => {
+          /*this.$nextTick(() => {
             let widgetList = this.formJson.widgetList;
-            this.$grid = this.$refs.vFormRef.getWidgetRef(widgetList[0].options.name).getGridTable();
-          })
+            setTimeout(()=>{
+              this.$grid = this.$refs.vFormRef.getWidgetRef(widgetList[0].options.name).getGridTable();
+            },200)
+          })*/
           this.initShowFormField();
           this.showRender = true;
 
@@ -198,6 +205,13 @@ export default {
         }
       });
     },
+    getGrid(){
+      if(!this.$grid){
+        let widgetList = this.formJson.widgetList;
+        this.$grid = this.$refs.vFormRef.getWidgetRef(widgetList[0].options.name).getGridTable();
+      }
+      return this.$grid;
+    },
     initShowFormField() {
       let showFormField = this.formJson.formConfig.searchDialogNameField || null;
       if (!showFormField) {
@@ -205,6 +219,8 @@ export default {
         let tableColumns = widgetList[0].options.tableColumns;
         let column = tableColumns.find(column => !!column.prop);
         this.showFormField = column.prop;
+      }else{
+        this.showFormField = showFormField
       }
     },
     async getFormInsData() {
@@ -314,7 +330,7 @@ export default {
         let selectMulti = this.selectMulti;
         let row = this.checkRows[index];
         var rowid = row[fieldKey];
-        let $grid1 = this.$grid;
+        let $grid1 = this.getGrid();
 
         let rows = $grid1.getTableData().fullData;
         let row2 = this.findTreeRowById(rows, rowid);
@@ -366,14 +382,14 @@ export default {
     },
     clearChecked() {
       if (this.currentLayoutType !== "H5") {
-        let $grid1 = this.$grid;
+        let $grid1 = this.getGrid();
         $grid1.clearCheckboxRow();
       }
       this.checkRows = [];
     },
     checkWithSubmit(obj) {
       if (!this.selectMulti) {
-        let $grid1 = this.$grid;
+        let $grid1 = this.getGrid();
         var rows = $grid1.getCheckboxRecords(true);
         if (rows && rows.length) {
           this.dialogSubmit();

package/src/components/xform/form-designer/form-widget/field-widget/baseAttachment-widget.vue

@@ -55,19 +55,23 @@ export default {
       oldFieldValue: [], //field组件change之前的值
       fieldModel: [],
       rules: [],
-      isH5: false
+      isH5: false,
+      option:{}
     }
   },
   watch: {
     fieldModel(val) {
       this.handleChangeEvent(val);
+    },
+    'option':function(){
+
     }
   },
   computed: {
     formDataId() {
       let formRef = this.getFormRef();
       return formRef.dataId;
-    },
+    }/*,
     option() {
       return {
         title: '附件',
@@ -79,11 +83,15 @@ export default {
         rows: (done) => {
           done(this.fieldModel);
         },
-        confirm: (attachments) => {
-          this.fieldModel = attachments;
+        confirm: (rows, fileInfos) => {
+          this.fieldModel = rows;
+          // this.field.options.onAfterConfirmFile && this.field.options.onAfterConfirmFile(rows, fileInfos);
+          let eventParamNames = ['attachments', 'fileInfos'];
+          let eventParamValues = [rows, fileInfos];
+          this.handleCustomEvent(this.field.options.onAfterConfirmFile, eventParamNames, eventParamValues)
         }
       };
-    }
+    }*/
   },
   beforeCreate() {
     /* 这里不能访问方法和属性！！ */
@@ -112,6 +120,7 @@ export default {
     this.buildFieldRules()
 
     this.handleOnCreated()
+    this.initOption();
   },
 
   mounted() {
@@ -122,6 +131,26 @@ export default {
     this.unregisterFromRefList()
   },
   methods: {
+    initOption(){
+      this.option = {
+        title: '附件',
+        edit: !this.field.options.disabled,
+        uploadConfig: {
+          limit: this.field.options.limit,
+          resultType: "Array"
+        },
+        rows: (done) => {
+          done(this.fieldModel);
+        },
+        confirm: (rows, fileInfos) => {
+          this.fieldModel = rows;
+          // this.field.options.onAfterConfirmFile && this.field.options.onAfterConfirmFile(rows, fileInfos);
+          let eventParamNames = ['attachments', 'fileInfos'];
+          let eventParamValues = [rows, fileInfos];
+          this.handleCustomEvent(this.field.options.onAfterConfirmFile, eventParamNames, eventParamValues)
+        }
+      }
+    },
     setValue(val) {
       let data = val || []
       this.fieldModel = data;

package/src/components/xform/form-designer/form-widget/field-widget/button-widget.vue

@@ -5,7 +5,7 @@
     <el-button ref="fieldEditor" :type="field.options.type" :size="field.options.size" class="button-sty"
                :plain="field.options.plain" :round="field.options.round"
                :circle="field.options.circle" :icon="field.options.icon"
-               :disabled="field.options.disabled"
+               :disabled="!designState &&field.options.disabled"
                @click.native="handleButtonWidgetClick">
       {{ getI18nLabel(field.options.label)}}</el-button>
   </static-content-wrapper>

package/src/components/xform/form-designer/form-widget/field-widget/checkbox-widget.vue

@@ -6,14 +6,14 @@
                        :disabled="field.options.disabled" :size="field.options.size"
                        @change="handleChangeEvent">
       <template v-if="!!field.options.buttonStyle">
-        <el-checkbox-button v-for="(item, index) in field.options.optionItems" :key="index" :label="item.value"
+        <el-checkbox-button v-for="(item, index) in optionItems" :key="index" :label="item.value"
                             :disabled="item.disabled" :border="field.options.border"
                             :style="{display: field.options.displayStyle}">{{ getI18nLabel(item.label) }}</el-checkbox-button>
       </template>
       <template v-else>
-        <el-checkbox v-for="(item, index) in field.options.optionItems" :key="index" :label="item.value"
+        <el-checkbox v-for="(item, index) in optionItems" :key="index" :label="item[valueField]"
                      :disabled="item.disabled" :border="field.options.border"
-                     :style="{display: field.options.displayStyle}">{{ getI18nLabel(item.label) }}</el-checkbox>
+                     :style="{display: field.options.displayStyle}">{{ getI18nLabel(item[labelField]) }}</el-checkbox>
       </template>
     </el-checkbox-group>
   </form-item-wrapper>
@@ -62,12 +62,20 @@
     data() {
       return {
         oldFieldValue: null, //field组件change之前的值
-        fieldModel: null,
+        fieldModel: [],
         rules: [],
       }
     },
     computed: {
-
+      labelField(){
+        return this.field.options.labelKey || "label";
+      },
+      valueField(){
+        return this.field.options.valueKey || "value";
+      },
+      optionItems(){
+        return this.getOptionItems();
+      }
     },
     beforeCreate() {
       /* 这里不能访问方法和属性！！ */
@@ -78,8 +86,8 @@
       /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
          需要在父组件created中初始化！！ */
       this.handleCreatedEnterEvent();
-      this.initOptionItems()
       this.initFieldModel()
+      this.initOptionItemsHandle()
       this.registerToRefList()
       this.initEventHandler()
       this.buildFieldRules()

package/src/components/xform/form-designer/form-widget/field-widget/date-range-widget.vue

@@ -8,6 +8,7 @@
                     :size="field.options.size"
                     :clearable="field.options.clearable" :editable="field.options.editable"
                     :format="field.options.format" :value-format="field.options.valueFormat"
+                    :default-time.sync="field.options.defaultTime"
                     :start-placeholder="getI18nLabel(field.options.startPlaceholder || '起始日期')"
                     :end-placeholder="getI18nLabel(field.options.endPlaceholder || '截止日期')"
                     @focus="handleFocusCustomEvent" @blur="handleBlurCustomEvent"

package/src/components/xform/form-designer/form-widget/field-widget/echart-bar-widget.vue

@@ -11,7 +11,7 @@
     :sub-form-row-id="subFormRowId"
     :heightStyle="pHeightStyle"
   >
-    <v-chart v-if="showChart" class="echart" :option="field.options.echarBarOption" :style="{ height: heightStyle }"/>
+    <v-chart v-if="showChart" class="echart" ref="chart" :option="field.options.echarBarOption" @click="handleButtonWidgetClick" :style="{ height: heightStyle }"/>
   </static-content-wrapper>
 </template>
 

package/src/components/xform/form-designer/form-widget/field-widget/echart-category-widget.vue

@@ -11,7 +11,7 @@
     :sub-form-row-id="subFormRowId"
     :heightStyle="pHeightStyle"
   >
-    <v-chart v-if="showChart" class="echart" :option="field.options.echarCategoryOption" :style="{ height: heightStyle }"/>
+    <v-chart v-if="showChart" class="echart" ref="chart" :option="field.options.echarCategoryOption" @click="handleButtonWidgetClick" :style="{ height: heightStyle }"/>
   </static-content-wrapper>
 </template>
 

package/src/components/xform/form-designer/form-widget/field-widget/echart-pie-widget.vue

@@ -11,7 +11,7 @@
     :sub-form-row-id="subFormRowId"
     :heightStyle="pHeightStyle"
   >
-    <v-chart v-if="showChart" class="echart" :option="field.options.echarPieOption" :style="{ height: heightStyle }"/>
+    <v-chart v-if="showChart" class="echart" ref="chart" :option="field.options.echarPieOption" @click="handleButtonWidgetClick" :style="{ height: heightStyle }"/>
   </static-content-wrapper>
 </template>