bri-components 1.3.67 → 1.3.69

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/package.json +1 -1
  2. package/src/components/controls/DshControlInput.vue +19 -2
  3. package/src/components/controls/base/DshCascader/DshCascader.vue +1 -0
  4. package/src/components/controls/mixins/cascaderMixin.js +93 -48
  5. package/src/components/controls/senior/cascaderTable.vue +6 -4
  6. package/src/components/list/DshCascaderTable.vue +15 -919
  7. package/src/components/list/DshFlatTable.vue +3 -3
  8. package/src/components/list/DshTreeTable.vue +3 -3
  9. package/src/components/list/common/importModal.vue +9 -9
  10. package/src/components/list/mixins/DshCascaderTableMixin.js +857 -0
  11. package/src/components/list/mixins/tableBaseMixin.js +16 -12
package/src/components/list/DshFlatTable.vue CHANGED
@@ -24,6 +24,9 @@
24
24
  <!-- 添加行 -->
25
25
  <dsh-render :render="createOperationRender"></dsh-render>
26
26
 
27
+ <!-- 各种模态框共用 -->
28
+ <dsh-render :render="dshRender"></dsh-render>
29
+
27
30
  <!-- 全屏模式 -->
28
31
  <dsh-modal
29
32
  class="DshFlatTable-fullscreen"
@@ -56,9 +59,6 @@
56
59
  <dsh-render :render="createOperationRender"></dsh-render>
57
60
  </div>
58
61
  </dsh-modal>
59
-
60
- <!-- 各种模态框共用 -->
61
- <dsh-render :render="dshRender"></dsh-render>
62
62
  </div>
63
63
  </template>
64
64
 
package/src/components/list/DshTreeTable.vue CHANGED
@@ -24,6 +24,9 @@
24
24
  <!-- 添加行 -->
25
25
  <dsh-render :render="createOperationRender"></dsh-render>
26
26
 
27
+ <!-- 各种模态框共用 -->
28
+ <dsh-render :render="dshRender"></dsh-render>
29
+
27
30
  <!-- 全屏模式 -->
28
31
  <dsh-modal
29
32
  class="DshTreeTable-fullscreen"
@@ -56,9 +59,6 @@
56
59
  <dsh-render :render="createOperationRender"></dsh-render>
57
60
  </div>
58
61
  </dsh-modal>
59
-
60
- <!-- 各种模态框共用 -->
61
- <dsh-render :render="dshRender"></dsh-render>
62
62
  </div>
63
63
  </template>
64
64
 
package/src/components/list/common/importModal.vue CHANGED
@@ -170,13 +170,14 @@
170
170
  });
171
171
  },
172
172
  handleUpload () {
173
- this.loadingStatus = true;
174
173
  let formData = new FormData();
175
174
  formData.append("file_stream", this.file);
176
175
  formData.append("modKey", this.modKey);
177
- formData.append("importType", "flatTable");
178
- this.importParams._key && formData.append("_key", this.importParams._key);
179
- this.importParams._id && formData.append("_id", this.importParams._id);
176
+
177
+ Object.entries(this.importParams).forEach(arr => {
178
+ formData.append(arr[0], arr[1]);
179
+ });
180
+
180
181
  this.$https({
181
182
  url: {
182
183
  module: "sheet",
@@ -186,18 +187,17 @@
186
187
  content: {
187
188
  headers: { "Content-Type": "multipart/form-data" }
188
189
  },
190
+ loadingName: "loadingStatus",
191
+ successTip: "导入成功!",
189
192
  callback: data => {
190
- this.$Message.success("导入成功");
193
+ this.showModal = false;
191
194
  this.file = null;
192
- this.loadingStatus = false;
195
+
193
196
  this.$emit("importCb", data);
194
- this.showModal = false;
195
197
  },
196
198
  error: data => {
197
199
  this.$Message.error("导入失败:" + data.msg);
198
200
  this.file = null;
199
- this.file = null;
200
- this.loadingStatus = false;
201
201
  }
202
202
  });
203
203
  },