cloud-web-corejs 1.0.281 → 1.1.0-dev.4

package/src/views/user/role/list.vue

@@ -1,260 +1,260 @@
-<template>
-  <div id="containt">
-    <el-tabs v-model="activeName" class="tab-box">
-      <el-tab-pane :label="$t1('常规')" name="first">
-        <editView
-          v-if="showEdit"
-          visible-key="showEdit"
-          :_dataId.sync="dataId"
-          :parent-target="_self"
-          @reload="$reloadHandle"
-        ></editView>
-        <vocEditView
-          v-if="showVocEdit"
-          visible-key="showVocEdit"
-          :_dataId.sync="dataId"
-          :parent-target="_self"
-          @reload="$reloadHandle"
-        ></vocEditView>
-      </el-tab-pane>
-      <el-tab-pane :label="$t1('列表')" name="second">
-        <div class="grid-height">
-          <vxe-grid
-            ref="table-m1"
-            v-bind="vxeOption"
-            @resizable-change="$vxeTableUtil.onColumnWitchChange"
-            @custom="$vxeTableUtil.customHandle"
-          >
-            <template #form>
-              <div class="clearfix screen-btns">
-                <div class="fl">
-                  <vxe-button
-                    status="primary"
-                    class="button-sty"
-                    icon="el-icon-plus"
-                    @click="openEditDialog"
-                  >
-                    {{ $t1("新增") }}
-                  </vxe-button>
-                  <base-table-export
-                    :option="{
-                      title: $t1('用户角色导出'),
-                      targetRef: 'table-m1',
-                    }"
-                    :parent-target="_self"
-                  />
-                </div>
-                <div class="fr">
-                  <vxe-button
-                    icon="el-icon-brush"
-                    class="button-sty"
-                    @click="resetEvent"
-                    type="text"
-                    status="primary"
-                    plain
-                    >{{ $t1("刷新") }}
-                  </vxe-button>
-                  <vxe-button
-                    status="warning"
-                    icon="el-icon-search"
-                    class="button-sty"
-                    @click="searchEvent"
-                  >
-                    {{ $t1("搜索") }}
-                  </vxe-button>
-                </div>
-              </div>
-              <vxe-form
-                ref="form"
-                class="screen-box"
-                title-width="92px"
-                title-align="right"
-                :data="formData"
-                @submit="searchEvent"
-                @reset="searchEvent"
-              >
-                <vxe-form-item :title="$t1('用户角色') + ':'" field="name">
-                  <template v-slot>
-                    <el-input v-model="formData.name" size="small" clearable />
-                  </template>
-                </vxe-form-item>
-                <!-- <vxe-form-item :title="$t1('角色编码')+':'" field="code">
-                  <template v-slot>
-                    <el-input v-model="formData.code" size="small" clearable/>
-                  </template>
-                </vxe-form-item> -->
-              </vxe-form>
-            </template>
-          </vxe-grid>
-        </div>
-      </el-tab-pane>
-    </el-tabs>
-  </div>
-</template>
-
-<script>
-import editView from "./edit.vue";
-import vocEditView from "./voc_edit.vue";
-
-export default {
-  name: "role:list",
-  components: {
-    editView,
-    vocEditView,
-  },
-  created() {},
-  mounted() {
-    this.$getBaseDicts({
-      code: "sysType",
-      success: ({ dicts }) => {
-        let vocItem = (dicts || []).find((item) => item.sn === "voc");
-        this.showVocMenuBtn = !!vocItem;
-        this.vocMenuLabel = (vocItem && vocItem.value) || "";
-      },
-    }).finally(() => {
-      this.initTableList();
-    });
-  },
-  data() {
-    return {
-      activeName: "second",
-      dataId: 0,
-      showEdit: false,
-      showVocEdit: false,
-      showVocMenuBtn: false,
-      vocMenuLabel: "",
-      vxeOption: {},
-      formData: {},
-    };
-  },
-  methods: {
-    searchEvent() {
-      this.$refs["table-m1"].commitProxy("reload");
-    },
-    resetEvent() {
-      this.formData = {};
-      this.$refs["table-m1"].commitProxy("reload");
-    },
-    openEditDialog(id) {
-      this.dataId = !id || typeof id == "object" ? "" : id;
-      this.activeName = "first";
-      this.showVocEdit = false;
-      this.$openEditView("showEdit");
-    },
-    openVocEditDialog(id) {
-      this.dataId = !id || typeof id == "object" ? "" : id;
-      this.activeName = "first";
-      this.showEdit = false;
-      this.$openEditView("showVocEdit");
-    },
-    initTableList() {
-      let tableOption = {
-        vue: this,
-        tableRef: "table-m1",
-        tableName: "basic_role_list-m1",
-        path: USER_PREFIX + "/role/listCurrentPage",
-        param: () => {
-          return this.formData;
-        },
-        columns: [
-          {
-            type: "checkbox",
-            fixed: "left",
-            width: 48,
-            resizable: false,
-          },
-          {
-            title: this.$t1("用户角色"),
-            field: "name",
-            width: 150,
-            sortable: true,
-            fixed: "left",
-          },
-          /* {
-            title: this.$t1('角色编码'),
-            field: 'code',
-            width: 150
-          }, */
-          {
-            title: this.$t1("角色描述"),
-            field: "description",
-          },
-          {
-            title: this.$t1("是否内置"),
-            field: "systems",
-            width: 150,
-            slots: {
-              default: ({ row }) => {
-                if (row.systems) {
-                  return this.$t1("是");
-                } else {
-                  return this.$t1("否");
-                }
-              },
-            },
-          },
-          { title: this.$t1("所属组织"), field: "companyName", width: 150 },
-          {
-            field: "createDate",
-            title: this.$t1("创建时间"),
-            width: 150,
-          },
-          {
-            width: 150,
-            fixed: "right",
-            title: "",
-            sortable: false,
-            slots: {
-              default: ({ row }) => {
-                return [
-                  <a
-                    href="javascript:void(0);"
-                    class="a-link"
-                    onclick={() => {
-                      this.openEditDialog(row.id);
-                    }}
-                  >
-                    <el-tooltip
-                      enterable={false}
-                      effect="dark"
-                      content={this.$t1("查看")}
-                      placement="top"
-                      popper-class="tooltip-skin"
-                    >
-                      <i class="el-icon-edit" />
-                    </el-tooltip>
-                  </a>,
-                  <a
-                    href="javascript:void(0);"
-                    class="a-link"
-                    onclick={() => {
-                      this.openVocEditDialog(row.id);
-                    }}
-                    v-show={this.showVocMenuBtn}
-                  >
-                    {this.vocMenuLabel}
-                  </a>,
-                ];
-              },
-            },
-          },
-        ],
-      };
-      this.$vxeTableUtil.initVxeTable(tableOption).then((opts) => {
-        this.vxeOption = opts;
-      });
-    },
-  },
-};
-</script>
-
-<style>
-.sortable-column-demo .vxe-header--row .vxe-header--column.sortable-ghost,
-.sortable-column-demo .vxe-header--row .vxe-header--column.sortable-chosen {
-  background-color: #dfecfb;
-}
-
-.sortable-column-demo .vxe-header--row .vxe-header--column.col--fixed {
-  cursor: no-drop;
-}
-</style>
+<template>
+  <div id="containt">
+    <el-tabs v-model="activeName" class="tab-box">
+      <el-tab-pane :label="$t1('常规')" name="first">
+        <editView
+          v-if="showEdit"
+          visible-key="showEdit"
+          :_dataId.sync="dataId"
+          :parent-target="_self"
+          @reload="$reloadHandle"
+        ></editView>
+        <vocEditView
+          v-if="showVocEdit"
+          visible-key="showVocEdit"
+          :_dataId.sync="dataId"
+          :parent-target="_self"
+          @reload="$reloadHandle"
+        ></vocEditView>
+      </el-tab-pane>
+      <el-tab-pane :label="$t1('列表')" name="second">
+        <div class="grid-height">
+          <vxe-grid
+            ref="table-m1"
+            v-bind="vxeOption"
+            @resizable-change="$vxeTableUtil.onColumnWitchChange"
+            @custom="$vxeTableUtil.customHandle"
+          >
+            <template #form>
+              <div class="clearfix screen-btns">
+                <div class="fl">
+                  <vxe-button
+                    status="primary"
+                    class="button-sty"
+                    icon="el-icon-plus"
+                    @click="openEditDialog"
+                  >
+                    {{ $t1("新增") }}
+                  </vxe-button>
+                  <base-table-export
+                    :option="{
+                      title: $t1('用户角色导出'),
+                      targetRef: 'table-m1',
+                    }"
+                    :parent-target="_self"
+                  />
+                </div>
+                <div class="fr">
+                  <vxe-button
+                    icon="el-icon-brush"
+                    class="button-sty"
+                    @click="resetEvent"
+                    type="text"
+                    status="primary"
+                    plain
+                    >{{ $t1("刷新") }}
+                  </vxe-button>
+                  <vxe-button
+                    status="warning"
+                    icon="el-icon-search"
+                    class="button-sty"
+                    @click="searchEvent"
+                  >
+                    {{ $t1("搜索") }}
+                  </vxe-button>
+                </div>
+              </div>
+              <vxe-form
+                ref="form"
+                class="screen-box"
+                title-width="92px"
+                title-align="right"
+                :data="formData"
+                @submit="searchEvent"
+                @reset="searchEvent"
+              >
+                <vxe-form-item :title="$t1('用户角色') + ':'" field="name">
+                  <template v-slot>
+                    <el-input v-model="formData.name" size="small" clearable />
+                  </template>
+                </vxe-form-item>
+                <!-- <vxe-form-item :title="$t1('角色编码')+':'" field="code">
+                  <template v-slot>
+                    <el-input v-model="formData.code" size="small" clearable/>
+                  </template>
+                </vxe-form-item> -->
+              </vxe-form>
+            </template>
+          </vxe-grid>
+        </div>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import editView from "./edit.vue";
+import vocEditView from "./voc_edit.vue";
+
+export default {
+  name: "role:list",
+  components: {
+    editView,
+    vocEditView,
+  },
+  created() {},
+  mounted() {
+    this.$getBaseDicts({
+      code: "sysType",
+      success: ({ dicts }) => {
+        let vocItem = (dicts || []).find((item) => item.sn === "voc");
+        this.showVocMenuBtn = !!vocItem;
+        this.vocMenuLabel = (vocItem && vocItem.value) || "";
+      },
+    }).finally(() => {
+      this.initTableList();
+    });
+  },
+  data() {
+    return {
+      activeName: "second",
+      dataId: 0,
+      showEdit: false,
+      showVocEdit: false,
+      showVocMenuBtn: false,
+      vocMenuLabel: "",
+      vxeOption: {},
+      formData: {},
+    };
+  },
+  methods: {
+    searchEvent() {
+      this.$refs["table-m1"].commitProxy("reload");
+    },
+    resetEvent() {
+      this.formData = {};
+      this.$refs["table-m1"].commitProxy("reload");
+    },
+    openEditDialog(id) {
+      this.dataId = !id || typeof id == "object" ? "" : id;
+      this.activeName = "first";
+      this.showVocEdit = false;
+      this.$openEditView("showEdit");
+    },
+    openVocEditDialog(id) {
+      this.dataId = !id || typeof id == "object" ? "" : id;
+      this.activeName = "first";
+      this.showEdit = false;
+      this.$openEditView("showVocEdit");
+    },
+    initTableList() {
+      let tableOption = {
+        vue: this,
+        tableRef: "table-m1",
+        tableName: "basic_role_list-m1",
+        path: USER_PREFIX + "/role/listCurrentPage",
+        param: () => {
+          return this.formData;
+        },
+        columns: [
+          {
+            type: "checkbox",
+            fixed: "left",
+            width: 48,
+            resizable: false,
+          },
+          {
+            title: this.$t1("用户角色"),
+            field: "name",
+            width: 150,
+            sortable: true,
+            fixed: "left",
+          },
+          /* {
+            title: this.$t1('角色编码'),
+            field: 'code',
+            width: 150
+          }, */
+          {
+            title: this.$t1("角色描述"),
+            field: "description",
+          },
+          {
+            title: this.$t1("是否内置"),
+            field: "systems",
+            width: 150,
+            slots: {
+              default: ({ row }) => {
+                if (row.systems) {
+                  return this.$t1("是");
+                } else {
+                  return this.$t1("否");
+                }
+              },
+            },
+          },
+          { title: this.$t1("所属组织"), field: "companyName", width: 150 },
+          {
+            field: "createDate",
+            title: this.$t1("创建时间"),
+            width: 150,
+          },
+          {
+            width: 150,
+            fixed: "right",
+            title: "",
+            sortable: false,
+            slots: {
+              default: ({ row }) => {
+                return [
+                  <a
+                    href="javascript:void(0);"
+                    class="a-link"
+                    onclick={() => {
+                      this.openEditDialog(row.id);
+                    }}
+                  >
+                    <el-tooltip
+                      enterable={false}
+                      effect="dark"
+                      content={this.$t1("查看")}
+                      placement="top"
+                      popper-class="tooltip-skin"
+                    >
+                      <i class="el-icon-edit" />
+                    </el-tooltip>
+                  </a>,
+                  <a
+                    href="javascript:void(0);"
+                    class="a-link"
+                    onclick={() => {
+                      this.openVocEditDialog(row.id);
+                    }}
+                    v-show={this.showVocMenuBtn}
+                  >
+                    {this.vocMenuLabel}
+                  </a>,
+                ];
+              },
+            },
+          },
+        ],
+      };
+      this.$vxeTableUtil.initVxeTable(tableOption).then((opts) => {
+        this.vxeOption = opts;
+      });
+    },
+  },
+};
+</script>
+
+<style>
+.sortable-column-demo .vxe-header--row .vxe-header--column.sortable-ghost,
+.sortable-column-demo .vxe-header--row .vxe-header--column.sortable-chosen {
+  background-color: #dfecfb;
+}
+
+.sortable-column-demo .vxe-header--row .vxe-header--column.col--fixed {
+  cursor: no-drop;
+}
+</style>

