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

package/package.json

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

package/src/components/table/tableForm.vue

@@ -110,46 +110,69 @@
                           @clear="clearAdvancedSearchDialog" ref="advancedSearchDialog">
       <template #form>
         <vxe-form :model="advancedFormData" title-width="102px" :inline="true" class="adSearchForm">
-          <template v-for="(form1Field,index) in form2Fields">
-            <template v-if="!!form1Field.slot">
-              <template v-if="form1Field.formItem===false">
-                <vxe-form-item :key="form1Field.field + index">
-                  <template v-slot>
-                    <slot :name="form1Field.slot"
-                          v-bind="{slotFormData:advancedFormData,searchColumn:form1Field}"></slot>
-                  </template>
-                </vxe-form-item>
+          <template v-if="showAdvancedContent">
+            <template v-for="(form1Field,index) in form2Fields">
+              <template v-if="!!form1Field.slot">
+                <template v-if="form1Field.formItem===false">
+                  <vxe-form-item :key="form1Field.field + index">
+                    <template v-slot>
+                      <slot :name="form1Field.slot"
+                            v-bind="{slotFormData:advancedFormData,searchColumn:form1Field}"></slot>
+                    </template>
+                  </vxe-form-item>
+                </template>
+                <template v-else>
+                  <slot :name="form1Field.slot" v-bind="{slotFormData:advancedFormData,searchColumn:form1Field}"></slot>
+                </template>
               </template>
               <template v-else>
-                <slot :name="form1Field.slot" v-bind="{slotFormData:advancedFormData,searchColumn:form1Field}"></slot>
-              </template>
-            </template>
-            <template v-else>
-              <vxe-form-item :key="index" :title="form1Field.title+ ':'">
-                <template v-slot>
-                  <template v-if="form1Field.type =='input'">
-                    <el-input v-model="advancedFormData[form1Field.field]" size="small" clearable
-                              :disabled="form1Field.disabled===true"></el-input>
-                  </template>
-                  <template v-else-if="form1Field.type =='number'">
-                    <base-input-numbuer v-model="advancedFormData[form1Field.field]"
-                                        :disabled="form1Field.disabled===true"></base-input-numbuer>
-                  </template>
-                  <template v-else-if="form1Field.type =='select'">
-                    <el-select v-model="advancedFormData[form1Field.field]" size="mini" clearable
-                               :multiple="!!form1Field.multiple"
-                               :collapse-tags="!!form1Field.multiple" :disabled="form1Field.disabled===true">
-                      <el-option v-for="(item,index1) in form1Field.itemOption" :value="item.value" :label="item.label"
-                                 :key="index1"></el-option>
-                    </el-select>
-                  </template>
-                  <template v-else-if="form1Field.type =='inputBatch'">
-                    <base-input-batch v-model="advancedFormData[form1Field.field]"
-                                      :disabled="form1Field.disabled===true"
-                                      @clear="advancedFormData[form1Field.field]=[]"/>
-                  </template>
-                  <template v-else-if="form1Field.type =='dateRange'">
-                    <div class="dateRange">
+                <vxe-form-item :key="index" :title="form1Field.title+ ':'">
+                  <template v-slot>
+                    <template v-if="form1Field.type =='input'">
+                      <el-input v-model="advancedFormData[form1Field.field]" size="small" clearable
+                                :disabled="form1Field.disabled===true"></el-input>
+                    </template>
+                    <template v-else-if="form1Field.type =='number'">
+                      <base-input-numbuer v-model="advancedFormData[form1Field.field]"
+                                          :disabled="form1Field.disabled===true"></base-input-numbuer>
+                    </template>
+                    <template v-else-if="form1Field.type =='select'">
+                      <el-select v-model="advancedFormData[form1Field.field]" size="mini" clearable
+                                 :multiple="!!form1Field.multiple"
+                                 :collapse-tags="!!form1Field.multiple" :disabled="form1Field.disabled===true">
+                        <el-option v-for="(item,index1) in form1Field.itemOption" :value="item.value" :label="item.label"
+                                   :key="index1"></el-option>
+                      </el-select>
+                    </template>
+                    <template v-else-if="form1Field.type =='inputBatch'">
+                      <base-input-batch v-model="advancedFormData[form1Field.field]"
+                                        :disabled="form1Field.disabled===true"
+                                        @clear="advancedFormData[form1Field.field]=[]"/>
+                    </template>
+                    <template v-else-if="form1Field.type =='dateRange'">
+                      <div class="dateRange">
+                        <el-date-picker
+                          v-model="advancedFormData[form1Field.field]"
+                          :type="form1Field.widgetType"
+                          placeholder=""
+                          size="small"
+                          clearable
+                          :value-format="form1Field.valueFormat"
+                          :picker-options="$baseStartPickerOptions(advancedFormData[form1Field.field2])"
+                        ></el-date-picker>
+                        <span>-</span>
+                        <el-date-picker
+                          v-model="advancedFormData[form1Field.field2]"
+                          :type="form1Field.widgetType"
+                          placeholder=""
+                          size="small"
+                          clearable
+                          :value-format="form1Field.valueFormat"
+                          :picker-options="$baseEndPickerOptions(advancedFormData[form1Field.field])"
+                        ></el-date-picker>
+                      </div>
+                    </template>
+                    <template v-else-if="form1Field.type =='date'">
                       <el-date-picker
                         v-model="advancedFormData[form1Field.field]"
                         :type="form1Field.widgetType"
