vue2-client 1.2.28 → 1.2.31

package/src/base-client/components/common/XAddNativeForm/index.md

@@ -1,56 +1,56 @@
-# XAddNativeForm
-
-动态新增/修改表单控件，根据JSON配置生成一个完整的可供新增/修改数据的动态表单
-
-
-## 何时使用
-
-当需要一个可供新增/修改数据的动态生成的表单时
-
-
-引用方式：
-
-```javascript
-import XAddNativeForm from '@vue2-client/base-client/components/XAddNativeForm/XAddNativeForm'
-
-export default {
-    components: {
-      XAddNativeForm
-    }
-}
-```
-
-
-
-## 代码演示
-
-```html
-<x-add-form
-  :business-type="businessType"
-  :json-data="formItems"
-  :modify-model-data="modifyModelData"
-  :loading="loading"
-  @onSubmit="onSubmit">
-</x-add-form>
-```
-
-## API
-
-| 参数              | 说明                       | 类型      | 默认值   |
-|-----------------|--------------------------|---------|-------|
-| businessType    | 业务类型                     | String  | ''    |
-| jsonData        | JSON配置，根据[工具>查询配置生成]功能生成 | Object  | {}    |
-| modifyModelData | 修改操作前查询出的业务数据            | Object  | {}    |
-| loading         | 新增或修改业务是否执行中             | Boolean | false |
-| fixedAddForm    | 固定新增表单，会和新增表单合并          | Object  | {}    |
-| @onSubmit       | 表单的提交事件                  | event   | -     |
-
-## 例子1
-----
-参考XFormTable组件
-```
-
-注意事项
-----
-
-> 本组件已经实现了自适应布局，在不同分辨率下的设备均可得到基本理想的展示效果
+# XAddNativeForm
+
+动态新增/修改表单控件，根据JSON配置生成一个完整的可供新增/修改数据的动态表单
+
+
+## 何时使用
+
+当需要一个可供新增/修改数据的动态生成的表单时
+
+
+引用方式：
+
+```javascript
+import XAddNativeForm from '@vue2-client/base-client/components/XAddNativeForm/XAddNativeForm'
+
+export default {
+    components: {
+      XAddNativeForm
+    }
+}
+```
+
+
+
+## 代码演示
+
+```html
+<x-add-form
+  :business-type="businessType"
+  :json-data="formItems"
+  :modify-model-data="modifyModelData"
+  :loading="loading"
+  @onSubmit="onSubmit">
+</x-add-form>
+```
+
+## API
+
+| 参数              | 说明                       | 类型      | 默认值   |
+|-----------------|--------------------------|---------|-------|
+| businessType    | 业务类型                     | String  | ''    |
+| jsonData        | JSON配置，根据[工具>查询配置生成]功能生成 | Object  | {}    |
+| modifyModelData | 修改操作前查询出的业务数据            | Object  | {}    |
+| loading         | 新增或修改业务是否执行中             | Boolean | false |
+| fixedAddForm    | 固定新增表单，会和新增表单合并          | Object  | {}    |
+| @onSubmit       | 表单的提交事件                  | event   | -     |
+
+## 例子1
+----
+参考XFormTable组件
+```
+
+注意事项
+----
+
+> 本组件已经实现了自适应布局，在不同分辨率下的设备均可得到基本理想的展示效果

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

@@ -70,7 +70,7 @@
 </template>
 <script>
 import XFormItem from '@vue2-client/base-client/components/common/XForm/XFormItem'
