@dhccmobile/vue3-lo-form 0.1.19 → 0.1.21

package/dist/vue3-lo-form.common.js

@@ -85122,7 +85122,8 @@ class FormApi_FormApi {
   getValue(key) {
     const control = this.getControl(key);
 
-    if (control && control instanceof FormControl_FormControl) {
+    if (control) {
+      //  && control instanceof FormControl
       return this.decodeData(control, false);
     }
 
@@ -85622,7 +85623,8 @@ class FormApi_FormApi {
 
 
   setControlValue(control, key, val, isDefault, validate = true) {
-    if (control && control instanceof FormControl_FormControl) {
+    if (control) {
+      // && control instanceof FormControl
       switch (control.code) {
         case constants_enum["g" /* FormFieldType */].InputNumber.code:
           if (val && control.controlAttr.zoomMultiple) {
@@ -85934,6 +85936,7 @@ class FormApi_FormApi {
 
   contrast(objectA, objectB) {
     const object = {};
+    const data = {};
     const fieldInfoArr = [];
 
     if (!objectB || !objectA) {
@@ -85941,6 +85944,8 @@ class FormApi_FormApi {
       return object;
     }
 
+    console.log("======", this.dvForm.desForm.formGroup.controls);
+
     for (const key in this.dvForm.desForm.formGroup.controls) {
       if (!objectA[key] && !objectB[key]) {
         continue;
@@ -85956,48 +85961,123 @@ class FormApi_FormApi {
         continue;
       }
 
-      if (objectA[key] + "" !== objectB[key] + "") {
+      if (this.getChangedInfo(control, objectA[key], objectB[key])) {
         const oldValue = objectA[key]; // 记录新值
 
         const newValue = objectB[key]; // 记录旧值
 
         const fieldInfo = {}; //日志信息
 
-        fieldInfo.field_cd = key; //字段英文
+        if (control.code !== constants_enum["g" /* FormFieldType */].Custom.code) {
+          fieldInfo.field_cd = key; //字段英文
 
-        const name = control.controlAttr.formFieldDescribe;
-        fieldInfo.field_nm = name; //字段中文
+          const name = control.controlAttr.formFieldDescribe;
+          fieldInfo.field_nm = name; //字段中文
 
-        fieldInfo.field_key = newValue; //当前值
+          fieldInfo.field_key = newValue; //当前值
 
-        const newDict = this.translateDictionaries(control, key, newValue); // 新值描述
+          const newDict = this.translateDictionaries(control, key, newValue); // 新值描述
 
-        fieldInfo.field_value = newDict; //当前值描述
+          fieldInfo.field_value = newDict; //当前值描述
 
-        fieldInfo.is_change = "1"; //是否变动
+          fieldInfo.is_change = "1"; //是否变动
 
-        fieldInfo.field_old_key = oldValue; //旧值
+          fieldInfo.field_old_key = oldValue; //旧值
 
-        const oldDict = this.translateDictionaries(control, key, oldValue); //旧值描述
+          const oldDict = this.translateDictionaries(control, key, oldValue); //旧值描述
 
-        fieldInfo.field_old_value = oldDict; //field_old_value
+          fieldInfo.field_old_value = oldDict; //field_old_value
 
-        object[key] = newValue;
-        fieldInfoArr.push(fieldInfo);
-        object.fieldInfoArr = fieldInfoArr;
-        const oldName = oldValue ? oldDict : "空";
-        const newName = newValue ? newDict : "空";
+          object[key] = newValue;
+          fieldInfoArr.push(fieldInfo);
+          const oldName = oldValue ? oldDict : "空";
+          const newName = newValue ? newDict : "空"; //除自定义组件均记录日志
 
-        if (control.code !== constants_enum["g" /* FormFieldType */].Custom.code) {
-          //除自定义组件均记录日志
           object.changeLog = object.changeLog ? object.changeLog + "，" : "";
           object.changeLog = object.changeLog + "修改【" + name + "】" + "由“" + oldName + "”修改为“" + newName + "”";
+        } else {
+          object[key] = newValue;
         }
       }
     }
 
+    object.fieldInfoArr = fieldInfoArr;
     return object;
   }
+  /**
+   * @Description: 获取表单值更改信息
+   * @author lzs
+   * @date 2022/10/11
+   * @time 09:53
+   */
+
+
+  getChangedInfo(control, oldValue, newValue) {
+    oldValue = oldValue + "";
+    newValue = newValue + "";
+    let flag = true;
+
+    switch (control.code) {
+      case constants_enum["g" /* FormFieldType */].Input.code:
+        if (oldValue === newValue) flag = false;
+        break;
+
+      case constants_enum["g" /* FormFieldType */].InputNumber.code:
+        if (oldValue === newValue) flag = false;
+        break;
+
+      case constants_enum["g" /* FormFieldType */].Textarea.code:
+        if (oldValue === newValue) flag = false;
+        break;
+
+      case constants_enum["g" /* FormFieldType */].Slider.code:
+        if (oldValue === newValue) flag = false;
+        break;
+
+      case constants_enum["g" /* FormFieldType */].Rate.code:
+        if (oldValue === newValue) flag = false;
+        break;
+
+      case constants_enum["g" /* FormFieldType */].Select.code:
+        if (oldValue === newValue) flag = false;
+        break;
+
+      case constants_enum["g" /* FormFieldType */].Checkbox.code:
+        if (oldValue === newValue) flag = false;
+        break;
+
+      case constants_enum["g" /* FormFieldType */].Radio.code:
+        if (oldValue === newValue) flag = false;
+        break;
+
+      case constants_enum["g" /* FormFieldType */].TimePicker.code:
+        if (oldValue === newValue) flag = false;
+        break;
+
+      case constants_enum["g" /* FormFieldType */].DatePicker.code:
+        oldValue = dateFormat.formatDateTime(oldValue, "YYYY-MM-dd");
+        newValue = dateFormat.formatDateTime(newValue, "YYYY-MM-dd");
+        if (oldValue === newValue) flag = false;
+        break;
+
+      case constants_enum["g" /* FormFieldType */].Cascader.code:
+        if (oldValue === newValue) flag = false;
+        break;
+
+      case constants_enum["g" /* FormFieldType */].TreeSelect.code:
+        if (oldValue === newValue) flag = false;
+        break;
+
+      case constants_enum["g" /* FormFieldType */].Switch.code:
+        if (oldValue === newValue) flag = false;
+        break;
+
+      case constants_enum["g" /* FormFieldType */].Custom.code:
+        break;
+    }
+
+    return flag;
+  }
   /**
    * @Description: 翻译字典项
    * @author lzs
@@ -86093,13 +86173,17 @@ class FormApi_FormApi {
       case constants_enum["g" /* FormFieldType */].Cascader.code:
         str = "";
         formTreeNodeConvertService.treeNodeConvertToArray(control.controlAttr.treeShapeOptions, [], "children").forEach(item => {
-          value.split(",").forEach(index => {
-            if (item.value === index) {
-              str = str + item.title + ",";
-            }
-          });
+          if (value) {
+            value.split(",").forEach(index => {
+              if (item.value === index) {
+                str = str + item.title + ",";
+              }
+            });
+            str = str.substring(0, str.length - 1);
+          } else {
+            str = "";
+          }
         });
-        str = str.substring(0, str.length - 1);
         break;
 
       case constants_enum["g" /* FormFieldType */].TreeSelect.code: