vue2-client 1.8.127 → 1.8.128

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.8.127",
+  "version": "1.8.128",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/common/XReport/XReport.vue

@@ -49,6 +49,10 @@ export default {
     activatedSlotName: {
       type: String,
       default: undefined
+    },
+    localConfig: {
+      type: Object,
+      default: undefined
     }
   },
   components: {
@@ -419,13 +423,9 @@ export default {
         console.error('插槽配置有误！')
         outerLock.status = false
       }
-    }
-  },
-  beforeMount () {
-    // 获取主配置
-    getConfigByName(this.configName, undefined, res => {
-      this.config = res
-
+    },
+    // 获取配置之后的初始化
+    configInit () {
       const lock = { status: true }
 
       this.getConfigAndJoin(this.config, lock)
@@ -443,18 +443,22 @@ export default {
           })
         }
       }, 100)
-
-      // setTimeout(() => {
-      //   console.log('拼接完成', this.config)
-      //   this.originalConfig = Object.assign({}, this.config)
-      //   // 扫描配置文件中有没有rowSpan，进行格式化调整
-      //   this.formatConfigRow(this.config)
-      //   this.activeConfig = this.config
-      //   this.$nextTick(() => {
-      //     this.scanFinish = true
-      //   })
-      // }, 1000)
-    })
+    }
+  },
+  beforeMount () {
+    console.warn('123', this.localConfig)
+    if (this.localConfig) {
+      console.warn('1')
+      this.config = this.localConfig
+      this.configInit()
+    } else {
+      getConfigByName(this.configName, undefined, res => {
+        console.warn('res', res)
+        this.config = res
+        console.warn('2', res)
+        this.configInit()
+      })
+    }
   }
 }
 </script>

package/src/pages/Example/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
-    <XReport :config-name="'test_tableConfig'" :activated-slot-name="'test_tableConfig_slot'"/>
-    <!--    <XReport :config-name="'test_tableConfig'"/>-->
+    <!--    <XReport :config-name="'test_tableConfig'" :activated-slot-name="'test_tableConfig_slot'"/>-->
+    <XReport :config-name="'test_tableConfig'" :local-config="test_config"/>
   </div>
 </template>
 
