bri-components 1.2.88 → 1.2.90

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 (3) hide show
  1. package/package.json +1 -1
  2. package/src/components/form/DshAdvSearch.vue +1 -1
  3. package/src/components/form/searchMixin.js +6 -4
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "bri-components",
3
- "version": "1.2.88",
3
+ "version": "1.2.90",
4
4
  "author": "dengshanghui",
5
5
  "description": "a component lib for vue project",
6
6
  "main": "src/index.js",
package/src/components/form/DshAdvSearch.vue CHANGED
@@ -127,7 +127,7 @@
127
127
  slot="extra"
128
128
  class="DshAdvSearch-conditions-item-extra"
129
129
  >
130
- <!-- 动态or固定 筛选条件，出现是有条件的 -->
130
+ <!-- 动态or固定 参数类型 -->
131
131
  <dsh-dropdown
132
132
  v-if="conditionItem.dynamicList.length"
133
133
  class="extra-dynamic"
package/src/components/form/searchMixin.js CHANGED
@@ -171,7 +171,7 @@ export default {
171
171
  : dynamicList
172
172
  : dynamicList;
173
173
  const parameterType = initContion.parameterType || (
174
- (initContion.fieldParams || []).length || initContion.chainFieldKey || (!!dynamicList.length && ["set"].includes(this.mode) && ["reference", "flatTable"].includes(fieldType))
174
+ (initContion.fieldParams || []).length || initContion.chainFieldKey || (!!dynamicList.length && ["reference", "flatTable"].includes(fieldType))
175
175
  ? "dynamicText"
176
176
  : "fixedText"
177
177
  );
@@ -271,7 +271,9 @@ export default {
271
271
  if (conditionItem.finished !== true) {
272
272
  this.getModData(conditionItem.formItem, data => {
273
273
  conditionItem.finished = true;
274
- conditionItem.subFormList = data.screens[0].form;
274
+ conditionItem.subFormList = (data.screens.find(screenItem =>
275
+ this.mode === "set" ? screenItem.screenType === "all" : screenItem._key === conditionItem.formItem._screen
276
+ ) || { form: [] }).form;
275
277
  });
276
278
  }
277
279
  } else if (conditionItem.fieldOperator === "subTableSearch") {
@@ -284,11 +286,11 @@ export default {
284
286
  this.$https({
285
287
  url: {
286
288
  module: "sheet",
287
- name: "schema"
289
+ name: "schema" // 管理员下，不管传不传screenKey，且screenKey是不是全部视图，全部视图的form数据一定返回
288
290
  },
289
291
  params: {
290
292
  _key: obj._ref,
291
- fields: obj._refFields
293
+ screenKey: obj._screen
292
294
  },
293
295
  callback: data => {
294
296
  cb(data);