-import { post } from '@vue2-client/services/api/restTools'
+import { post } from '@vue2-client/services/api'
 
 export default {
     name: 'XForm',

package/src/base-client/components/common/XForm/XFormItem.vue

@@ -161,11 +161,53 @@
     </a-form-model-item>
   </x-form-col>
   <!-- TODO 文件上传 -->
+  <x-form-col
+    :xl="24"
+    :xxl="24"
+    :xs="24"
+    :sm="24"
+    :md="24"
+    :lg="24"
+    v-else-if="attr.type === 'file'">
+    <a-form-model-item :ref="attr.model" :label="attr.name" :prop="attr.model">
+      <a-upload-dragger
+        name="file"
+        :multiple="true"
+        :action="'/webmeteruploadapi/upload/'+attr.resUploadMode">
+        <p class="ant-upload-drag-icon">
+          <a-icon type="inbox"/>
+        </p>
+        <p class="ant-upload-text">
+          点击或拖动文件到该区域上传
+        </p>
+        <p class="ant-upload-hint">
+          支持单个或多个文件
+        </p>
+      </a-upload-dragger>
+    </a-form-model-item>
+  </x-form-col>
   <!-- TODO 图片上传 -->
+  <x-form-col
+    :xl="24"
+    :xxl="24"
+    :xs="24"
+    :sm="24"
+    :md="24"
+    :lg="24"
+    v-else-if="attr.type === 'image'">
+    <a-form-model-item :ref="attr.model" :label="attr.name" :prop="attr.model">
+      <a-upload list-type="picture-card" :file-list="[]">
+        <a-icon type="plus"/>
+        <div class="ant-upload-text">
+          Upload
+        </div>
+      </a-upload>
+    </a-form-model-item>
+  </x-form-col>
 </template>
 <script>
 
-import { post } from '@vue2-client/services/api/restTools'
+import { post } from '@vue2-client/services/api'
 import { debounce } from 'ant-design-vue/lib/vc-table/src/utils'
 
 export default {

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

@@ -57,11 +57,10 @@
 import XForm from '@vue2-client/base-client/components/common/XForm/XForm'
 import XAddForm from '@vue2-client/base-client/components/common/XAddForm/XAddForm'
 import XTable from '@vue2-client/base-client/components/common/XTable/XTable'
-import { query, commonApi, addOrModify, remove } from '@vue2-client/services/api/common'
+import { commonApi, query, addOrModify, remove, post } from '@vue2-client/services/api'
 import { indexedDB } from '@vue2-client/utils/indexedDB'
 import { mapState } from 'vuex'
 import { Modal } from 'ant-design-vue'
-import { post } from '@vue2-client/services/api/restTools'
 
 export default {
   name: 'XFormTable',

package/src/base-client/components/iot/CustomerDetailsView/CustomerDetailsView.vue

@@ -74,8 +74,7 @@
 
 <script>
 import { formatDate } from '@vue2-client/utils/util'
-import { CustomerDetailsViewApi } from '@vue2-client/services/api/CustomerDetailsViewApi'
-import { post } from '@vue2-client/services/api/restTools'
+import { CustomerDetailsViewApi, post } from '@vue2-client/services/api'
 import { mapState } from 'vuex'
 
 export default {

package/src/base-client/components/iot/DeviceBrandDetailsView/DeviceBrandDetailsView.vue

@@ -116,8 +116,7 @@
 <script>
 import JsonViewer from 'vue-json-viewer'
 import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
-import { DeviceBrandDetailsViewApi } from '@vue2-client/services/api/DeviceBrandDetailsViewApi'
-import { post } from '@vue2-client/services/api/restTools'
+import { DeviceBrandDetailsViewApi, post } from '@vue2-client/services/api'
 import { mapGetters, mapState } from 'vuex'
 
 const leftTableColumns = [

package/src/base-client/components/iot/DeviceDetailsView/DeviceDetailsView.vue

@@ -58,9 +58,8 @@
 
 <script>
 import { DeviceDetailsMain, DeviceDetailsCount, DeviceDetailsInstruct, DeviceDetailsRead, DeviceDetailsSingular, DeviceDetailsInstructOperate } from '@vue2-client/base-client/components/iot/DeviceDetailsView/part'
-import { post } from '@vue2-client/services/api/restTools'
+import { DeviceDetailsViewApi, post } from '@vue2-client/services/api'
 import { mapState } from 'vuex'
-import { DeviceDetailsViewApi } from '@vue2-client/services/api/DeviceDetailsViewApi'
 
 export default {
   name: 'DeviceDetailsView',

package/src/base-client/components/iot/DeviceDetailsView/part/DeviceDetailsCount.vue

@@ -80,7 +80,7 @@
   import { Area, Line } from '@antv/g2plot/lib/index'
   import ARow from 'ant-design-vue/es/grid/Row'
   import ACol from 'ant-design-vue/es/grid/Col'
-  import { MeterDetailsViewApi } from '@vue2-client/services/api/MeterDetailsViewApi'
+  import { MeterDetailsViewApi } from '@vue2-client/services/api'
 
   export default {
     name: 'DeviceDetailsCount',

package/src/base-client/components/iot/DeviceDetailsView/part/DeviceDetailsInstructOperate.vue

@@ -12,9 +12,8 @@
 <script>
 
   import { STable, Ellipsis } from '@vue2-client/components'
-  import { post } from '@vue2-client/services/api/restTools'
+  import { DeviceDetailsViewApi, post } from '@vue2-client/services/api'
   import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
-  import { DeviceDetailsViewApi } from '@vue2-client/services/api/DeviceDetailsViewApi'
 
   export default {
     name: 'DeviceDetailsInstructOperate',

package/src/base-client/components/iot/DeviceTypeDetailsView/DeviceTypeDetailsView.vue

@@ -66,8 +66,7 @@
 <script>
 import JsonViewer from 'vue-json-viewer'
 import { mapState, mapGetters } from 'vuex'
-import { post } from '@vue2-client/services/api/restTools'
-import { DeviceTypeDetailsViewApi } from '@vue2-client/services/api/DeviceTypeDetailsViewApi'
+import { DeviceTypeDetailsViewApi, post } from '@vue2-client/services/api'
 import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
 
 export default {

package/src/base-client/components/iot/InstructDetailsView/InstructDetailsView.vue

@@ -133,9 +133,7 @@
 <script>
 import JsonViewer from 'vue-json-viewer'
 import { formatDate } from '@vue2-client/utils/util'
-import { InstructDetailsViewApi } from '@vue2-client/services/api/InstructDetailsViewApi'
-import { post } from '@vue2-client/services/api/restTools'
-import { query, commonApi } from '@vue2-client/services/api/common'
+import { InstructDetailsViewApi, post, query, commonApi } from '@vue2-client/services/api'
 import XTable from '@vue2-client/base-client/components/common/XTable/XTable'
 import { mapState } from 'vuex'
 

package/src/base-client/components/iot/LogDetailsView/LogDetailsView.vue

@@ -132,8 +132,7 @@
 
 <script>
 import { formatDate } from '@vue2-client/utils/util'
-import { LogDetailsViewApi } from '@vue2-client/services/api/LogDetailsViewApi'
-import { post } from '@vue2-client/services/api/restTools'
+import { LogDetailsViewApi, post } from '@vue2-client/services/api'
 import { mapState } from 'vuex'
 
 const statusIconMap = {

package/src/base-client/components/iot/MeterDetailsView/MeterDetailsView.vue

@@ -95,8 +95,7 @@
 <script>
 import { MeterDetailsMain, MeterDetailsCount, MeterDetailsHandPlan,
   MeterDetailsSellGas, MeterDetailsException, MeterDetailsInstruct } from '@vue2-client/base-client/components/iot/MeterDetailsView/part'
-import { MeterDetailsViewApi } from '@vue2-client/services/api/MeterDetailsViewApi'
-import { post } from '@vue2-client/services/api/restTools'
+import { MeterDetailsViewApi, post } from '@vue2-client/services/api'
 import { mapState } from 'vuex'
 
 export default {

package/src/base-client/components/iot/MeterDetailsView/part/MeterDetailsCount.vue

@@ -80,7 +80,7 @@
   import { Area, Line } from '@antv/g2plot'
   import ARow from 'ant-design-vue/es/grid/Row'
   import ACol from 'ant-design-vue/es/grid/Col'
-  import { MeterDetailsViewApi } from '@vue2-client/services/api/MeterDetailsViewApi'
+  import { MeterDetailsViewApi } from '@vue2-client/services/api'
 
   export default {
     name: 'MeterDetailsCount',

package/src/base-client/components/iot/MeterDetailsView/part/MeterDetailsException.vue

@@ -32,9 +32,8 @@
   </div>
 </template>
 <script>
-import { MeterDetailsViewApi } from '@vue2-client/services/api/MeterDetailsViewApi'
+import { MeterDetailsViewApi, post } from '@vue2-client/services/api'
 import { STable } from '@vue2-client/components'
-import { post } from '@vue2-client/services/api/restTools'
 
 const exceptionColumns = [
   {

package/src/base-client/components/iot/MeterDetailsView/part/MeterDetailsHandPlan.vue

@@ -67,9 +67,8 @@
 </template>
 <script>
 
-import { MeterDetailsViewApi } from '@vue2-client/services/api/MeterDetailsViewApi'
+import { MeterDetailsViewApi, post } from '@vue2-client/services/api'
 import { STable } from '@vue2-client/components'
-import { post } from '@vue2-client/services/api/restTools'
 
 const handPlanColumns = [
   {

package/src/base-client/components/iot/MeterDetailsView/part/MeterDetailsInstruct.vue

@@ -58,10 +58,9 @@
 </template>
 <script>
 
-import { MeterDetailsViewApi } from '@vue2-client/services/api/MeterDetailsViewApi'
+import { MeterDetailsViewApi, post } from '@vue2-client/services/api'
 import { STable, Ellipsis } from '@vue2-client/components'
 import { timeCompare, formatDate } from '@vue2-client/utils/util'
-import { post } from '@vue2-client/services/api/restTools'
 
 const InstructColumns = [
   {

package/src/base-client/components/iot/MeterDetailsView/part/MeterDetailsMain.vue

@@ -111,8 +111,7 @@
 </template>
 <script>
   import { formatDate } from '@vue2-client/utils/util'
-  import { post } from '@vue2-client/services/api/restTools'
-  import { MeterDetailsViewApi } from '@vue2-client/services/api/MeterDetailsViewApi'
+  import { MeterDetailsViewApi, post } from '@vue2-client/services/api'
   import { mapState } from 'vuex'
 
   export default {

package/src/base-client/components/iot/MeterDetailsView/part/MeterDetailsSellGas.vue

@@ -31,8 +31,7 @@
 <script>
 
 import { STable } from '@vue2-client/components'
-import { post } from '@vue2-client/services/api/restTools'
-import { MeterDetailsViewApi } from '@vue2-client/services/api/MeterDetailsViewApi'
+import { MeterDetailsViewApi, post } from '@vue2-client/services/api'
 
 const columns = [
   {

package/src/base-client/components/iot/WebmeterAnalysisView/WebmeterAnalysisView.vue

@@ -240,8 +240,7 @@ import {
 import { formatDate } from '@vue2-client/utils/util'
 import { Line } from '@antv/g2plot'
 import { mapState } from 'vuex'
-import { post } from '@vue2-client/services/api/restTools'
-import { WebmeterAnalysisViewApi } from '@vue2-client/services/api/WebmeterAnalysisViewApi'
+import { WebmeterAnalysisViewApi, post } from '@vue2-client/services/api'
 
 const barData = []
 const barData2 = []

package/src/base-client/components/system/DictionaryDetailsView/DictionaryDetailsView.vue

@@ -57,8 +57,7 @@
 </template>
 
 <script>
-import { DictionaryDetailsViewApi } from '@vue2-client/services/api/DictionaryDetailsViewApi'
-import { post } from '@vue2-client/services/api/restTools'
+import { DictionaryDetailsViewApi, post } from '@vue2-client/services/api'
 import { mapState } from 'vuex'
 import { formatDate } from '@vue2-client/utils/util'
 import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'

package/src/base-client/components/system/QueryParamsDetailsView/QueryParamsDetailsView.vue

@@ -58,9 +58,8 @@
 <script>
 import JsonViewer from 'vue-json-viewer'
 import { mapState, mapGetters } from 'vuex'
-import { post } from '@vue2-client/services/api/restTools'
+import { QueryParamsDetailsViewApi, post } from '@vue2-client/services/api'
 import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
-import { QueryParamsDetailsViewApi } from '@vue2-client/services/api/QueryParamsDetailsViewApi'
 
 export default {
   name: 'DeviceTypeDetailsView',

package/src/base-client/components/ticket/EmployeeDetailsView/EmployeeDetailsView.vue

@@ -70,8 +70,7 @@
 <script>
 import JsonViewer from 'vue-json-viewer'
 import { formatDate } from '@vue2-client/utils/util'
-import { EmployeeDetailsViewApi } from '@vue2-client/services/api/EmployeeDetailsViewApi'
-import { post } from '@vue2-client/services/api/restTools'
+import { EmployeeDetailsViewApi, post } from '@vue2-client/services/api'
 import XTable from '@vue2-client/base-client/components/common/XTable/XTable'
 import { mapState } from 'vuex'
 import {