cloud-web-corejs 1.0.54-dev.63 → 1.0.54-dev.630

package/src/views/bd/setting/form_import_log/edit.vue

@@ -0,0 +1,130 @@
+<template>
+  <div class="detail-wrap">
+    <el-form ref="editForm" :model="formImportLog">
+      <div class="d-header clearfix">
+        <div class="fl">
+          <i class="el-icon-info"/>
+          {{ dataId ? $t1('查看表单导入日志') : $t1('新增表单导入日志') }}
+        </div>
+        <div class="fr">
+          <el-button type="primary" plain class="button-sty" @click="$baseReload()" icon="el-icon-refresh-right">
+            {{ $t1('重置') }}
+          </el-button>
+        </div>
+      </div>
+      <div class="d-cont">
+        <div class="d-item">
+          <div class="title first"><b>{{ $t1('基本信息') }}</b></div>
+          <table class="table-detail">
+            <tbody>
+            <tr>
+              <th>
+                {{ $t1('版本号') }}
+              </th>
+              <td>
+                {{ formImportLog.version }}
+              </td>
+              <th>
+                {{ $t1('表单分类路径') }}
+              </th>
+              <td colspan="5">
+                {{ formImportLog.treePathName }}
+              </td>
+            </tr>
+            <tr>
+              <th>
+                {{ $t1('日志类型') }}
+              </th>
+              <td>
+                {{ formImportLog.logType }}
+              </td>
+              <th>
+                {{ $t1('日志对象') }}
+              </th>
+              <td colspan="3">
+                [{{ formImportLog.abc }}] {{ formImportLog.logObj }}
+              </td>
+            </tr>
+            <tr>
+              <th>
+                {{ $t1('导入时间') }}
+              </th>
+              <td>
+                {{ formImportLog.impDate }}
+              </td>
+              <th>
+                {{ $t1('结果') }}
+              </th>
+              <td>
+                {{ impReturnTypeMap[formImportLog.impReturnType] }}
+              </td>
+            </tr>
+            <tr>
+              <th>{{ $t1('失败描述') }}</th>
+              <td colspan="7">{{ formImportLog.impReturnMsg }}</td>
+            </tr>
+            <tr>
+              <th>{{ $t1('创建人') }}</th>
+              <td>{{ formImportLog.createBy }}</td>
+              <th>{{ $t1('创建时间') }}</th>
+              <td>{{ formImportLog.createDate }}</td>
+              <th>{{ $t1('更新人') }}</th>
+              <td>{{ formImportLog.modifyBy }}</td>
+              <th>{{ $t1('更新时间') }}</th>
+              <td>{{ formImportLog.modifyDate }}</td>
+            </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </el-form>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'formImportLogEdit',
+  props: {
+    _dataId: [String, Number]
+  },
+  components: {},
+  data() {
+    return {
+      isEdit: false,
+      tabIndex: 'first',
+      dataId: '',
+      formImportLog: {},
+      impReturnTypeMap: {
+        success: this.$t1('成功'),
+        fail: this.$t1('失败')
+      }
+    };
+  },
+  created() {
+    if (this._dataId && !isNaN(this._dataId)) this.dataId = this._dataId;
+  },
+  mounted() {
+    this.getData();
+  },
+  methods: {
+    getData() {
+      if (this.dataId && !isNaN(this.dataId)) {
+        this.isEdit = true;
+        this.$commonHttp({
+          aes: true,
+          url: USER_PREFIX + `/form_import_log/get`,
+          method: `post`,
+          data: {
+            id: this.dataId
+          },
+          isLoading: true,
+          modalStrictly: true,
+          success: res => {
+            this.formImportLog = res.objx || {};
+          }
+        });
+      }
+    }
+  }
+};
+</script>

package/src/views/bd/setting/form_import_log/list.vue

