@cmstops/pro-compo 0.3.21 → 0.3.23

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 (11) hide show
  1. package/es/contentModal/component.js +2 -2
  2. package/es/contentModal/components/CompoList/CompoFilter/index.js +13 -2
  3. package/es/contentModal/components/CompoList/index.js +8 -4
  4. package/es/contentModal/components/ContentList/MediaFilter/index.js +3 -3
  5. package/es/resourceModal/style/MainContent.less +2 -2
  6. package/lib/contentModal/component.js +2 -2
  7. package/lib/contentModal/components/CompoList/CompoFilter/index.js +13 -2
  8. package/lib/contentModal/components/CompoList/index.js +8 -4
  9. package/lib/contentModal/components/ContentList/MediaFilter/index.js +3 -3
  10. package/lib/resourceModal/style/MainContent.less +2 -2
  11. package/package.json +1 -1
package/es/contentModal/component.js CHANGED
@@ -188,7 +188,7 @@ const _sfc_main = defineComponent({
188
188
  default: withCtx(() => [
189
189
  unref(userInfo) && unref(userInfo).repository_id ? (openBlock(), createBlock(_sfc_main$4, {
190
190
  key: 0,
191
- columns: typeDataController.value.compoType,
191
+ type: typeDataController.value.compoType,
192
192
  "compo-filter": _ctx.compoFilter,
193
193
  "default-selected-data": selectedData.value,
194
194
  "max-select": _ctx.maxSelect,
@@ -216,7 +216,7 @@ const _sfc_main = defineComponent({
216
216
  }, 8, ["disabled"])
217
217
  ]),
218
218
  _: 1
219
- }, 8, ["columns", "compo-filter", "default-selected-data", "max-select", "outside-select-data", "type-data", "user-info"])) : createCommentVNode("v-if", true)
219
+ }, 8, ["type", "compo-filter", "default-selected-data", "max-select", "outside-select-data", "type-data", "user-info"])) : createCommentVNode("v-if", true)
220
220
  ]),
221
221
  _: 1
222
222
  })) : createCommentVNode("v-if", true),
package/es/contentModal/components/CompoList/CompoFilter/index.js CHANGED
@@ -8,7 +8,8 @@ const _sfc_main = defineComponent({
8
8
  props: {
9
9
  group_id: {},
10
10
  groups: {},
11
- userInfo: {}
11
+ userInfo: {},
12
+ type: {}
12
13
  },
13
14
  emits: ["update:group_id", "search"],
14
15
  setup(__props, { emit: __emit }) {
@@ -31,7 +32,16 @@ const _sfc_main = defineComponent({
31
32
  value: key
32
33
  };
33
34
  });
34
- return [{ value: "", label: "\u5168\u90E8\u7C7B\u578B" }, ...arr];
35
+ return [...arr].filter((item) => {
36
+ if (props.type === "all")
37
+ return true;
38
+ const arr2 = props.type.split(",");
39
+ if (item.key === "all") {
40
+ item.value = props.type;
41
+ return true;
42
+ }
43
+ return arr2.includes(item.value);
44
+ });
35
45
  });