@@ -157,43 +180,22 @@
                         size="small"
                         clearable
                         :value-format="form1Field.valueFormat"
-                        :picker-options="$baseStartPickerOptions(advancedFormData[form1Field.field2])"
+                        v-bind="form1Field.widgetConfig"
                       ></el-date-picker>
-                      <span>-</span>
-                      <el-date-picker
-                        v-model="advancedFormData[form1Field.field2]"
-                        :type="form1Field.widgetType"
+                    </template>
+  
+                    <template v-else-if="form1Field.type =='time'">
+                      <el-time-picker
+                        v-model="advancedFormData[form1Field.field]"
                         placeholder=""
                         size="small"
                         clearable
-                        :value-format="form1Field.valueFormat"
-                        :picker-options="$baseEndPickerOptions(advancedFormData[form1Field.field])"
-                      ></el-date-picker>
-                    </div>
-                  </template>
-                  <template v-else-if="form1Field.type =='date'">
-                    <el-date-picker
-                      v-model="advancedFormData[form1Field.field]"
-                      :type="form1Field.widgetType"
-                      placeholder=""
-                      size="small"
-                      clearable
-                      :value-format="form1Field.valueFormat"
-                      v-bind="form1Field.widgetConfig"
-                    ></el-date-picker>
+                        v-bind="form1Field.widgetConfig"
+                      ></el-time-picker>
+                    </template>
                   </template>
-
-                  <template v-else-if="form1Field.type =='time'">
-                    <el-time-picker
-                      v-model="advancedFormData[form1Field.field]"
-                      placeholder=""
-                      size="small"
-                      clearable
-                      v-bind="form1Field.widgetConfig"
-                    ></el-time-picker>
-                  </template>
-                </template>
-              </vxe-form-item>
+                </vxe-form-item>
+              </template>
             </template>
           </template>
         </vxe-form>

package/src/components/table/tableFormMixin.js

@@ -19,6 +19,7 @@ modules = {
       dialogVisible: false,
       advancedFormData: {},
       formDataClone: {},
+      showAdvancedContent: true
     };
   },
   watch: {},
@@ -72,7 +73,6 @@ modules = {
     clearAdvancedSearchDialog() {
       let $grid = this.$parent;
       let formData = this.formData;
-      debugger
       let advancedFormData = this.advancedFormData;
       $grid.searchColumns.forEach((form1Field) => {
         let nullValue = this.getNullValue(form1Field);
@@ -93,6 +93,10 @@ modules = {
         }
       });
       this.$emit("advancedClear",formData);
+      this.showAdvancedContent = false;
+      this.$nextTick(() => {
+        this.showAdvancedContent = true;
+      })
     },
     searchEvent() {
       this.$emit("searchEvent");
@@ -111,18 +115,16 @@ modules = {
         this.handleSyncFun();
       }, s);
     },