package/src/views/user/wf/iframe/index.vue

@@ -13,7 +13,7 @@
 </template>
 
 <script>
-import { loadViewComponent } from "@base/utils/resolveViewComponent";
+import { loadViewComponentAsync } from "@base/utils/resolveViewComponent";
 export default {
   data() {
     return {
@@ -28,7 +28,7 @@ export default {
     this.initData();
   },
   methods: {
-    initData() {
+    async initData() {
       let wfDataId = this.$route.query.wfDataId;
       let wfUrl = this.$route.query.wfUrl;
 
@@ -37,7 +37,7 @@ export default {
       this.wfDataId = !id || typeof id == 'object' ? 0 : id;
       // this.showWfDialog = true;
       this.showWfContent = true;
-      let res = loadViewComponent(url);
+      const res = await loadViewComponentAsync(url);
       if (res.kind === "remote") {
         this.$message({ message: "该单据归属子应用 " + res.owner + "，请从对应入口打开", type: "warning" });
       }

package/src/views/user/wf/iframe/index2.vue

@@ -12,7 +12,7 @@
 </template>
 
 <script>
-import { loadViewComponent } from "@base/utils/resolveViewComponent";
+import { loadViewComponentAsync } from "@base/utils/resolveViewComponent";
 export default {
   data() {
     return {
@@ -26,7 +26,7 @@ export default {
     this.login();
   },
   methods: {
-    initData() {
+    async initData() {
       let dataId = this.$route.query.dataId;
       let purl = this.$route.query.url;
       let param = this.$route.query.param;
@@ -35,7 +35,7 @@ export default {
       }
       let url = purl + '.vue';
       this.showWfContent = true;
-      let res = loadViewComponent(url);
+      const res = await loadViewComponentAsync(url);
       if (res.kind === "remote") {
         this.$message({ message: "该单据归属子应用 " + res.owner + "，请从对应入口打开", type: "warning" });
       }