cloud-web-corejs-haier 1.0.43 → 1.0.45

package/src/views/bd/setting/formVersion/textDiff.js

@@ -0,0 +1,102 @@
+/**
+ * 基于 LCS 的行级 diff，返回左右两侧需要高亮的行号（0-based）
+ */
+export function diffLines(oldStr, newStr) {
+  const oldLines = (oldStr || "").split("\n");
+  const newLines = (newStr || "").split("\n");
+  const m = oldLines.length;
+  const n = newLines.length;
+  const dp = buildLcsDp(oldLines, newLines);
+
+  const oldMarks = [];
+  const newMarks = [];
+  const rawOps = [];
+  let i = m;
+  let j = n;
+
+  while (i > 0 || j > 0) {
+    if (i > 0 && j > 0 && oldLines[i - 1] === newLines[j - 1]) {
+      rawOps.unshift({ type: "eq", old: i - 1, new: j - 1 });
+      i--;
+      j--;
+    } else if (j > 0 && (i === 0 || dp[i][j - 1] >= dp[i - 1][j])) {
+      newMarks.unshift(j - 1);
+      rawOps.unshift({ type: "ins", new: j - 1 });
+      j--;
+    } else {
+      oldMarks.unshift(i - 1);
+      rawOps.unshift({ type: "del", old: i - 1 });
+      i--;
+    }
+  }
+
+  const diffNavList = buildDiffHunks(rawOps);
+
+  return { oldMarks, newMarks, diffNavList };
+}
+
+function buildLcsDp(oldLines, newLines) {
+  const m = oldLines.length;
+  const n = newLines.length;
+  const dp = Array.from({ length: m + 1 }, () => Array(n + 1).fill(0));
+
+  for (let i = 1; i <= m; i++) {
+    for (let j = 1; j <= n; j++) {
+      if (oldLines[i - 1] === newLines[j - 1]) {
+        dp[i][j] = dp[i - 1][j - 1] + 1;
+      } else {
+        dp[i][j] = Math.max(dp[i - 1][j], dp[i][j - 1]);
+      }
+    }
+  }
+
+  return dp;
+}
+
+function buildDiffHunks(rawOps) {
+  const hunks = [];
+  let hunk = null;
+  let lastEqOld = -1;
+  let lastEqNew = -1;
+
+  rawOps.forEach((op) => {
+    if (op.type === "eq") {
+      if (hunk) {
+        hunks.push(finalizeHunk(hunk, lastEqOld, lastEqNew));
+        hunk = null;
+      }
+      lastEqOld = op.old;
+      lastEqNew = op.new;
+      return;
+    }
+
+    if (!hunk) {
+      hunk = { left: null, right: null, leftEnd: null, rightEnd: null };
+    }
+
+    if (op.type === "del") {
+      if (hunk.left == null) hunk.left = op.old;
+      hunk.leftEnd = op.old;
+    } else {
+      if (hunk.right == null) hunk.right = op.new;
+      hunk.rightEnd = op.new;
+    }
+  });
+
+  if (hunk) {
+    hunks.push(finalizeHunk(hunk, lastEqOld, lastEqNew));
+  }
+
+  return hunks;
+}
+
+function finalizeHunk(hunk, lastEqOld, lastEqNew) {
+  return {
+    left: hunk.left,
+    right: hunk.right,
+    leftEnd: hunk.leftEnd,
+    rightEnd: hunk.rightEnd,
+    anchorLeft: Math.max(lastEqOld, 0),
+    anchorRight: Math.max(lastEqNew, 0),
+  };
+}

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

@@ -19,7 +19,12 @@
             <tbody>
             <tr>
               <th>
-                <em class="f-red">*</em>
+                {{ $t1('版本号') }}
+              </th>
+              <td>
+                {{ formImportLog.version }}
+              </td>
+              <th>
                 {{ $t1('表单分类路径') }}
               </th>
               <td colspan="5">
@@ -28,14 +33,12 @@
             </tr>
             <tr>
               <th>
-                <em class="f-red">*</em>
                 {{ $t1('日志类型') }}
               </th>
               <td>
                 {{ formImportLog.logType }}
               </td>
               <th>
-                <em class="f-red">*</em>
                 {{ $t1('日志对象') }}
               </th>
               <td colspan="3">

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

@@ -139,6 +139,11 @@ export default {
             title: this.$t1('日志类型'),
             width: 150
           },
+          {
+            field: 'version',
+            title: this.$t1('版本号'),
+            width: 150
+          },
           {
             field: 'logObj',
             title: this.$t1('日志对象'),

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,77 +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-form-item prop="enabled" :rules="[{ required: false, trigger: 'blur' }]">
-                    <el-radio-group v-model="formScript.enabled">
-                      <el-radio :label="true">{{ $t1('启用') }}</el-radio>
-                      <el-radio :label="false">{{ $t1('禁用') }}</el-radio>
-                    </el-radio-group>
-                  </el-form-item>
-                </td>
-                <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>
@@ -103,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>