36
46
  const groupOptions = computed(() => {
37
47
  const arr = props.groups.map((item) => {
@@ -73,6 +83,7 @@ const _sfc_main = defineComponent({
73
83
  modelValue: filter.value.columns,
74
84
  "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => filter.value.columns = $event),
75
85
  class: "filter-item",
86
+ "allow-clear": "",
76
87
  placeholder: "\u7C7B\u578B"
77
88
  }, {
78
89
  default: withCtx(() => [
package/es/contentModal/components/CompoList/index.js CHANGED
@@ -22,7 +22,8 @@ const _sfc_main = defineComponent({
22
22
  defaultSelectedData: {},
23
23
  typeData: {},
24
24
  userInfo: {},
25
- compoFilter: { type: Boolean }
25
+ compoFilter: { type: Boolean },
26
+ type: {}
26
27
  },
27
28
  emits: ["change"],
28
29
  setup(__props, { emit: __emit }) {
@@ -139,9 +140,11 @@ const _sfc_main = defineComponent({
139
140
  let params = {
140
141
  rid: props.userInfo.repository_id,
141
142
  state: 1,
142
- group_type: 2,
143
- terminal: "pc"
143
+ group_type: 2
144
144
  };
145
+ if (props.type !== "all") {
146
+ params.columns = props.type;
147
+ }
145
148
  if (filter.value) {
146
149
  params = { ...params, ...filter.value };
147
150
  }
@@ -205,8 +208,9 @@ const _sfc_main = defineComponent({
205
208
  "onUpdate:group_id": _cache[0] || (_cache[0] = ($event) => group_id.value = $event),
206
209
  groups: groupData.value,
207
210
  "user-info": props.userInfo,
211
+ type: _ctx.type,
208
212
  onSearch: search
209
- }, null, 8, ["group_id", "groups", "user-info"]),
213
+ }, null, 8, ["group_id", "groups", "user-info", "type"]),
210
214
  createElementVNode("div", _hoisted_2, [
211
215
  createVNode(unref(Table), {
212
216
  columns,
package/es/contentModal/components/ContentList/MediaFilter/index.js CHANGED
@@ -30,11 +30,10 @@ const _sfc_main = defineComponent({
30
30
  value: key
31
31
  };
32
32
  });
33
- return [{ value: "", label: "\u5168\u90E8\u7C7B\u578B" }, ...arr].filter((item) => {
33
+ return [...arr].filter((item) => {
34
34
  if (props.type === "all")
35
35
  return true;
36
36
  const arr2 = props.type.split(",");
37
- filter.value.relation_type = props.type;
38
37
  if (item.key === "all") {
39
38
  item.value = props.type;
40
39
  return true;
@@ -82,7 +81,8 @@ const _sfc_main = defineComponent({
82
81
  modelValue: filter.value.relation_type,
83
82
  "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => filter.value.relation_type = $event),
84
83
  class: "filter-item",
85
- placeholder: "\u7C7B\u578B"
84
+ placeholder: "\u7C7B\u578B",
85
+ "allow-clear": ""
86
86
  }, {
87
87
  default: withCtx(() => [
88
88
  (openBlock(true), createElementBlock(Fragment, null, renderList(typeOptions.value, (item) => {
package/es/resourceModal/style/MainContent.less CHANGED
@@ -40,8 +40,8 @@
40
40
  height: 46px;
41
41
  overflow: hidden;
42
42
  font-size: 0;
43
- background: url('../assets/selection/folder.png') no-repeat
44
- 13px center;
43
+ background: url('../assets/selection/folder.png') no-repeat 13px
44
+ center;
45
45
  background-size: 17px auto;
46
46
  border: solid 1px transparent;
47
47
  border-radius: 4px;
package/lib/contentModal/component.js CHANGED
@@ -189,7 +189,7 @@ const _sfc_main = vue.defineComponent({
189
189
  default: vue.withCtx(() => [
190
190
  vue.unref(userInfo) && vue.unref(userInfo).repository_id ? (vue.openBlock(), vue.createBlock(index$3, {
191
191
  key: 0,
192
- columns: typeDataController.value.compoType,
192
+ type: typeDataController.value.compoType,
193
193
  "compo-filter": _ctx.compoFilter,
194
194
  "default-selected-data": selectedData.value,
195
195
  "max-select": _ctx.maxSelect,
@@ -217,7 +217,7 @@ const _sfc_main = vue.defineComponent({
217
217
  }, 8, ["disabled"])
218
218
  ]),
219
219
  _: 1
220
- }, 8, ["columns", "compo-filter", "default-selected-data", "max-select", "outside-select-data", "type-data", "user-info"])) : vue.createCommentVNode("v-if", true)
220
+ }, 8, ["type", "compo-filter", "default-selected-data", "max-select", "outside-select-data", "type-data", "user-info"])) : vue.createCommentVNode("v-if", true)
221
221
  ]),
222
222
  _: 1
223
223
  })) : vue.createCommentVNode("v-if", true),
package/lib/contentModal/components/CompoList/CompoFilter/index.js CHANGED
@@ -9,7 +9,8 @@ const _sfc_main = vue.defineComponent({
9
9
  props: {
10
10
  group_id: {},
11
11
  groups: {},
12
- userInfo: {}
12
+ userInfo: {},
13
+ type: {}
13
14
  },
14
15
  emits: ["update:group_id", "search"],
15
16
  setup(__props, { emit: __emit }) {
@@ -32,7 +33,16 @@ const _sfc_main = vue.defineComponent({
32
33
  value: key
33
34
  };
34
35
  });
35
- return [{ value: "", label: "\u5168\u90E8\u7C7B\u578B" }, ...arr];
36
+ return [...arr].filter((item) => {
37
+ if (props.type === "all")
38
+ return true;
39
+ const arr2 = props.type.split(",");
40
+ if (item.key === "all") {
41
+ item.value = props.type;
42
+ return true;
43
+ }
44
+ return arr2.includes(item.value);
45
+ });
36
46
  });
37
47
  const groupOptions = vue.computed(() => {
38
48
  const arr = props.groups.map((item) => {
@@ -74,6 +84,7 @@ const _sfc_main = vue.defineComponent({
74
84
  modelValue: filter.value.columns,
75
85
  "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => filter.value.columns = $event),
76
86
  class: "filter-item",
87
+ "allow-clear": "",
77
88
  placeholder: "\u7C7B\u578B"
78
89
  }, {
79
90
  default: vue.withCtx(() => [
package/lib/contentModal/components/CompoList/index.js CHANGED
@@ -23,7 +23,8 @@ const _sfc_main = vue.defineComponent({
23
23
  defaultSelectedData: {},
24
24
  typeData: {},
25
25
  userInfo: {},
26
- compoFilter: { type: Boolean }
26
+ compoFilter: { type: Boolean },
27
+ type: {}
27
28
  },
28
29
  emits: ["change"],
29
30
  setup(__props, { emit: __emit }) {
@@ -140,9 +141,11 @@ const _sfc_main = vue.defineComponent({
140
141
  let params = {
141
142
  rid: props.userInfo.repository_id,
142
143
  state: 1,
143
- group_type: 2,
144
- terminal: "pc"
144
+ group_type: 2
145
145
  };
146
+ if (props.type !== "all") {
147
+ params.columns = props.type;
148
+ }
146
149
  if (filter.value) {
147
150
  params = { ...params, ...filter.value };
148
151
  }
@@ -206,8 +209,9 @@ const _sfc_main = vue.defineComponent({
206
209
  "onUpdate:group_id": _cache[0] || (_cache[0] = ($event) => group_id.value = $event),
207
210
  groups: groupData.value,
208
211
  "user-info": props.userInfo,
212
+ type: _ctx.type,
209
213
  onSearch: search
210
- }, null, 8, ["group_id", "groups", "user-info"]),
214
+ }, null, 8, ["group_id", "groups", "user-info", "type"]),
211
215
  vue.createElementVNode("div", _hoisted_2, [
212
216
  vue.createVNode(vue.unref(webVue.Table), {
213
217
  columns,
package/lib/contentModal/components/ContentList/MediaFilter/index.js CHANGED
@@ -31,11 +31,10 @@ const _sfc_main = vue.defineComponent({
31
31
  value: key
32
32
  };
33
33
  });
34
- return [{ value: "", label: "\u5168\u90E8\u7C7B\u578B" }, ...arr].filter((item) => {
34
+ return [...arr].filter((item) => {
35
35
  if (props.type === "all")
36
36
  return true;
37
37
  const arr2 = props.type.split(",");
38
- filter.value.relation_type = props.type;
39
38
  if (item.key === "all") {
40
39
  item.value = props.type;
41
40
  return true;
@@ -83,7 +82,8 @@ const _sfc_main = vue.defineComponent({
83
82
  modelValue: filter.value.relation_type,
84
83
  "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => filter.value.relation_type = $event),
85
84
  class: "filter-item",
86
- placeholder: "\u7C7B\u578B"
85
+ placeholder: "\u7C7B\u578B",
86
+ "allow-clear": ""
87
87
  }, {
88
88
  default: vue.withCtx(() => [
89
89
  (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(typeOptions.value, (item) => {
package/lib/resourceModal/style/MainContent.less CHANGED
@@ -40,8 +40,8 @@
40
40
  height: 46px;
41
41
  overflow: hidden;
42
42
  font-size: 0;
43
- background: url('../assets/selection/folder.png') no-repeat
44
- 13px center;
43
+ background: url('../assets/selection/folder.png') no-repeat 13px
44
+ center;
45
45
  background-size: 17px auto;
46
46
  border: solid 1px transparent;
47
47
  border-radius: 4px;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@cmstops/pro-compo",
3
- "version": "0.3.21",
3
+ "version": "0.3.23",
4
4
  "description": "",
5
5
  "keywords": [
6
6
  "vue",