@@ -12,6 +12,233 @@ export default {
     name: 'Example',
     components: {
       XReport
+    },
+    data () {
+      return {
+        test_config: {
+          slotsDefine: {},
+          subTitle: [
+            {
+              dataIndex: 'subTitleDate',
+              format: '{}年{}月{}日',
+              type: 'inputs'
+            },
+            {
+              dataIndex: 'subTitleCompany',
+              format: '（级别：{}）',
+              type: 'inputs'
+            },
+            {
+              dataIndex: 'subTitleNumber',
+              format: '编号：{}',
+              type: 'inputs'
+            }
+          ],
+          slotsDeclare: [
+            'test_tableConfig_slot'
+          ],
+          data: {
+            subTitleNumber: [
+              '12580'
+            ],
+            unitName: 'xxx单位',
+            startDateArr3: [],
+            startDateArr2: [
+              '14',
+              '06'
+            ],
+            subTitleDate: [
+              '2024',
+              '2',
+              '28'
+            ],
+            remark: '',
+            endDateArr2: [
+              '15',
+              '38'
+            ],
+            endDateArr: [
+              '2',
+              '28'
+            ],
+            subTitleCompany: [
+              'xxx分公司'
+            ],
+            startDateArr: [
+              '2',
+              '28'
+            ],
+            actionPerson: '张三',
+            taskName: '',
+            addressName: 'xxxx地点',
+            guardian: ''
+          },
+          columns: [
+            [
+              {
+                rowSpan: 0,
+                showRowSpan: 0,
+                colSpan: 2,
+                show: true,
+                text: '操作任务',
+                type: 'column'
+              },
+              {
+                rowSpan: 0,
+                colSpan: 10,
+                style: {
+                  color: 'blue',
+                  fontSize: '1.5em'
+                },
+                type: 'value',
+                value: '立管置换及顶层用户通气点火工艺流程'
+              }
+            ],
+            [
+              {
+                rowSpan: 0,
+                showRowSpan: 0,
+                colSpan: 2,
+                show: true,
+                text: '操作单位',
+                type: 'column'
+              },
+              {
+                rowSpan: 0,
+                colSpan: 4,
+                dataIndex: 'unitName',
+                noBoarder: false,
+                type: 'input'
+              },
+              {
+                rowSpan: 0,
+                showRowSpan: 0,
+                colSpan: 2,
+                show: true,
+                text: '操作地点',
+                type: 'column'
+              },
+              {
+                rowSpan: 0,
+                colSpan: 4,
+                dataIndex: 'addressName',
+                noBoarder: false,
+                type: 'input'
+              }
+            ],
+            [
+              {
+                rowSpan: 2,
+                colSpan: 2,
+                text: '开 始',
+                type: 'column'
+              },
+              {
+                rowSpan: 1,
+                colSpan: 4,
+                dataIndex: 'startDateArr',
+                format: '{}月{}日',
+                type: 'inputs'
+              },
+              {
+                rowSpan: 1,
+                colSpan: 4,
+                dataIndex: 'startDateArr2',
+                format: '{}时{}分',
+                type: 'inputs'
+              },
+              {
+                rowSpan: 2,
+                colSpan: 2,
+                text: '完 毕',
+                type: 'column'
+              },
+              {
+                rowSpan: 1,
+                colSpan: 4,
+                dataIndex: 'endDateArr',
+                format: '{}月{}日',
+                type: 'inputs'
+              },
+              {
+                rowSpan: 1,
+                colSpan: 4,
+                dataIndex: 'endDateArr2',
+                format: '{}时{}分',
+                type: 'inputs'
+              }
+            ],
+            [
+              {
+                rowSpan: 0,
+                slotConfig: 'test_tableConfig_slot',
+                type: 'slot'
+              }
+            ],
+            [
+              {
+                rowSpan: 0,
+                showRowSpan: 0,
+                colSpan: 2,
+                show: true,
+                text: '备注',
+                type: 'column'
+              },
+              {
+                rowSpan: 0,
+                colSpan: 10,
+                dataIndex: 'remark',
+                noBoarder: false,
+                type: 'input'
+              }
+            ],
+            [
+              {
+                rowSpan: 2,
+                showRowSpan: 2,
+                colSpan: 2,
+                show: true,
+                text: '操作人',
+                type: 'column'
+              },
+              {
+                rowSpan: 2,
+                showRowSpan: 2,
+                colSpan: 4,
+                dataIndex: 'actionPerson',
+                show: true,
+                noBoarder: false,
+                style: {
+                  fontSize: '1.5em'
+                },
+                type: 'input'
+              },
+              {
+                rowSpan: 2,
+                showRowSpan: 2,
+                colSpan: 2,
+                show: true,
+                text: '监护人',
+                type: 'column'
+              },
+              {
+                rowSpan: 2,
+                showRowSpan: 2,
+                colSpan: 4,
+                dataIndex: 'guardian',
+                show: true,
+                noBoarder: false,
+                type: 'input'
+              }
+            ]
+          ],
+          width: 'auto',
+          style: {
+            fontWeight: 'bolder'
+          },
+          title: '陕西城市燃气产业发展有限公司<br/>操作卡'
+        }
+      }
     }
   }
 </script>

package/src/utils/indexedDB.js

@@ -135,12 +135,12 @@ export const indexedDB = {
           if (!result && url) {
             post(url, params).then((res) => {
               if (processFun) { res = processFun(res) }
-              if (import.meta.env.NODE_ENV === 'production' || key !== 'webMobileConfig') { self.add(key, res) }
+              if (process.env.NODE_ENV === 'production' || key !== 'webMobileConfig') { self.add(key, res) }
               callback(res)
               // 解锁这个键
               resolve()
             }).catch(() => {
-              if (import.meta.env.NODE_ENV === 'production' || key !== 'webMobileConfig') { self.add(key, null) }
+              if (process.env.NODE_ENV === 'production' || key !== 'webMobileConfig') { self.add(key, null) }
               callback(null)
               // 解锁这个键
               resolve()