npm - cloud-web-corejs - Versions diffs - 1.0.54-dev.13 → 1.0.54-dev.131 - Mend

cloud-web-corejs 1.0.54-dev.13 → 1.0.54-dev.131

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (170) hide show

package/src/components/xform/form-designer/form-widget/dialog/preformDialog.vue CHANGED Viewed

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    title="表单提交"
+    :title="$t1('提交内容')"
     :visible.sync="showDialog"
     :modal-append-to-body="false"
     :close-on-click-modal="false"
@@ -18,7 +18,7 @@
             <th>
                 <span class="t">
                   <em class="f-red">*</em>
-                  {{ $t1('备注') }}
+                  {{ $t1('内容') }}
                 </span>
             </th>
             <td>

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

@@ -156,6 +156,7 @@ export default {
     }
     this.selectMulti = this.option.multiple ?? true;
+    this.dataTableOption.config.checkboxConfig.showHeader = this.selectMulti;
     this.getReportTemplate();
   },
   methods: {
@@ -189,7 +190,9 @@ export default {
           }
           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;
@@ -205,6 +208,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() {

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

@@ -79,8 +79,12 @@ 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)
         }
       };
     }

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

@@ -11,9 +11,9 @@
                             :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 field.options.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,17 @@
     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";
+      },
     },
     beforeCreate() {
       /* 这里不能访问方法和属性！！ */
@@ -78,8 +83,8 @@
       /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
          需要在父组件created中初始化！！ */
       this.handleCreatedEnterEvent();
-      this.initOptionItems()
       this.initFieldModel()
+      this.initOptionItems()
       this.registerToRefList()
       this.initEventHandler()
       this.buildFieldRules()

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

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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>