@@ -0,0 +1,211 @@
+<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>
+      </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">
+                </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="treePathName">
+                  <template v-slot>
+                    <el-input v-model="formData.treePathName" size="small" clearable/>
+                  </template>
+                </vxe-form-item>
+                <vxe-form-item :title="$t1('日志类型')+':'" field="logType">
+                  <template v-slot>
+                    <el-input v-model="formData.logType" size="small" clearable/>
+                  </template>
+                </vxe-form-item>
+                <vxe-form-item :title="$t1('日志对象')+':'" field="logObj">
+                  <template v-slot>
+                    <el-input v-model="formData.logObj" size="small" clearable/>
+                  </template>
+                </vxe-form-item>
+                <vxe-form-item :title="$t1('结果')+':'" field="impReturnType">
+                  <template v-slot>
+                    <el-select v-model="formData.impReturnType" size="small" clearable>
+                      <el-option value="success" label="成功"></el-option>
+                      <el-option value="fail" label="失败"></el-option>
+                    </el-select>
+                  </template>
+                </vxe-form-item>
+                <vxe-form-item title="导入时间:" field="date1">
+                  <template #default="{ data }">
+                    <el-date-picker
+                      v-model="formData.startImpDate"
+                      type="datetime"
+                      placeholder=""
+                      size="small"
+                      clearable
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      :picker-options="$baseStartPickerOptions(formData.endImpDate)"
+                    ></el-date-picker>
+                    <span>-</span>
+                    <el-date-picker
+                      v-model="formData.endImpDate"
+                      type="datetime"
+                      placeholder=""
+                      size="small"
+                      clearable
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      default-time="23:59:59"
+                      :picker-options="$baseEndPickerOptions(formData.startImpDate)"
+                    ></el-date-picker>
+                  </template>
+                </vxe-form-item>
+              </vxe-form>
+            </template>
+          </vxe-grid>
+        </div>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import editView from './edit.vue';
+
+export default {
+  name: 'form_import_log:list',
+  components: {editView},
+  data() {
+    return {
+      activeName: 'second',
+      dataId: 0,
+      showEdit: false,
+      vxeOption: {},
+      formData: {}
+    };
+  },
+  mounted() {
+    this.initTableList();
+  },
+  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' ? 0 : id;
+      this.activeName = 'first';
+      this.$openEditView('showEdit');
+    },
+    initTableList() {
+      let that = this;
+      let impReturnTypeMap = {
+        success: this.$t1('成功'),
+        fail: this.$t1('失败')
+      }
+      let tableOption = {
+        aes: true,
+        vue: this,
+        tableRef: 'table-m1',
+        tableName: 'user_form_import_log_list-m1',
+        path: USER_PREFIX + '/form_import_log/listPage',
+        param: () => {
+          return this.formData;
+        },
+        columns: [
+          {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
+          {
+            title: this.$t1('表单分类路径'),
+            field: 'treePathName',
+            width: 250,
+            fixed: 'left'
+          },
+          {
+            field: 'logType',
+            title: this.$t1('日志类型'),
+            width: 150
+          },
+          {
+            field: 'version',
+            title: this.$t1('版本号'),
+            width: 150
+          },
+          {
+            field: 'logObj',
+            title: this.$t1('日志对象'),
+            width: 250,
+            slots: {
+              default: ({row}) => {
+                return `[${row.abc}] ${row.logObj}`;
+              }
+            }
+          },
+          {
+            field: 'impReturnType',
+            title: this.$t1('结果'),
+            width: 150,
+            slots: {
+              default: ({row}) => {
+                return impReturnTypeMap[row.impReturnType];
+              }
+            }
+          },
+          {
+            field: 'impReturnMsg',
+            title: this.$t1('失败描述'),
+            width: 250
+          },
+          {
+            field: 'impDate',
+            title: this.$t1('导入时间'),
+            width: 150
+          },
+          {
+            width: 47,
+            fixed: 'right',
+            title: '',
+            sortable: false,
+            slots: {
+              default: ({row}) => {
+                return [
+                  <div>
+                    <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>
+                  </div>
+                ];
+              }
+            }
+          }
+        ]
+      };
+      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+        this.vxeOption = opts;
+      });
+    }
+  }
+};
+</script>

package/src/views/bd/setting/form_script/edit.vue

@@ -3,16 +3,41 @@
     <el-form ref="editForm" :model="formScript" :disabled="readonly">
       <div class="d-header clearfix">
         <div class="fl">
-          <i class="el-icon-info"/>
-          {{ dataId ? $t1('查看表单脚本') : $t1('新增表单脚本') }}
+          <i class="el-icon-info" />
+          {{ dataId ? $t1("查看表单脚本") : $t1("新增表单脚本") }}
         </div>
         <div class="fr">
           <el-form>
-            <el-button type="primary" plain class="button-sty" @click="$baseReload()" icon="el-icon-refresh-right">
-              {{ $t1('重置') }}
+            <formVersionButton
+              v-if="!hData && formScript.id && !readonly"
+              objType="FormScript"
+              :objCode="formScript.scriptCode"
+              :relationCode="formScript.formCode"
+              @reverCallback="$baseReload()"
+            ></formVersionButton>
+            <reverButton
+              v-if="!!hData"
+              objType="FormScript"
+              :objCode="formScript.scriptCode"
+              :hData="hData"
+              @reverCallback="$emit('reverCallback')"
+            ></reverButton>
+            <el-button
+              type="primary"
+              plain
+              class="button-sty"
+              @click="$baseReload()"
+              icon="el-icon-refresh-right"
+            >
+              {{ $t1("重置") }}
             </el-button>
