140
				}
141
				execute("writeFile",[content,fileName,type],err);
142
			},appendFile:function(content,fileName,type,err){
143
				if(type==undefined){
144
					type =1;
145
				}
146
				execute("appendFile",[content,fileName,type],err);
147
			},readFile:function(callback,fileName,type,isEscape,err){
148
				if(type==undefined){
149
					type =1;
150
				}
151
				if(isEscape==undefined){
152
					isEscape=true;
153
				}
134
			},writeFile:function(content,fileName,type,isSdcard,err){
135
				execute("writeFile",[content,fileName,type,isSdcard],err);
136
			},appendFile:function(content,fileName,type,isSdcard,err){
137
				execute("appendFile",[content,fileName,type,isSdcard],err);
138
			},readFile:function(callback,fileName,type,isSdcard,isEscape,err){
154 139
				storageCallback("readFile",callback,isEscape);
155
				execute("readFile",[fileName,type,isEscape],err);
156
			},openFile:function(filename,flag,err){
157
				if(flag==undefined){
158
					flag =1;
159
				}
160
				execute("openFile", [filename,flag],err);
161
			},deleteFile:function(filename,flag,err){
162
				if(flag==undefined){
163
					flag =1;
164
				}
165
				execute("deleteFile", [filename,flag],err);
166
			},getAllFile:function(callback,type,err){
167
				if(type==undefined){
168
					type=1;
169
				}
140
				execute("readFile",[fileName,type,isSdcard,isEscape],err);
141
			},openFile:function(filename,type,isSdcard,err){
142
				execute("openFile", [filename,type,isSdcard],err);
143
			},deleteFile:function(filename,type,isSdcard,err){
144
				execute("deleteFile", [filename,type,isSdcard],err);
145
			},getAllFile:function(callback,filename,type,isSdcard,err){
170 146
				storageCallback("getAllFile", callback);
171
				execute("getAllFile", [type],err);
172
			},cleanResource:function(type,err){
173
				execute("cleanResource",[type],err);
147
				execute("getAllFile", [filename,type,isSdcard],err);
148
			},getRelativePath:function(callback,filename,type,err){
149
				storageCallback("getRelativePath",callback);
150
				execute("getRelativePath", [filename,type],err);
151
			},cleanResource:function(type,isSdcard,err){
152
				execute("cleanResource",[type,isSdcard],err);
174 153
			},shareByBluetooth:function(err){
175 154
				execute("shareByBluetooth", [],err);
176 155
			},openBrowser:function(url,err){

+ 1 - 1
display-server/web/res/js/ui/wm-popup.js

@ -1,4 +1,4 @@
1
define(["module","tap"],function(module,tap){
1
define(["module","tap","jcl"],function(module,tap,$){
2 2
	var popup;
3 3
	function createNew(popupDom) {
4 4
		popup = typeof popupDom == 'object' ? popupDom : document.getElementById(popupDom);

+ 11 - 11
display-server/web/template/webapp/plugin/File.html

@ -64,20 +64,20 @@
64 64
<div class="m_content m_content-nofooter" id="content">
65 65
	<div class="c_tab l_mt" id="fileTab">
66 66
		<div class="title">
67
			<ul>
68
				<li class="on" id="li_sdcard">sd卡应用目录</li>
69
				<li id="li_data">应用file目录</li>
67
			<ul id="fileTypeList">
68
				<li class="on" fileType="fileListSdcard">sd卡应用目录</li>
69
				<li fileType="fileListData">应用file目录</li>
70 70
			</ul>
71 71
		</div>
72 72
		<div class="pages">
73 73
			<!-- sd卡应用目录文件列表 开始 -->
74 74
			<div class="page">
75 75
				<div class="c_title">目录:<span id="sdcard_dir" ></span>
76
				<div class="fn"><span class="e_button e_button-singleIco" id="addFile1"><span class="e_ico-add"></span></span></div>
76
				<div class="fn"><span class="e_button e_button-singleIco" id="addSdcardFile"><span class="e_ico-add"></span></span></div>
77 77
				</div>
78 78
				<div class="c_list c_list-euilateral c_list-col-3">
79
					<ul id="file_ul_1">
80
					<!--  
79
					<ul id="fileListSdcard">
80
					 
81 81
						<li>
82 82
							<div class="content">
83 83
								<div class="ico">
@ -86,7 +86,7 @@
86 86
								</div>
87 87
							</div>
88 88
						</li>
89
						-->
89
						
90 90
					</ul>
91 91
				</div>
92 92
			</div>
@ -95,11 +95,11 @@
95 95
			<div class="page">
96 96
				<div class="c_title">
97 97
					<div class="text">目录:<span id="files_dir" ></span></div>
98
					<div class="fn"><span class="e_button e_button-singleIco" id="addFile0"><span class="e_ico-add"></span></span></div>
98
					<div class="fn"><span class="e_button e_button-singleIco" id="addDataFile"><span class="e_ico-add"></span></span></div>
99 99
				</div>
100 100
				<div class="c_list c_list-euilateral c_list-col-3">
101
					<ul id="file_ul_0">
102
					<!-- 
101
					<ul id="fileListData">
102
					
103 103
						<li>
104 104
							<div class="content">
105 105
								<div class="ico">
@ -108,7 +108,7 @@
108 108
								</div>
109 109
							</div>
110 110
						</li>
111
					-->
111
					
112 112
					</ul>
113 113
				</div>
114 114
			</div>

+ 1 - 1
display-server/web/template/webapp/plugin/FileDetail.html

@ -28,7 +28,7 @@
28 28
	</div>
29 29
</div>
30 30

31
<input type="hidden" id="type" value="{%type%}" >
31
<input type="hidden" id="isSdcard" value="{%isSdcard%}" >
32 32
<input type="hidden" id="fileName" value="{%fileName%}" >
33 33
</body>
34 34
</html>

+ 1 - 1
wade-mobile-func/src/com/wade/mobile/func/MobileCamera.java

@ -84,7 +84,7 @@ public class MobileCamera extends Plugin {
84 84

85 85
		String appName = MobileAppInfo.getInstance(context).getAppPath();
86 86
		String photoName = appName + "-" + format.format(new Date()) + ".jpg";// 生成照片名称
87
		String photoDir = DirectionUtil.getInstance(context).getDirection(Constant.IMAGES_DIR, true);
87
		String photoDir = DirectionUtil.getInstance(context).getDirection(Constant.PATH_IMAGE, true);
88 88
		File photoDirFile = new File(photoDir);
89 89
		if (!photoDirFile.exists()) {
90 90
			photoDirFile.mkdirs();

+ 64 - 21
wade-mobile-func/src/com/wade/mobile/func/MobileFile.java

@ -1,12 +1,14 @@
1 1
package com.wade.mobile.func;
2 2

3 3
import java.io.File;
4
import java.io.FileInputStream;
5
import java.io.FileOutputStream;
6
import java.io.OutputStream;
4 7

5 8
import org.json.JSONArray;
6 9
import org.json.JSONException;
7 10

8 11
import android.content.ActivityNotFoundException;
9
import android.content.Context;
10 12
import android.widget.Toast;
11 13

12 14
import com.wade.mobile.common.MobileException;
@ -34,7 +36,6 @@ public class MobileFile extends Plugin{
34 36
	}
35 37
	
36 38
	public void cleanResource(String relativePath, boolean isSdcard) {
37
		// TODO Auto-generated method stub
38 39
		String absolutePath = util.getDirection(relativePath, isSdcard);
39 40
		FileUtil.deleteFolder(absolutePath);
40 41
		
@ -47,6 +48,29 @@ public class MobileFile extends Plugin{
47 48
	}
48 49
	
49 50
	/**
51
	 * 获取files和sdcard/files下面所有的文件
52
	 */
53
	public void getAllFile(JSONArray param) throws Exception{
54
		String fileName = param.getString(0); //相对路径参数
55
		String type = param.getString(1);
56
		boolean isSdcard = "true".equals(param.getString(2));
57
		JSONArray arr = getAllFile(fileName, type, isSdcard);
58
		callback(arr.toString());
59
	}
60

61
	private JSONArray getAllFile(String fileName, String type, boolean isSdcard) {
62
		String relativePath = DirectionUtil.getInstance(context).getRelativePath(fileName,type);
63
		String absolutePath = DirectionUtil.getInstance(context).getDirection(relativePath, isSdcard);
64
		File file = new File(absolutePath);
65
		String[] fileNames = file.list();
66
		JSONArray arr = new JSONArray();
67
		for(String name : fileNames){
68
			arr.put(name);
69
		}
70
		return arr;
71
	}
72
	
73
	/**
50 74
	 * 打开指定文件
51 75
	 */
52 76
	public void openFile(JSONArray param) throws Exception{
@ -69,9 +93,11 @@ public class MobileFile extends Plugin{
69 93
	 * 读取指定文件
70 94
	 */
71 95
	public void readFile(JSONArray param) throws JSONException{
72
		String relativePath = param.getString(0); //相对路径参数
73
		boolean isSdcard = !"false".equals(param.getString(1));
74
		String isEscape = param.getString(2);
96
		String fileName = param.getString(0); //相对路径参数
97
		String type = param.getString(1);
98
		boolean isSdcard = "true".equals(param.getString(2));
99
		String isEscape = param.getString(3);
100
		String relativePath = DirectionUtil.getInstance(context).getRelativePath(fileName, type);
75 101
		try {
76 102
			String value = readFile(relativePath, isSdcard);
77 103
			if ("true".equals(isEscape)) {
@ -86,7 +112,12 @@ public class MobileFile extends Plugin{
86 112
	public String readFile(String relativePath, boolean isSdcard) throws Exception {
87 113
		//对比
88 114
		if (!isSdcard) {
89
			return FileUtil.readFile(this.context.openFileInput(relativePath));
115
			File inputFile = new File(context.getFilesDir(),relativePath);
116
			if(!inputFile.getParentFile().exists()){
117
				inputFile.getParentFile().mkdir();
118
			}
119
			FileInputStream in = new FileInputStream(inputFile);
120
			return FileUtil.readFile(in);
90 121
		} else {
91 122
			String absolutePath = util.getDirection(relativePath, isSdcard);
92 123
			return FileUtil.readFile(absolutePath);
@ -98,8 +129,10 @@ public class MobileFile extends Plugin{
98 129
	 */
99 130
	public void appendFile(JSONArray param) throws Exception{
100 131
		String content = param.getString(0);
101
		String relativePath = param.getString(1); //相对路径参数
102
		boolean isSdcard = !"false".equals(param.getString(2));
132
		String fileName = param.getString(1);
133
		String type = param.getString(2);
134
		boolean isSdcard = "true".equals(param.getString(3));
135
		String relativePath = DirectionUtil.getInstance(context).getRelativePath(fileName, type);
103 136
		writeFile(content, relativePath, isSdcard, true);
104 137
	}
105 138
	
@ -108,34 +141,44 @@ public class MobileFile extends Plugin{
108 141
	 */
109 142
	public void writeFile(JSONArray param) throws Exception{
110 143
		String content = param.getString(0);
111
		String relativePath = param.getString(1); //相对路径参数
112
		boolean isSdcard = !"false".equals(param.getString(2));
144
		String fileName = param.getString(1);
145
		String type = param.getString(2);
146
		boolean isSdcard = "true".equals(param.getString(3));
147
		String relativePath = DirectionUtil.getInstance(context).getRelativePath(fileName, type);
113 148
		writeFile(content, relativePath, isSdcard, false);
114 149
	}
115 150
	
116 151
	public void writeFile(String content, String relativePath, boolean isSdcard, boolean append) throws Exception {
117
		// TODO Auto-generated method stub
118 152
		if (!isSdcard) {
119
			if (append) {
120
				FileUtil.writeFile(content, this.context.openFileOutput(
121
						relativePath, Context.MODE_PRIVATE | Context.MODE_APPEND));
122
			} else {
123
				FileUtil.writeFile(content, this.context.openFileOutput(
124
						relativePath, Context.MODE_PRIVATE));
153
			File outputFile = new File(context.getFilesDir(),relativePath);
154
			if(!outputFile.getParentFile().exists()){
155
				outputFile.getParentFile().mkdir();
125 156
			}
157
			OutputStream out = new FileOutputStream(outputFile,append);
158
			FileUtil.writeFile(content, out);
126 159
		} else {
127 160
			String absolutePath = util.getDirection(relativePath, isSdcard);
128
			if (!FileUtil.check(absolutePath)) {
129
				FileUtil.createDir(absolutePath);
161
			File file = new File(absolutePath);
162
			String parentPath = file.getParent();
163
			if (!FileUtil.check(parentPath)) {
164
				FileUtil.createDir(parentPath);
130 165
			}
131 166
			FileUtil.writeFile(content, absolutePath, append);
132 167
		}
133 168
	}
169
	public void getRelativePath(JSONArray params) throws Exception{
170
		String fileName = params.getString(0); //相对路径参数
171
		String type = params.getString(1);
172
		String relativePath = DirectionUtil.getInstance(context).getRelativePath(fileName,type);
173
		callback(relativePath);
174
	}
134 175

135 176
	//删除文件
136 177
	public void deleteFile(JSONArray param) throws Exception{
137
		String relativePath = param.getString(0); //相对路径参数
138
		boolean isSdcard = !"false".equals(param.getString(1));
178
		String fileName = param.getString(0); //相对路径参数
179
		String type = param.getString(1);
180
		boolean isSdcard = "true".equals(param.getString(2));
181
		String relativePath = DirectionUtil.getInstance(context).getRelativePath(fileName, type);
139 182
		deleteFile(relativePath, isSdcard);
140 183
	}
141 184
	

完善ipu-form样式-fourth · cd019c74ad - Nuosi Git Service
Browse Source

完善ipu-form样式-fourth

chenxy41 3 years ago
parent
commit
cd019c74ad
1 changed files with 3 additions and 2 deletions
  1. 3 2
      2022/aiot-evaluate/src/components/form/IpuForm.vue

+ 3 - 2
2022/aiot-evaluate/src/components/form/IpuForm.vue

116
    default: false
116
    default: false
117
  }
117
  }
118
});
118
});
119
console.log(props.inline, '###');
120
const emits = defineEmits(['changeEvent', 'blurEvent']);
119
const emits = defineEmits(['changeEvent', 'blurEvent']);
121
120
122
// 触发change事件
121
// 触发change事件
148
</script>
147
</script>
149
148
150
<style lang="scss" scoped>
149
<style lang="scss" scoped>
151
150
  :deep(.el-form-item__label-wrap){
151
    margin-left: 0 !important;
152
  }
152
</style>
153
</style>