kz-ui-base 1.0.53 → 1.0.54
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.
|
@@ -92,17 +92,44 @@
|
|
|
92
92
|
</el-col>
|
|
93
93
|
<!--用户数据-->
|
|
94
94
|
<el-col :span="treeSetting.visable ? 19 : 24" :xs="24">
|
|
95
|
-
<div
|
|
95
|
+
<!-- <div
|
|
96
96
|
class="wrapper-container"
|
|
97
97
|
style="margin-botom: 0px; display: inline-block; width: 100%;z-index: 1000;
|
|
98
98
|
position: absolute;
|
|
99
99
|
top: 55px;
|
|
100
100
|
right: 0;background: #f8f8f9;"
|
|
101
101
|
v-show="isShowSearch"
|
|
102
|
+
> -->
|
|
103
|
+
|
|
104
|
+
<div
|
|
105
|
+
class="wrapper-container"
|
|
106
|
+
style="margin-botom: 0px; display: inline-block; width: 100%"
|
|
107
|
+
v-if="interstitialPart"
|
|
102
108
|
>
|
|
103
109
|
<el-form v-if="!disableSearch" ref="queryForm" @submit.native.prevent>
|
|
110
|
+
<el-form-item style="float: right; margin-bottom: 10px">
|
|
111
|
+
<el-button
|
|
112
|
+
type="primary"
|
|
113
|
+
icon="el-icon-search"
|
|
114
|
+
size="mini"
|
|
115
|
+
@click="handleQuery"
|
|
116
|
+
>搜索</el-button
|
|
117
|
+
>
|
|
118
|
+
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
|
|
119
|
+
>重置</el-button
|
|
120
|
+
>
|
|
121
|
+
<AdvancedQuery
|
|
122
|
+
style="margin-left: 10px"
|
|
123
|
+
v-if="showToolBar"
|
|
124
|
+
:showSearch.sync="isShowSearch"
|
|
125
|
+
:sortVisible="false"
|
|
126
|
+
@queryTable="getList"
|
|
127
|
+
:columns="listColumns"
|
|
128
|
+
/>
|
|
129
|
+
</el-form-item>
|
|
104
130
|
<el-col
|
|
105
131
|
v-for="(searchRule, index) in searchRules"
|
|
132
|
+
style="float: right"
|
|
106
133
|
:key="index"
|
|
107
134
|
v-if="
|
|
108
135
|
searchRule.visible == undefined || searchRule.visible != false
|
|
@@ -118,7 +145,7 @@
|
|
|
118
145
|
"
|
|
119
146
|
>
|
|
120
147
|
<el-form
|
|
121
|
-
v-if="
|
|
148
|
+
v-if="searchRule.principal"
|
|
122
149
|
:ref="`queryForm${index}`"
|
|
123
150
|
:model="searchRule"
|
|
124
151
|
:rules="rules"
|
|
@@ -153,58 +180,27 @@
|
|
|
153
180
|
</component>
|
|
154
181
|
</el-form>
|
|
155
182
|
</el-col>
|
|
156
|
-
<el-form-item style="width: 100%;
|
|
157
|
-
padding: 2px 50px;
|
|
158
|
-
border-top: 1px solid #ddd;
|
|
159
|
-
float: left;margin-bottom: 10px;">
|
|
160
|
-
<el-button
|
|
161
|
-
type="primary"
|
|
162
|
-
icon="el-icon-search"
|
|
163
|
-
size="mini"
|
|
164
|
-
@click="handleQuery"
|
|
165
|
-
>搜索</el-button
|
|
166
|
-
>
|
|
167
|
-
<AdvancedQueryClose
|
|
168
|
-
style="margin-left:10px;margin-right:20px;display: inline-block;float:none;"
|
|
169
|
-
v-if="showToolBar"
|
|
170
|
-
:showSearch.sync="isShowSearch"
|
|
171
|
-
:sortVisible="false"
|
|
172
|
-
@queryTable="getList"
|
|
173
|
-
:columns="listColumns"
|
|
174
|
-
/>
|
|
175
|
-
</el-form-item>
|
|
176
183
|
</el-form>
|
|
177
184
|
</div>
|
|
178
185
|
|
|
179
186
|
<div
|
|
180
187
|
class="wrapper-container"
|
|
181
|
-
style="
|
|
182
|
-
|
|
188
|
+
style="
|
|
189
|
+
margin-botom: 0px;
|
|
190
|
+
display: inline-block;
|
|
191
|
+
width: 100%;
|
|
192
|
+
z-index: 1000;
|
|
193
|
+
margin-top: -15px;
|
|
194
|
+
margin-bottom: 0;
|
|
195
|
+
top: 55px;
|
|
196
|
+
right: 0;
|
|
197
|
+
background: #f8f8f9;
|
|
198
|
+
"
|
|
199
|
+
v-show="isShowSearch"
|
|
183
200
|
>
|
|
184
201
|
<el-form v-if="!disableSearch" ref="queryForm" @submit.native.prevent>
|
|
185
|
-
<el-form-item style="float: right;margin-bottom: 10px;">
|
|
186
|
-
<el-button
|
|
187
|
-
type="primary"
|
|
188
|
-
icon="el-icon-search"
|
|
189
|
-
size="mini"
|
|
190
|
-
@click="handleQuery"
|
|
191
|
-
>搜索</el-button
|
|
192
|
-
>
|
|
193
|
-
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
|
|
194
|
-
>重置</el-button
|
|
195
|
-
>
|
|
196
|
-
<AdvancedQuery
|
|
197
|
-
style="margin-left:10px;"
|
|
198
|
-
v-if="showToolBar"
|
|
199
|
-
:showSearch.sync="isShowSearch"
|
|
200
|
-
:sortVisible="false"
|
|
201
|
-
@queryTable="getList"
|
|
202
|
-
:columns="listColumns"
|
|
203
|
-
/>
|
|
204
|
-
</el-form-item>
|
|
205
202
|
<el-col
|
|
206
203
|
v-for="(searchRule, index) in searchRules"
|
|
207
|
-
style="float: right"
|
|
208
204
|
:key="index"
|
|
209
205
|
v-if="
|
|
210
206
|
searchRule.visible == undefined || searchRule.visible != false
|
|
@@ -220,7 +216,7 @@
|
|
|
220
216
|
"
|
|
221
217
|
>
|
|
222
218
|
<el-form
|
|
223
|
-
v-if="searchRule.principal"
|
|
219
|
+
v-if="!searchRule.principal"
|
|
224
220
|
:ref="`queryForm${index}`"
|
|
225
221
|
:model="searchRule"
|
|
226
222
|
:rules="rules"
|
|
@@ -255,6 +251,36 @@
|
|
|
255
251
|
</component>
|
|
256
252
|
</el-form>
|
|
257
253
|
</el-col>
|
|
254
|
+
<el-form-item
|
|
255
|
+
style="
|
|
256
|
+
width: 100%;
|
|
257
|
+
padding: 2px 50px;
|
|
258
|
+
border-top: 1px solid #ddd;
|
|
259
|
+
float: left;
|
|
260
|
+
margin-bottom: 10px;
|
|
261
|
+
"
|
|
262
|
+
>
|
|
263
|
+
<el-button
|
|
264
|
+
type="primary"
|
|
265
|
+
icon="el-icon-search"
|
|
266
|
+
size="mini"
|
|
267
|
+
@click="handleQuery"
|
|
268
|
+
>搜索</el-button
|
|
269
|
+
>
|
|
270
|
+
<AdvancedQueryClose
|
|
271
|
+
style="
|
|
272
|
+
margin-left: 10px;
|
|
273
|
+
margin-right: 20px;
|
|
274
|
+
display: inline-block;
|
|
275
|
+
float: none;
|
|
276
|
+
"
|
|
277
|
+
v-if="showToolBar"
|
|
278
|
+
:showSearch.sync="isShowSearch"
|
|
279
|
+
:sortVisible="false"
|
|
280
|
+
@queryTable="getList"
|
|
281
|
+
:columns="listColumns"
|
|
282
|
+
/>
|
|
283
|
+
</el-form-item>
|
|
258
284
|
</el-form>
|
|
259
285
|
</div>
|
|
260
286
|
|
package/package.json
CHANGED