-            <el-button type="primary" class="button-sty" icon="el-icon-check" @click="saveData"
-                       v-if="isDev && !readonly">{{ $t1('保存') }}
+            <el-button
+              type="primary"
+              class="button-sty"
+              icon="el-icon-check"
+              @click="saveData"
+              v-if="isDev && !readonly"
+              >{{ $t1("保存") }}
             </el-button>
           </el-form>
         </div>
@@ -22,68 +47,153 @@
           <template #default>
             <table class="table-detail">
               <tbody>
-              <tr>
-                <th>
-                  <em class="f-red">*</em>
-                  {{ $t1('脚本名称') }}
-                </th>
-                <td colspan="3">
-                  <el-form-item prop="scriptName" :rules="[{ required: true, trigger: 'blur' }]">
-                    <el-input type="text" autocomplete="off" v-model="formScript.scriptName" clearable/>
-                  </el-form-item>
-                </td>
-                <th>{{ $t1('脚本编码') }}</th>
-                <td colspan="3">
-                  <el-form-item prop="scriptCode" :rules="[{ required: true, trigger: 'blur' }]">
-                    <el-input type="text" autocomplete="off" v-model="formScript.scriptCode" clearable/>
-                  </el-form-item>
-                </td>
-              </tr>
-              <tr>
-                <th>{{ $t1('开启事务') }}</th>
-                <td>
-                  <el-radio-group v-model="formScript.transactions">
-                    <el-radio :label="1">{{ $t1('是') }}</el-radio>
-                    <el-radio :label="0">{{ $t1('否') }}</el-radio>
-                  </el-radio-group>
-                </td>
-              </tr>
-              <tr>
-                <th>{{ $t1('脚本说明') }}</th>
-                <td colspan="7">
-                  <el-input type="textarea" :rows="2" :placeholder="$t1('请输入内容')" size="small"
-                            v-model="formScript.scriptRemark"
-                            clearable></el-input>
-                </td>
-              </tr>
-              <tr>
-                <th>
-                  <em class="f-red">*</em>
-                  {{ $t1('脚本') }}
-                  <!--                <scriptDescriptionButton path="static/readme/ApiRequest.txt"></scriptDescriptionButton>-->
-                  <scriptTestButton :script.sync="formScript.script"></scriptTestButton>
-                </th>
-                <td colspan="7">
-                  <el-form-item prop="script" :rules="[{ required: true, trigger: 'blur' }]">
-                    <code-editor mode="java" :readonly="readonly" v-model="formScript.script"
-                                 v-if="showCodeEditor"></code-editor>
-                  </el-form-item>
-                </td>
-              </tr>
-              <tr>
-                <th>{{ $t1('唯一标识') }}</th>
-                <td colspan="7">{{ formScript.sid }}</td>
-              </tr>
-              <tr>
-                <th>{{ $t1('创建人') }}</th>
-                <td>{{ formScript.createBy }}</td>
-                <th>{{ $t1('创建时间') }}</th>
-                <td>{{ formScript.createDate }}</td>
-                <th>{{ $t1('更新人') }}</th>
-                <td>{{ formScript.modifyBy }}</td>
-                <th>{{ $t1('更新时间') }}</th>
-                <td>{{ formScript.modifyDate }}</td>
-              </tr>
+                <tr>
+                  <th>
+                    <em class="f-red">*</em>
+                    {{ $t1("脚本名称") }}
+                  </th>
+                  <td colspan="3">
+                    <el-form-item
+                      prop="scriptName"
+                      :rules="[{ required: true, trigger: 'blur' }]"
+                    >
+                      <fieldCompare
+                        :isCompare="isCompare"
+                        :oldVal="oldFormScript.scriptName"
+                        :newVal="formScript.scriptName"
+                      >
+                        <el-input
+                          type="text"
+                          autocomplete="off"
+                          v-model="formScript.scriptName"
+                          clearable
+                        />
+                      </fieldCompare>
+                    </el-form-item>
+                  </td>
+                  <th>{{ $t1("脚本编码") }}</th>
+                  <td colspan="3">
+                    <el-form-item
+                      prop="scriptCode"
+                      :rules="[{ required: true, trigger: 'blur' }]"
+                    >
+                      <fieldCompare
+                        :isCompare="isCompare"
+                        :oldVal="oldFormScript.scriptCode"
+                        :newVal="formScript.scriptCode"
+                      >
+                        <el-input
+                          type="text"
+                          autocomplete="off"
+                          v-model="formScript.scriptCode"
+                          clearable
+                        />
+                      </fieldCompare>
+                    </el-form-item>
+                  </td>
+                </tr>
+                <tr>
+                  <th>{{ $t1("是否启用") }}</th>
+                  <td>
+                    <el-form-item
+                      prop="enabled"
+                      :rules="[{ required: false, trigger: 'blur' }]"
+                    >
+                      <fieldCompare
+                        :isCompare="isCompare"
+                        :oldVal="oldFormScript.enabled"
+                        :newVal="formScript.enabled"
+                      >
+                        <el-radio-group v-model="formScript.enabled">
+                          <el-radio :label="true">{{ $t1("启用") }}</el-radio>
+                          <el-radio :label="false">{{ $t1("禁用") }}</el-radio>
+                        </el-radio-group>
+                      </fieldCompare>
+                    </el-form-item>
+                  </td>
+                  <th>{{ $t1("开启事务") }}</th>
+                  <td>
+                    <el-form-item>
+                      <fieldCompare
+                        :isCompare="isCompare"
+                        :oldVal="oldFormScript.transactions"
+                        :newVal="formScript.transactions"
+                      >
+                        <el-radio-group v-model="formScript.transactions">
+                          <el-radio :label="1">{{ $t1("是") }}</el-radio>
+                          <el-radio :label="0">{{ $t1("否") }}</el-radio>
+                        </el-radio-group>
+                      </fieldCompare>
+                    </el-form-item>
+                  </td>
+                </tr>
+                <tr>
+                  <th>{{ $t1("脚本说明") }}</th>
+                  <td colspan="7">
+                    <el-form-item
+                      prop="scriptRemark"
+                      :rules="[{ required: false, trigger: 'blur' }]"
+                    >
+                      <fieldCompare
+                        :isCompare="isCompare"
+                        :oldVal="oldFormScript.scriptRemark"
+                        :newVal="formScript.scriptRemark"
+                      >
+                        <el-input
+                          type="textarea"
+                          :rows="2"
+                          :placeholder="$t1('请输入内容')"
+                          size="small"
+                          v-model="formScript.scriptRemark"
+                          clearable
+                        ></el-input>
+                      </fieldCompare>
+                    </el-form-item>
+                  </td>
+                </tr>
+                <tr>
+                  <th>
+                    <em class="f-red">*</em>
+                    {{ $t1("脚本") }}
+                    <!--                <scriptDescriptionButton path="static/readme/ApiRequest.txt"></scriptDescriptionButton>-->
+                    <scriptTestButton :script.sync="formScript.script"></scriptTestButton>
+                  </th>
+                  <td colspan="7">
+                    <el-form-item
+                      prop="script"
+                      :rules="[{ required: true, trigger: 'blur' }]"
+                    >
+                      <fieldCompare
+                        :isCompare="isCompare"
+                        :oldVal="oldFormScript.script"
+                        :newVal="formScript.script"
+                      >
+                        <code-editor
+                          mode="java"
+                          :readonly="!1"
+                          v-model="formScript.script"
+                          v-if="showCodeEditor"
+                        ></code-editor>
+                      </fieldCompare>
+                    </el-form-item>
+                  </td>
+                </tr>
+                <tr>
+                  <th>{{ $t1("版本号") }}</th>
+                  <td>{{ formScript.version }}</td>
+                  <th>{{ $t1("唯一标识") }}</th>
+                  <td colspan="5">{{ formScript.sid }}</td>
+                </tr>
+                <tr>
+                  <th>{{ $t1("创建人") }}</th>
+                  <td>{{ formScript.createBy }}</td>
+                  <th>{{ $t1("创建时间") }}</th>
+                  <td>{{ formScript.createDate }}</td>
+                  <th>{{ $t1("更新人") }}</th>
+                  <td>{{ formScript.modifyBy }}</td>
+                  <th>{{ $t1("更新时间") }}</th>
+                  <td>{{ formScript.modifyDate }}</td>
+                </tr>
               </tbody>
             </table>
           </template>