-    getNullValue(item) {
+    getIsDateRange(item) {
       let type = item.type;
       let widgetType = item.widgetType;
       let widgetConfig = item.widgetConfig || {};
-      let value = null;
-      if (type == "inputBatch") {
-        value = [];
-      } else if (type == "time" && widgetConfig.isRange) {
-        value = [];
+      let isDateRange = false;
+      if (type == "time" && widgetConfig.isRange) {
+        isDateRange = true;
       } else if (type == "date") {
         if (widgetConfig.isRange) {
-          value = [];
+          isDateRange = true;
         } else if (
           [
             "dates",
@@ -133,9 +135,23 @@ modules = {
             "monthrange",
           ].includes(widgetType)
         ) {
-          value = [];
+          isDateRange = true;
         }
       }
+
+      return isDateRange;
+    },
+    getNullValue(item) {
+      let type = item.type;
+      let widgetType = item.widgetType;
+      let widgetConfig = item.widgetConfig || {};
+      let value = null;
+      if (type == "inputBatch") {
+        value = [];
+      } else if (this.getIsDateRange()) {
+        // value = [];
+        value = null;
+      }
       return value;
     },
     handleSyncFun() {
@@ -194,7 +210,7 @@ modules = {
     openTableColumnsDialog() {
       let $grid = this.$parent;
       let tableColumns = (tableColumns = this.$baseLodash.cloneDeep(
-        $grid.searchColumns
+        $grid.searchColumns || []
       ));
       tableColumns.forEach((item) => {
         if (!item.widgetConfig) item.widgetConfig = {};

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

@@ -57,8 +57,8 @@
     inject: ['refList', 'globalOptionData', 'globalModel'],
     data() {
       return {
-        oldFieldValue: null, //field组件change之前的值
-        fieldModel: null,
+        oldFieldValue: [], //field组件change之前的值
+        fieldModel: [],
         rules: [],
       }
     },

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

@@ -149,25 +149,24 @@
           </vxe-button>
         </template>
 
-        <template v-for="(subWidget, swIdx) in widget.widgetList" v-slot:[subWidget.options.name]>
-          <component
-            v-if="'container' !== subWidget.category"
-            :key="swIdx"
-            :is="subWidget.type + '-widget'"
-            :field="subWidget"
-            :designer="null"
-            :parent-list="subWidget.widgetList"
-            :parent-widget="widget"
-          >
-            <!-- 递归传递插槽！！！ -->
-            <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
-              <slot :name="slot" v-bind="scope"/>
-            </template>
-          </component>
-        </template>
+          <template v-for="(subWidget, swIdx) in widget.widgetList" v-slot:[subWidget.options.name]>
+            <component
+              v-if="'container' !== subWidget.category"
+              :key="swIdx"
+              :is="subWidget.type + '-widget'"
+              :field="subWidget"
+              :designer="null"
+              :parent-list="subWidget.widgetList"
+              :parent-widget="widget"
+            >
+              <!-- 递归传递插槽！！！ -->
+              <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
+                <slot :name="slot" v-bind="scope"/>
+              </template>
+            </component>
+          </template>
 
         <template #searchWidget="{searchColumn}">
-          {{ searchColumn.widget.type }}
           <component
             :is="searchColumn.widget.type + '-widget'"
             :field="searchColumn.widget"

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

@@ -104,6 +104,7 @@ modules = {
       sortRows: [],
       showTreeMoveDialog: false,
       tableConfig: {},
+      showTableFormDialogContent: true,
     };
   },
   watch: {
@@ -1607,8 +1608,17 @@ modules = {
     },
     advancedClear() {
       let formModel = this.formModel;
-      // this.getFormRef().setFormData(formModel);
-      this.getGridTable().updateData();
+      let searchColumns = this.getGridTable().searchColumns;
+      searchColumns.forEach((form1Field) => {
+        if (!form1Field.common) {
+          let field = form1Field.field;
+          let options = form1Field.widget.options;
+          let value = formModel[field] ?? null;
+          let widgetRef = this.getWidgetRef(options.name);
+          widgetRef && widgetRef.setValue(value);
+        }
+      });
+      // this.getGridTable().$forceUpdate();
     },
     tableFormSettingConfirm() {
       let formModel = this.formModel;

package/src/views/bd/setting/table_model/mixins/edit.js

@@ -772,9 +772,11 @@ modules = {
       let min = 100
       let szTaZdMbDTOs = this.szTaMb.szTaZdMbDTOs;
       let value = 0;
-      szTaZdMbDTOs.filter(item => !item.systems).forEach(item => {
-        if (item.orders !== null && item.orders !== undefined) {
-          value = Math.max(value, item.orders)
+      let allOrders = szTaZdMbDTOs.filter(item=>item.orders!=null && item.orders!=undefined).map(item=>item.orders);
+      szTaZdMbDTOs.forEach(item => {
+        let orders = item.orders;
+        if (orders !== null && orders !== undefined && orders < 9000) {
+          value = Math.max(value, orders);
         }
       })
       let newIndex = Math.max(min, (value + 10));