npm - cloud-web-corejs - Versions diffs - 1.0.54-dev.597 → 1.0.54-dev.599 - Mend

cloud-web-corejs 1.0.54-dev.597 → 1.0.54-dev.599

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 (6) hide show

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.597",
+  "version": "1.0.54-dev.599",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/views/bd/setting/formVersion/ftHistoryDialog.vue CHANGED Viewed

@@ -71,6 +71,11 @@
                         <base-input-number v-model="formData.version" />
                       </template>
                     </vxe-form-item>
+                    <vxe-form-item :title="$t1('备注') + ':'">
+                      <template v-slot>
+                        <el-input v-model="formData.remark" clearable />
+                      </template>
+                    </vxe-form-item>
                   </vxe-form>
                 </template>
               </vxe-grid>
@@ -237,6 +242,11 @@ export default {
             field: "version",
             width: 150,
           },
+          {
+            title: this.$t1("备注"),
+            field: "remark",
+            width: 150,
+          },
           {
             title: this.$t1("创建时间"),
             field: "createDate",

package/src/views/bd/setting/formVersion/preformDialog.vue ADDED Viewed

@@ -0,0 +1,86 @@
+<template>
+  <el-dialog
+    :title="$t1('您确定要回退当前版本吗？')"
+    :visible.sync="showDialog"
+    :modal-append-to-body="false"
+    :close-on-click-modal="false"
+    :modal="false"
+    custom-class="dialog-style wf-dialog formVersion-preform-dialog"
+    v-el-drag-dialog
+    v-el-dialog-center
+    @close="closeDialog"
+  >
+    <el-form ref="editForm" :model="formData">
+      <div id="containt">
+        <table class="table-detail">
+          <tbody>
+            <tr>
+              <th>
+                <span class="t">
+                  <em class="f-red">*</em>
+                  {{ $t1("提交内容") }}
+                </span>
+              </th>
+              <td>
+                <el-form-item
+                  prop="logContent"
+                  :rules="[{ required: true, trigger: ['blur', 'change'] }]"
+                >
+                  <el-input
+                    type="textarea"
+                    :rows="8"
+                    :placeholder="$attrs.placeholder || $t1('请输入提交内容')"
+                    v-model="formData.logContent"
+                  ></el-input>
+                </el-form-item>
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button type="primary" plain class="button-sty" @click="closeDialog">
+        <i class="el-icon-close el-icon"></i>
+        {{ $t1("取 消") }}
+      </el-button>
+      <el-button type="primary" @click="confirmDialog" class="button-sty">
+        <i class="el-icon-check el-icon"></i>
+        {{ $t1("确 定") }}
+      </el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+export default {
+  name: "preformDialog",
+  data() {
+    return {
+      showDialog: true,
+      formData: {
+        logContent: null,
+      },
+    };
+  },
+  methods: {
+    closeDialog() {
+      this.$emit("update:visiable", false);
+      this.showDialog = false;
+    },
+    confirmDialog() {
+      this.$refs.editForm.$baseValidate((valid) => {
+        if (valid) {
+          this.closeDialog();
+          this.$emit("confirm", this.formData);
+        }
+      });
+    },
+  },
+};
+</script>
+<style scoped></style>
+<style>
+.formVersion-preform-dialog .el-dialog__header {
+  text-align: left;
+}
+</style>

package/src/views/bd/setting/formVersion/reverButton.vue CHANGED Viewed

@@ -1,66 +1,84 @@
-<template>
-  <el-button
-    type="primary"
-    plain
-    class="button-sty"
-    icon="el-icon-set-up"
-    @click="saveData"
-  >
-    {{ $t1("回退当前版本") }}
-  </el-button>
-</template>
-<script>
-import { USER_PREFIX } from "@/prefixConfig";
-export default {
-  name: "ftHistoryButton",
-  props: {
-    hData: Object,
-    objType: {
-      type: String,
-      default: "",
-    },
-    objCode: {
-      type: String,
-      default: "",
-    },
-  },
-  components: {
-    ftHistoryDialog: () =>
-      import("@base/views/bd/setting/formVersion/ftHistoryDialog.vue"),
-  },
-  data() {
-    return {
-      historyDialogVisible: false,
-    };
-  },
-  methods: {
-    saveData() {
-      let url = null;
-      if (this.objType === "FormTemplate") {
-        url = USER_PREFIX + "/formTemplate/update";
-      } else if (this.objType === "FormScript") {
-        url = USER_PREFIX + "/formScript/update";
-      } else if (this.objType === "SzTaMb") {
-        url = USER_PREFIX + "/szTaMb/update";
-      }
-      this.$baseConfirm(this.$t1("您确定要回退当前版本吗？")).then(() => {
-        this.$http({
-          aes: true,
-          url: url,
-          method: `post`,
-          data: this.hData,
-          isLoading: true,
-          success: (res) => {
-            this.$message({
-              message: res.content,
-              type: "success",
-            });
-            this.$emit("reverCallback");
-          },
-        });
-      });
-    },
-  },
-};
-</script>
+<template>
+  <el-button
+    type="primary"
+    plain
+    class="button-sty"
+    icon="el-icon-set-up"
+    @click="openPreformDialog"
+  >
+    {{ $t1("回退当前版本") }}
+    <preformDialog
+      v-if="showPreformDialog"
+      :visiable.sync="showPreformDialog"
+      @confirm="confirmPreformDialog"
+    ></preformDialog>
+  </el-button>
+</template>
+<script>
+import { USER_PREFIX } from "@/prefixConfig";
+export default {
+  name: "ftHistoryButton",
+  props: {
+    hData: Object,
+    objType: {
+      type: String,
+      default: "",
+    },
+    objCode: {
+      type: String,
+      default: "",
+    },
+  },
+  components: {
+    ftHistoryDialog: () =>
+      import("@base/views/bd/setting/formVersion/ftHistoryDialog.vue"),
+    preformDialog: () => import("./preformDialog.vue"),
+  },
+  data() {
+    return {
+      historyDialogVisible: false,
+      showPreformDialog: false,
+      formData: {
+        logContent: "",
+      },
+    };
+  },
+  methods: {
+    saveDataHandle(preformData) {
+      let url = null;
+      if (this.objType === "FormTemplate") {
+        url = USER_PREFIX + "/formTemplate/update";
+      } else if (this.objType === "FormScript") {
+        url = USER_PREFIX + "/formScript/update";
+      } else if (this.objType === "SzTaMb") {
+        url = USER_PREFIX + "/szTaMb/update";
+      }
+      this.$http({
+        // aes: true,
+        url: url,
+        method: `post`,
+        data: {
+          ...this.hData,
+          rb: 1,
+          logContent: preformData.logContent,
+        },
+        isLoading: true,
+        success: (res) => {
+          this.$message({
+            message: res.content,
+            type: "success",
+          });
+          this.$emit("reverCallback");
+        },
+      });
+    },
+    openPreformDialog() {
+      this.showPreformDialog = true;
+    },
+    confirmPreformDialog(preformData) {
+      this.saveDataHandle(preformData);
+    },
+  },
+};
+</script>

package/src/views/user/fieldTranslation/editDialog.vue CHANGED Viewed

@@ -116,7 +116,7 @@ export default {
     this.initLanguageSetting();
   },
   mounted() {
-    this.getBdEnv();
+    // this.getBdEnv();
     this.getData();
   },
   methods: {

package/src/views/user/fieldTranslation/list.vue CHANGED Viewed

@@ -32,7 +32,7 @@
                 <tableForm :formData.sync="formData" @searchEvent="searchEvent" @resetEvent="resetEvent">
                   <template #buttonLeft>
                     <vxe-button status="primary" class="button-sty" icon="el-icon-plus"
-                                @click="openFieldTranslationEditDialog()" :disabled="!currentDataType.id">
+                                @click="openFieldTranslationEditDialog()" :disabled="!currentDataType.id" v-if="isDev">
                       {{ $t1('新增') }}
                     </vxe-button>
                     <base-table-export :option="{ title: $t1('多语言'), targetRef: 'table-m1'}"
@@ -191,7 +191,7 @@ export default {
       }
     });*/
     await this.initLanguageSetting();
-    this.getBdEnv();
+    // this.getBdEnv();
     this.initTableList();
   },
   methods: {