cloud-web-corejs 1.0.54-dev.51 → 1.0.54-dev.510

package/src/components/table/plugins/extend-cell-area/vxe-table-extend-cell-area.min.css

@@ -0,0 +1,200 @@
+.vxe-table--cell-area {
+  position: initial;
+}
+.vxe-header--column.col--cell-active {
+  position: relative;
+}
+.vxe-header--column.col--cell-active:not(.col--group)::after {
+  border-bottom: var(--vxe-ui-table-cell-area-status-border-width, 1px) solid
+    var(--vxe-ui-font-primary-color, #409eff);
+}
+.vxe-header--column.col--cell-active::after {
+  content: "";
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  height: 100%;
+  width: 100%;
+  background: var(
+    --vxe-ui-table-header-active-area-background-color,
+    rgba(64, 158, 255, 0.1)
+  );
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+  pointer-events: none;
+  pointer-events: none;
+  z-index: 1;
+}
+.vxe-table .vxe-body--column.col--to-row {
+  background-color: var(--vxe-ui-table-header-background-color, #f8f8f9);
+}
+.vxe-table--fnr.vxe-modal--wrapper .vxe-modal--content {
+  padding: 0;
+}
+.vxe-table--fnr.vxe-modal--wrapper .vxe-modal--content {
+  display: flex;
+  flex-direction: column;
+}
+.vxe-table--fnr .vxe-table--fnr-tabs {
+  flex-shrink: 0;
+  border-bottom: 1px solid var(--vxe-ui-table-border-color, #e8eaec);
+  background-color: var(--vxe-ui-tabs-card-header-background-color);
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+.vxe-table--fnr .vxe-table--fnr-tabs > span {
+  position: relative;
+  display: inline-block;
+  padding: 0 1em;
+  height: 2.4em;
+  line-height: 2.4em;
+  text-align: center;
+  border-right: 1px solid var(--vxe-ui-table-border-color, #e8eaec);
+  background-color: var(--vxe-ui-table-header-background-color, #f8f8f8);
+  vertical-align: bottom;
+  cursor: pointer;
+}
+.vxe-table--fnr .vxe-table--fnr-tabs > span.is--active {
+  background-color: var(--vxe-ui-layout-background-color, #fff);
+}
+.vxe-table--fnr .vxe-table--fnr-tabs > span.is--active:after {
+  content: "";
+  position: absolute;
+  left: 0;
+  bottom: -1px;
+  width: 100%;
+  height: 1px;
+  background-color: var(--vxe-ui-layout-background-color, #fff);
+  z-index: 1;
+}
+.vxe-table--fnr .vxe-table--fnr-body {
+  flex-shrink: 0;
+  padding: 0.3em 1em 0 1em;
+}
+.vxe-table--fnr .vxe-table--fnr-form {
+  width: 100%;
+  border: 0;
+  border-spacing: 0;
+  border-collapse: separate;
+}
+.vxe-table--fnr .vxe-table--fnr-form tr {
+  visibility: hidden;
+}
+.vxe-table--fnr .vxe-table--fnr-form tr.is--visible {
+  visibility: visible;
+}
+.vxe-table--fnr .vxe-table--fnr-form-title {
+  white-space: nowrap;
+  padding-right: 0.8em;
+}
+.vxe-table--fnr .vxe-table--fnr-form-content,
+.vxe-table--fnr .vxe-table--fnr-form-input {
+  width: 100%;
+}
+.vxe-table--fnr .vxe-table--fnr-form-content {
+  padding: 0.3em 0;
+}
+.vxe-table--fnr .vxe-table--fnr-form-filter {
+  padding-left: 1.8em;
+  vertical-align: top;
+}
+.vxe-table--fnr .vxe-table--fnr-form-filter > .vxe-checkbox {
+  display: block;
+  margin: 0.6em 0 0 0;
+}
+.vxe-table--fnr .vxe-table--fnr-footer {
+  flex-shrink: 0;
+  padding: 0.8em 1em;
+  overflow: hidden;
+  text-align: right;
+}
+.vxe-table--fnr .vxe-table--fnr-search {
+  display: flex;
+  flex-direction: column;
+  flex-grow: 1;
+  border-top: 1px solid var(--vxe-ui-table-border-color, #e8eaec);
+  border-bottom: 1px solid var(--vxe-ui-table-border-color, #e8eaec);
+  overflow: hidden;
+}
+.vxe-table--fnr .vxe-table--fnr-search .vxe-list--virtual-wrapper,
+.vxe-table--fnr .vxe-table--fnr-search .vxe-table--fnr-search-list {
+  height: 100%;
+}
+.vxe-table--fnr .vxe-table--fnr-search-header {
+  flex-shrink: 0;
+  height: 2.5em;
+  line-height: 2.5em;
+  padding: 0 0.8em;
+  font-weight: 700;
+  background-color: var(--vxe-ui-table-header-background-color, #f8f8f8);
+}
+.vxe-table--fnr .vxe-table--fnr-find-item,
+.vxe-table--fnr .vxe-table--fnr-search-header {
+  display: flex;
+}
+.vxe-table--fnr .vxe-table--fnr-find-item > div,
+.vxe-table--fnr .vxe-table--fnr-search-header > div {
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.vxe-table--fnr .vxe-table--fnr-find-item > div:nth-child(1),
+.vxe-table--fnr .vxe-table--fnr-search-header > div:nth-child(1) {
+  width: 100px;
+  flex-shrink: 0;
+}
+.vxe-table--fnr .vxe-table--fnr-find-item > div:nth-child(2),
+.vxe-table--fnr .vxe-table--fnr-search-header > div:nth-child(2) {
+  width: 160px;
+  flex-shrink: 0;
+}
+.vxe-table--fnr .vxe-table--fnr-find-item > div:nth-child(3),
+.vxe-table--fnr .vxe-table--fnr-search-header > div:nth-child(3) {
+  flex-grow: 1;
+}
+.vxe-table--fnr .vxe-table--fnr-search-body {
+  flex-grow: 1;
+  overflow: hidden;
+  border-top: 1px solid var(--vxe-ui-table-border-color, #e8eaec);
+  border-bottom: 1px solid var(--vxe-ui-table-border-color, #e8eaec);
+}
+.vxe-table--fnr .vxe-table--fnr-find-item {
+  height: 2em;
+  line-height: 2em;
+  padding: 0 0.8em;
+  cursor: pointer;
+}
+.vxe-table--fnr .vxe-table--fnr-find-item.is--active {
+  color: var(--vxe-ui-font-primary-color, #409eff);
+  background-color: var(--vxe-ui-table-row-current-background-color, #e6f7ff);
+}
+.vxe-table--fnr .vxe-table--fnr-find-item:hover.is--active {
+  background-color: var(
+    --vxe-ui-table-row-hover-current-background-color,
+    #d7effb
+  );
+}
+.vxe-table--fnr .vxe-table--fnr-find-item:hover > div {
+  text-decoration: underline;
+}
+.vxe-table--fnr .vxe-table--fnr-search-footer {
+  flex-shrink: 0;
+  height: 2em;
+  line-height: 2em;
+  padding: 0 0.8em;
+  visibility: hidden;
+}
+.vxe-table--fnr .vxe-table--fnr-search-footer.is--error {
+  color: var(--vxe-ui-status-error-color, #f56c6c);
+}
+.vxe-table--fnr .vxe-table--fnr-search-footer.is--visible {
+  visibility: visible;
+}

package/src/components/table/tableForm.vue

@@ -20,7 +20,7 @@
       </div>
     </div>
     <vxe-form ref="searchForm" class="screen-box" :data="formData" title-width="92px" title-align="right"
-              v-if="form1Fields.length>0">
+              v-if="form1Fields.length>0" @submit="searchEvent">
       <template v-for="(form1Field,index) in form1Fields">
         <template v-if="!!form1Field.slot">
           <template v-if="form1Field.formItem===false">
@@ -86,58 +86,93 @@
                   size="small"
                   clearable
                   :value-format="form1Field.valueFormat"
+                  v-bind="form1Field.widgetConfig"
                 ></el-date-picker>
               </template>
+              <template v-else-if="form1Field.type =='time'">
+                <el-time-picker
+                  v-model="formData[form1Field.field]"
+                  placeholder=""
+                  size="small"
+                  clearable
+                  :value-format="form1Field.valueFormat"
+                  v-bind="form1Field.widgetConfig"
+                ></el-time-picker>
+              </template>
             </template>
           </vxe-form-item>
         </template>
       </template>
+      <vxe-button type="submit" @click="searchEvent" v-show="false"></vxe-button>
     </vxe-form>
     <advancedSearchDialog v-if="showAdvancedSearch" :visiable.sync="showAdvancedSearch" class="adSearchForm_all"
-                          :formData="advancedFormData" @confirm="confirmAdvancedSearchDialog"
+                           @confirm="confirmAdvancedSearchDialog"
                           @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"
@@ -145,32 +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>
+                        v-bind="form1Field.widgetConfig"
+                      ></el-time-picker>
+                    </template>
                   </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"
-                    ></el-date-picker>
-                  </template>
-                </template>
-              </vxe-form-item>
+                </vxe-form-item>
+              </template>
             </template>
           </template>
         </vxe-form>
@@ -187,7 +212,7 @@
       :close-on-click-modal="!1"
       :close-on-press-escape="!1"
       :destroy-on-close="!0"
-      width="500px"
+      width="750px"
       v-dialog-drag
       v-el-dialog-center
     >
@@ -207,7 +232,7 @@
               {{ scope.row.title }}
             </template>
           </el-table-column>
-          <el-table-column :label="$t2('默认值', 'components.table.defaultValue')" width="150" prop="defaultValue">
+          <el-table-column :label="$t2('默认值', 'components.table.defaultValue')" width="375" prop="defaultValue">
             <template slot-scope="scope">
               <template
                 v-if="scope.row.defaultValueEnabled!==false && (scope.row.defaultValueEnabled || !scope.row.slot)">
@@ -235,8 +260,19 @@
                     size="small"
                     clearable
                     :value-format="scope.row.valueFormat"
+                      v-bind="scope.row.widgetConfig"
                   ></el-date-picker>
                 </template>
+                <template v-else-if="scope.row.type =='time'">
+                  <el-time-picker
+                    v-model="scope.row.defaultValue"
+                    placeholder=""
+                    size="small"
+                    clearable
+                    :value-format="scope.row.valueFormat"
+                      v-bind="scope.row.widgetConfig"
+                  ></el-time-picker>
+                </template>
               </template>
             </template>
           </el-table-column>