@@ -94,18 +204,30 @@
           </template>
         </baseTabPane>
       </baseTabs>
-      <preformDialog v-if="showPreformDialog" :visiable.sync="showPreformDialog"
-                     :placeholder="formScript.transactions!==1?$t1('注：当前脚本未开启事务'):null"
-                     @confirm="confirmPreformDialog"></preformDialog>
+      <preformDialog
+        v-if="showPreformDialog"
+        :visiable.sync="showPreformDialog"
+        :placeholder="
+          formScript.transactions !== 1 ? $t1('注：当前脚本未开启事务') : null
+        "
+        @confirm="confirmPreformDialog"
+      ></preformDialog>
     </el-form>
   </div>
 </template>
 
 <script>
 import mixin from "./mixins/edit";
-
+import formVersionButton from "@base/views/bd/setting/formVersion/button.vue";
+import reverButton from "@base/views/bd/setting/formVersion/reverButton.vue";
+import fieldCompare from "@base/views/bd/setting/formVersion/fieldCompare.vue";
 export default {
-  name: 'user_form_scriptEdit',
-  mixins: [mixin]
+  name: "user_form_scriptEdit",
+  mixins: [mixin],
+  components: {
+    formVersionButton,
+    reverButton,
+    fieldCompare,
+  },
 };
 </script>